diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-09-12 11:29:19 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-09-12 11:29:19 +1000 |
| commit | 9e9d7708a8ac6fd0d2a66ae8a4b51a1c5a6ea425 (patch) | |
| tree | 22a6dc1d95fb1f7dcaddbc49a64fe3abe7ebd2cc /qt/ScintillaEdit | |
| parent | 044efe69724c92a538b9f6e6252ae5782f860153 (diff) | |
| download | scintilla-mirror-9e9d7708a8ac6fd0d2a66ae8a4b51a1c5a6ea425.tar.gz | |
Support for SCI_NAMESPACE in the ScintillaEdit part of the Qt layer.
From Jason Haslam.
Diffstat (limited to 'qt/ScintillaEdit')
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.cpp | 4 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.h | 10 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.cpp.template | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 1be319627..337844ca2 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -28,6 +28,10 @@ #include "CaseFolder.h" #include "Document.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + class WatcherHelper : public DocWatcher { ScintillaDocument *owner; public: diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index 21fa6203d..1d571a73c 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -9,6 +9,10 @@ class WatcherHelper; +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + #ifndef EXPORT_IMPORT_API #ifdef WIN32 #ifdef MAKING_LIBRARY @@ -94,8 +98,12 @@ signals: void lexer_changed(); void error_occurred(int status); - friend class WatcherHelper; + 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 d13527db8..3aca02600 100644 --- a/qt/ScintillaEdit/ScintillaEdit.cpp.template +++ b/qt/ScintillaEdit/ScintillaEdit.cpp.template @@ -4,6 +4,10 @@ #include "ScintillaEdit.h" +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + ScintillaEdit::ScintillaEdit(QWidget *parent) : ScintillaEditBase(parent) { } |