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 | 313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf (patch) | |
| tree | 2ec6649c5e74a1d7127d150f485432def1814a1a /qt/ScintillaEdit | |
| parent | 7b287ecd7f8527bb8f47e08090a0120ff418c730 (diff) | |
| download | scintilla-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/ScintillaEdit')
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.cpp | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.h | 8 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.cpp.template | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.h.template | 8 |
4 files changed, 0 insertions, 20 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 7c0e68e7e..1ba39be32 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -33,9 +33,7 @@ #include "CaseFolder.h" #include "Document.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif class WatcherHelper : public DocWatcher { ScintillaDocument *owner; diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index ef62ab2f1..cd84b4ddd 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -9,10 +9,6 @@ class WatcherHelper; -#ifdef SCI_NAMESPACE -namespace Scintilla { -#endif - #ifndef EXPORT_IMPORT_API #ifdef WIN32 #ifdef MAKING_LIBRARY @@ -92,8 +88,4 @@ signals: friend class ::WatcherHelper; }; -#ifdef SCI_NAMESPACE -} -#endif - #endif // SCINTILLADOCUMENT_H diff --git a/qt/ScintillaEdit/ScintillaEdit.cpp.template b/qt/ScintillaEdit/ScintillaEdit.cpp.template index 428d27701..bf5895342 100644 --- a/qt/ScintillaEdit/ScintillaEdit.cpp.template +++ b/qt/ScintillaEdit/ScintillaEdit.cpp.template @@ -4,9 +4,7 @@ #include "ScintillaEdit.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif ScintillaEdit::ScintillaEdit(QWidget *parent) : ScintillaEditBase(parent) { } diff --git a/qt/ScintillaEdit/ScintillaEdit.h.template b/qt/ScintillaEdit/ScintillaEdit.h.template index 9d7c1d894..d9853eb1a 100644 --- a/qt/ScintillaEdit/ScintillaEdit.h.template +++ b/qt/ScintillaEdit/ScintillaEdit.h.template @@ -10,10 +10,6 @@ #include "ScintillaEditBase.h" #include "ScintillaDocument.h" -#ifdef SCI_NAMESPACE -namespace Scintilla { -#endif - #ifndef EXPORT_IMPORT_API #ifdef WIN32 #ifdef MAKING_LIBRARY @@ -67,10 +63,6 @@ public: }; -#ifdef SCI_NAMESPACE -} -#endif - #if defined(__GNUC__) #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #endif |