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/ScintillaEditBase.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/ScintillaEditBase.h')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h index 8685f080f..20acf3086 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.h +++ b/qt/ScintillaEditBase/ScintillaEditBase.h @@ -19,13 +19,12 @@ #include <QMimeData> #include <QTime> -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class ScintillaQt; class SurfaceImpl; -struct SCNotification; + +} #ifndef EXPORT_IMPORT_API #ifdef WIN32 @@ -138,7 +137,7 @@ protected: void scrollContentsBy(int, int) override {} private: - ScintillaQt *sqt; + Scintilla::ScintillaQt *sqt; QTime time; @@ -153,8 +152,4 @@ private: int ModifiersOfKeyboard() const; }; -#ifdef SCI_NAMESPACE -} -#endif - #endif /* SCINTILLAEDITBASE_H */ |