Backport: Add necessary headers and move includes to be in same order.

Backport of changeset 7002:010fd50b48a7.

3 files changed, 5 insertions, 4 deletions

diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 1f4c3fb05..663829c7f 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -8,6 +8,8 @@
 // Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
 // Scintilla platform layer for Qt
 
+#include <cstdio>
+
 #include "PlatQt.h"
 #include "Scintilla.h"
 #include "UniConversion.h"
@@ -35,7 +37,6 @@
 #include <QTextLayout>
 #include <QTextLine>
 #include <QLibrary>
-#include <cstdio>
 
 namespace Scintilla {
 
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 60907159f..d7f25dbdc 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -17,9 +17,9 @@
 #include <QInputContext>
 #endif
 #include <QPainter>
+#include <QVarLengthArray>
 #include <QScrollBar>
 #include <QTextFormat>
-#include <QVarLengthArray>
 
 #define INDIC_INPUTMETHOD 24
 
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index b038f412b..cf4709a0e 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -8,8 +8,8 @@
 // Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
 // ScintillaQt.cpp - Qt specific subclass of ScintillaBase
 
-#include "PlatQt.h"
 #include "ScintillaQt.h"
+#include "PlatQt.h"
 #ifdef SCI_LEXER
 #include "LexerModule.h"
 #include "ExternalLexer.h"
@@ -22,9 +22,9 @@
 #endif
 #include <QMimeData>
 #include <QMenu>
+#include <QTextCodec>
 #include <QScrollBar>
 #include <QTimer>
-#include <QTextCodec>
 
 using namespace Scintilla;