aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaQt.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-09-11 09:05:35 +1000
committerNeil <nyamatongwe@gmail.com>2017-09-11 09:05:35 +1000
commit313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf (patch)
tree2ec6649c5e74a1d7127d150f485432def1814a1a /qt/ScintillaEditBase/ScintillaQt.h
parent7b287ecd7f8527bb8f47e08090a0120ff418c730 (diff)
downloadscintilla-mirror-313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf.tar.gz
The Scintilla namespace is always active for internal symbols and for the lexer
interfaces ILexer4 and IDocument.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.h')
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h8
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