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/ScintillaEditBase/ScintillaEditBase.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'qt/ScintillaEditBase/ScintillaEditBase.cpp')

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