diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
| commit | d3c03f65fe25e133b8ef8a5f67b675b434605305 (patch) | |
| tree | 648194fe02ee266b1e4ee4530a3978037e883bc5 /qt/ScintillaEditBase/ScintillaQt.h | |
| parent | 566b81a2fda39f83e4fbc860388385c2d3087d33 (diff) | |
| download | scintilla-mirror-d3c03f65fe25e133b8ef8a5f67b675b434605305.tar.gz | |
Backport: The Scintilla namespace is always active for internal symbols and for the lexer and document interfaces.
Backport of changeset 6388:d62863ae40a3.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.h')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index 1f33fe56b..a8cd54bff 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -69,9 +69,9 @@ #include <QClipboard> #include <QPaintEvent> -#ifdef SCI_NAMESPACE +class ScintillaEditBase; + namespace Scintilla { -#endif class ScintillaQt : public QObject, public ScintillaBase { Q_OBJECT @@ -167,11 +167,9 @@ private: bool dragWasDropped; int rectangularSelectionModifier; - friend class ScintillaEditBase; + friend class ::ScintillaEditBase; }; -#ifdef SCI_NAMESPACE } -#endif #endif // SCINTILLAQT_H |