diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-11-02 23:22:14 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-11-02 23:22:14 +1100 |
| commit | c766a53be0651a0718a63072972e9bce693b8073 (patch) | |
| tree | 3da1300c5c606f1601a9a197c8b5f34686fbaec3 | |
| parent | e6f802139ec5a5d5f320eaa3304bb379b26adf62 (diff) | |
| download | scintilla-mirror-c766a53be0651a0718a63072972e9bce693b8073.tar.gz | |
Use std::size instead of ELEMENTS so StringCopy.h is only used by Lexilla and
can be removed from Scintilla.
| -rw-r--r-- | cocoa/PlatCocoa.mm | 1 | ||||
| -rwxr-xr-x | gtk/PlatGTK.cxx | 1 | ||||
| -rwxr-xr-x | gtk/ScintillaGTK.cxx | 5 | ||||
| -rw-r--r-- | gtk/ScintillaGTKAccessible.cxx | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 62d18273c..da30ac4f4 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -34,7 +34,6 @@ #import "Platform.h" -#include "StringCopy.h" #include "XPM.h" #include "UniConversion.h" diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 4d61ec453..1a1907e69 100755 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -27,7 +27,6 @@ #include "Scintilla.h" #include "ScintillaWidget.h" -#include "StringCopy.h" #include "IntegerRectangle.h" #include "XPM.h" #include "UniConversion.h" diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index a67bd14ec..d52016f4b 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -42,7 +42,6 @@ #include "ILexer.h" #include "Scintilla.h" #include "ScintillaWidget.h" -#include "StringCopy.h" #include "CharacterCategory.h" #include "Position.h" #include "UniqueString.h" @@ -126,14 +125,14 @@ static const GtkTargetEntry clipboardCopyTargets[] = { { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, { (gchar *) "STRING", 0, TARGET_STRING }, }; -static constexpr gint nClipboardCopyTargets = ELEMENTS(clipboardCopyTargets); +static constexpr gint nClipboardCopyTargets = std::size(clipboardCopyTargets); static const GtkTargetEntry clipboardPasteTargets[] = { { (gchar *) "text/uri-list", 0, TARGET_URI }, { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, { (gchar *) "STRING", 0, TARGET_STRING }, }; -static constexpr gint nClipboardPasteTargets = ELEMENTS(clipboardPasteTargets); +static constexpr gint nClipboardPasteTargets = std::size(clipboardPasteTargets); static const GdkDragAction actionCopyOrMove = static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE); diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx index 6ecee2e8e..8b5670669 100644 --- a/gtk/ScintillaGTKAccessible.cxx +++ b/gtk/ScintillaGTKAccessible.cxx @@ -93,7 +93,6 @@ #include "ILexer.h" #include "Scintilla.h" #include "ScintillaWidget.h" -#include "StringCopy.h" #include "CharacterCategory.h" #include "Position.h" #include "UniqueString.h" |