From 81797180bc69d9dd134e226adb9a27b7d71e9a3b Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 13 Dec 2019 10:15:42 +1100
Subject: Backport: Move SCI_LOADLEXERLIBRARY from platform layers to
 ScintillaBase.cxx. This allows removal of related #include statements.

Backport of changeset 7860:4ca969c2fa45.
---
 qt/ScintillaEditBase/ScintillaQt.cpp | 10 ----------
 qt/ScintillaEditBase/ScintillaQt.h   |  5 -----
 2 files changed, 15 deletions(-)

(limited to 'qt')

diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 80e1f9949..87e05f12d 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -10,10 +10,6 @@
 
 #include "ScintillaQt.h"
 #include "PlatQt.h"
-#ifdef SCI_LEXER
-#include "LexerModule.h"
-#include "ExternalLexer.h"
-#endif
 
 #include <QApplication>
 #include <QDrag>
@@ -704,12 +700,6 @@ sptr_t ScintillaQt::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
 		case SCI_GETDIRECTPOINTER:
 			return reinterpret_cast<sptr_t>(this);
 
-#ifdef SCI_LEXER
-		case SCI_LOADLEXERLIBRARY:
-			LexerManager::GetInstance()->Load(reinterpret_cast<const char *>(lParam));
-			break;
-#endif
-
 		default:
 			return ScintillaBase::WndProc(iMessage, wParam, lParam);
 		}
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index fe7213ece..53a115e95 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -58,11 +58,6 @@
 #include "ScintillaBase.h"
 #include "CaseConvert.h"
 
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSetSimple.h"
-#endif
-
 #include <QObject>
 #include <QAbstractScrollArea>
 #include <QAction>
-- 
cgit v1.2.3