From 313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 11 Sep 2017 09:05:35 +1000 Subject: The Scintilla namespace is always active for internal symbols and for the lexer interfaces ILexer4 and IDocument. --- qt/ScintillaEditBase/ScintillaEditBase.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'qt/ScintillaEditBase/ScintillaEditBase.h') 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 #include -#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 */ -- cgit v1.2.3