aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEdit
diff options
context:
space:
mode:
Diffstat (limited to 'qt/ScintillaEdit')
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.cpp2
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.h8
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.cpp.template2
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.h.template8
4 files changed, 0 insertions, 20 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