From d3c03f65fe25e133b8ef8a5f67b675b434605305 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 11 Sep 2017 09:05:35 +1000
Subject: Backport: The Scintilla namespace is always active for internal
 symbols and for the lexer and document interfaces.

Backport of changeset 6388:d62863ae40a3.
---
 qt/ScintillaEdit/ScintillaDocument.cpp      | 2 --
 qt/ScintillaEdit/ScintillaDocument.h        | 8 --------
 qt/ScintillaEdit/ScintillaEdit.cpp.template | 2 --
 qt/ScintillaEdit/ScintillaEdit.h.template   | 8 --------
 4 files changed, 20 deletions(-)

(limited to 'qt/ScintillaEdit')

diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index b5665e47d..af6993ace 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 8c29c3fe3..1226fbef5 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
-- 
cgit v1.2.3