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 | ade875e24581a6f9bbde730f09af6d612115731f (patch) | |
| tree | 19cdaadd76e3c7226a8236ce12945d9f27a77774 /qt/ScintillaEdit/ScintillaDocument.h | |
| parent | d744f3aedb7b09625f45ef659ed4c787bf45c42f (diff) | |
| download | scintilla-mirror-ade875e24581a6f9bbde730f09af6d612115731f.tar.gz | |
Support for SCI_NAMESPACE in the ScintillaEdit part of the Qt layer.
From Jason Haslam.
Diffstat (limited to 'qt/ScintillaEdit/ScintillaDocument.h')
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.h | 10 |
1 files changed, 9 insertions, 1 deletions
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 |