fix includes

use style suitable for bootstrapping. while we're at it, order the
includes the usual way.

Change-Id: I4fe96bfb73442c8a5de6dfe52d1a8c7eb22104c8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

util/qlalr/compress.cpp

@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
+#include "compress.h"
 
-#include <QtCore/QtDebug>
-#include <QtCore/QList>
+#include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
 
 #include <algorithm>
 #include <iterator>
 #include <iostream>
-#include "compress.h"
 
 #define QLALR_NO_CHECK_SORTED_TABLE
 

util/qlalr/compress.h

@@ -42,7 +42,7 @@
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
-#include <QtCore/QVector>
+#include <QtCore/qvector.h>
 
 class Compress
 {

util/qlalr/cppgenerator.cpp

@@ -39,15 +39,16 @@
 **
 ****************************************************************************/
 
+#include "cppgenerator.h"
+
+#include "lalr.h"
+#include "recognizer.h"
 
 #include <QtCore/qbitarray.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qmap.h>
 
-#include "cppgenerator.h"
-#include "lalr.h"
-#include "recognizer.h"
 
 QString CppGenerator::copyrightHeader() const
 {

util/qlalr/dotgraph.cpp

@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-
-#include <QtCore/QTextStream>
+#include "dotgraph.h"
 
 #include "lalr.h"
-#include "dotgraph.h"
+
+#include <QtCore/qtextstream.h>
 
 DotGraph::DotGraph(QTextStream &o):
   out (o)

util/qlalr/dotgraph.h

@@ -42,6 +42,8 @@
 #ifndef DOTGRAPH_H
 #define DOTGRAPH_H
 
+#include <QtCore/qglobal.h>
+
 QT_FORWARD_DECLARE_CLASS(QTextStream);
 class Automaton;
 

util/qlalr/lalr.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-
 #include "lalr.h"
+
 #include <limits.h>
 
 #include <algorithm>

util/qlalr/lalr.g

@@ -116,14 +116,15 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtDebug>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-
 #include "$header"
+
 #include "lalr.h"
 
+#include <QtCore/qdebug.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+
 #include <cstdlib>
 
 class Recognizer: protected $table
@@ -231,6 +232,7 @@ protected:
 ****************************************************************************/
 
 #include "recognizer.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <cctype>

util/qlalr/lalr.h

@@ -42,15 +42,15 @@
 #ifndef LALR_H
 #define LALR_H
 
-#include <functional>
+#include <QtCore/qset.h>
+#include <QtCore/qstack.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qlinkedlist.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qtextstream.h>
+#include <QtCore/qpair.h>
 
-#include <QtCore/QSet>
-#include <QtCore/QStack>
-#include <QtCore/QMap>
-#include <QtCore/QLinkedList>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QPair>
+#include <functional>
 
 class Rule;
 class State;

util/qlalr/main.cpp

@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtCore/QtDebug>
-
-#include <cstdlib>
-
 #include "lalr.h"
 #include "dotgraph.h"
 #include "parsetable.h"
 #include "cppgenerator.h"
 #include "recognizer.h"
 
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qdebug.h>
+
+#include <cstdlib>
+
 #define QLALR_NO_DEBUG_TABLE
 #define QLALR_NO_DEBUG_DOT
 

util/qlalr/parsetable.cpp

@@ -39,11 +39,12 @@
 **
 ****************************************************************************/
 
-
-#include <QtCore/QTextStream>
-#include "lalr.h"
 #include "parsetable.h"
 
+#include "lalr.h"
+
+#include <QtCore/qtextstream.h>
+
 ParseTable::ParseTable (QTextStream &o):
   out (o)
 {

util/qlalr/parsetable.h

@@ -42,6 +42,8 @@
 #ifndef PARSETABLE_H
 #define PARSETABLE_H
 
+#include <QtCore/qglobal.h>
+
 QT_FORWARD_DECLARE_CLASS(QTextStream);
 class Automaton;
 

util/qlalr/recognizer.cpp

@@ -41,6 +41,7 @@
 ****************************************************************************/
 
 #include "recognizer.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <cctype>

util/qlalr/recognizer.h

@@ -40,14 +40,15 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtDebug>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-
 #include "grammar_p.h"
+
 #include "lalr.h"
 
+#include <QtCore/qdebug.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+
 #include <cstdlib>
 
 class Recognizer: protected grammar