diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-15 08:47:44 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-15 08:47:44 +1000 |
| commit | 2c660b3e47671db7cfe0eff1ea71c337eb4cc34a (patch) | |
| tree | 86674de667e29b426f61077cf02c3e07b17c7c09 | |
| parent | 709018ec442d0136f081211ad87a75ca7fb71036 (diff) | |
| download | scintilla-mirror-2c660b3e47671db7cfe0eff1ea71c337eb4cc34a.tar.gz | |
Replace ELEMENTS with std::size and drop inclusion of StringCopy.h.
| -rw-r--r-- | lexlib/WordList.cxx | 1 | ||||
| -rw-r--r-- | src/CallTip.cxx | 1 | ||||
| -rw-r--r-- | src/EditModel.cxx | 1 | ||||
| -rw-r--r-- | src/EditView.cxx | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 3 | ||||
| -rw-r--r-- | src/MarginView.cxx | 1 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 1 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 5 |
8 files changed, 3 insertions, 11 deletions
diff --git a/lexlib/WordList.cxx b/lexlib/WordList.cxx index 954689ef7..c8b4cd63b 100644 --- a/lexlib/WordList.cxx +++ b/lexlib/WordList.cxx @@ -12,7 +12,6 @@ #include <algorithm> #include <iterator> -#include "StringCopy.h" #include "WordList.h" using namespace Scintilla; diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 437933af9..e38709624 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -21,7 +21,6 @@ #include "Scintilla.h" -#include "StringCopy.h" #include "Position.h" #include "IntegerRectangle.h" #include "CallTip.h" diff --git a/src/EditModel.cxx b/src/EditModel.cxx index c4c78fe02..fcca51405 100644 --- a/src/EditModel.cxx +++ b/src/EditModel.cxx @@ -25,7 +25,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" diff --git a/src/EditView.cxx b/src/EditView.cxx index b406747fb..6ca22e4f2 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -30,7 +30,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "CharacterSet.h" #include "Position.h" #include "IntegerRectangle.h" diff --git a/src/Editor.cxx b/src/Editor.cxx index 7a61d503a..9aba5ccd2 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -29,7 +29,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "CharacterSet.h" #include "Position.h" #include "UniqueString.h" @@ -1957,7 +1956,7 @@ void Editor::AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS) { // characters representing themselves. } else { unsigned int utf32[1] = { 0 }; - UTF32FromUTF8(std::string_view(s, len), utf32, ELEMENTS(utf32)); + UTF32FromUTF8(std::string_view(s, len), utf32, std::size(utf32)); byte = utf32[0]; } NotifyChar(byte); diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 6604657f6..0b52056d4 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -27,7 +27,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "Position.h" #include "IntegerRectangle.h" #include "UniqueString.h" diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 68fb3f05b..b4fa77250 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -44,7 +44,6 @@ #endif #include "Platform.h" -#include "StringCopy.h" #include "XPM.h" #include "UniConversion.h" #include "DBCS.h" diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 909964797..d60e2b31c 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -53,7 +53,6 @@ #ifdef SCI_LEXER #include "SciLexer.h" #endif -#include "StringCopy.h" #ifdef SCI_LEXER #include "LexerModule.h" #endif @@ -2544,10 +2543,10 @@ STDMETHODIMP DataObject_EnumFormatEtc(DataObject *pd, DWORD dwDirection, IEnumFO FormatEnumerator *pfe; if (pd->sci->IsUnicodeMode()) { CLIPFORMAT formats[] = {CF_UNICODETEXT, CF_TEXT}; - pfe = new FormatEnumerator(0, formats, ELEMENTS(formats)); + pfe = new FormatEnumerator(0, formats, std::size(formats)); } else { CLIPFORMAT formats[] = {CF_TEXT}; - pfe = new FormatEnumerator(0, formats, ELEMENTS(formats)); + pfe = new FormatEnumerator(0, formats, std::size(formats)); } return FormatEnumerator_QueryInterface(pfe, IID_IEnumFORMATETC, reinterpret_cast<void **>(ppEnum)); |