From 9e9d7708a8ac6fd0d2a66ae8a4b51a1c5a6ea425 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 12 Sep 2014 11:29:19 +1000
Subject: Support for SCI_NAMESPACE in the ScintillaEdit part of the Qt layer.
 From Jason Haslam.

---
 qt/ScintillaEdit/ScintillaDocument.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'qt/ScintillaEdit/ScintillaDocument.h')

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
-- 
cgit v1.2.3