10 files changed, 6 insertions, 45 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
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index e288cf5bf..713f4c46f 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -37,9 +37,7 @@
 #include <QElapsedTimer>
 #include <cstdio>
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 //----------------------------------------------------------------------
 
@@ -1245,6 +1243,4 @@ double ElapsedTime::Duration(bool reset)
 	return result / 1000000000.0;	// 1 billion nanoseconds in a second
 }
 
-#ifdef SCI_NAMESPACE
 }
-#endif
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index ae9a015bc..6749c4b0f 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -18,9 +18,7 @@
 #include <QPainter>
 #include <QHash>
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 const char *CharacterSetID(int characterSet);
 
@@ -125,8 +123,6 @@ public:
 	QPainter *GetPainter();
 };
 
-#ifdef SCI_NAMESPACE
 }
-#endif
 
 #endif
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 64166e78a..60907159f 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -40,9 +40,7 @@
 #endif
 #endif // QT_VERSION >= 5.0.0
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
 ScintillaEditBase::ScintillaEditBase(QWidget *parent)
 : QAbstractScrollArea(parent), sqt(0), preeditPos(-1), wheelDelta(0)
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index 8685f080f..20acf3086 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -19,13 +19,12 @@
 #include <QMimeData>
 #include <QTime>
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 class ScintillaQt;
 class SurfaceImpl;
-struct SCNotification;
+
+}
 
 #ifndef EXPORT_IMPORT_API
 #ifdef WIN32
@@ -138,7 +137,7 @@ protected:
 	void scrollContentsBy(int, int) override {}
 
 private:
-	ScintillaQt *sqt;
+	Scintilla::ScintillaQt *sqt;
 
 	QTime time;
 
@@ -153,8 +152,4 @@ private:
 	int ModifiersOfKeyboard() const;
 };
 
-#ifdef SCI_NAMESPACE
-}
-#endif
-
 #endif /* SCINTILLAEDITBASE_H */
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 6a119ebd9..9209a7b65 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -26,9 +26,7 @@
 #include <QTimer>
 #include <QTextCodec>
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
 
 ScintillaQt::ScintillaQt(QAbstractScrollArea *parent)
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index 1f33fe56b..a8cd54bff 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -69,9 +69,9 @@
 #include <QClipboard>
 #include <QPaintEvent>
 
-#ifdef SCI_NAMESPACE
+class ScintillaEditBase;
+
 namespace Scintilla {
-#endif
 
 class ScintillaQt : public QObject, public ScintillaBase {
 	Q_OBJECT
@@ -167,11 +167,9 @@ private:
 	bool dragWasDropped;
 	int rectangularSelectionModifier;
 
-	friend class ScintillaEditBase;
+	friend class ::ScintillaEditBase;
 };
 
-#ifdef SCI_NAMESPACE
 }
-#endif
 
 #endif // SCINTILLAQT_H