Define C++ version of the Scintilla API in ScintillaTypes.h, ScintillaMessages.h

and ScintillaStructures.h using scoped enumerations.
Use these headers instead of Scintilla.h internally.
External definitions go in the Scintilla namespace and internal definitio0ns in
Scintilla::Internal.

1 files changed, 6 insertions, 3 deletions

diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index a0375f13d..751b9d294 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -21,6 +21,9 @@
 
 #include "Debugging.h"
 #include "Geometry.h"
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
 #include "Platform.h"
 #include "Scintilla.h"
 
@@ -28,7 +31,7 @@
 #include <QMimeData>
 #include <QElapsedTimer>
 
-namespace Scintilla {
+namespace Scintilla::Internal {
 
 class ScintillaQt;
 class SurfaceImpl;
@@ -146,7 +149,7 @@ protected:
 	void scrollContentsBy(int, int) override {}
 
 private:
-	Scintilla::ScintillaQt *sqt;
+	Scintilla::Internal::ScintillaQt *sqt;
 
 	QElapsedTimer time;
 
@@ -158,7 +161,7 @@ private:
 	static bool IsHangul(const QChar qchar);
 	void MoveImeCarets(int offset);
 	void DrawImeIndicator(int indicator, int len);
-	int ModifiersOfKeyboard() const;
+	Scintilla::KeyMod ModifiersOfKeyboard() const;
 };
 
 #endif /* SCINTILLAEDITBASE_H */