fix includes

- include headers from own directory with ""
- include headers from own project without private/
- sort includes from most specific to most generic
- make headers self-contained
- some whitespace unification

no attempt was made at making the qt includes consistent regarding the
use of module names and forwarding headers.
no attempt was made at sorting includes.

14 files changed, 46 insertions, 41 deletions

diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp
index 81b0649..2a39aae 100644
--- a/src/declarative/qml/parser/qmljsast.cpp
+++ b/src/declarative/qml/parser/qmljsast.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsast_p.h>
-#include <private/qmljsastvisitor_p.h>
+#include "qmljsast_p.h"
+
+#include "qmljsastvisitor_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h
index c8f540c..032fbb1 100644
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ b/src/declarative/qml/parser/qmljsast_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmljsastvisitor_p.h>
-#include <private/qmljsglobal_p.h>
+#include "qmljsastvisitor_p.h"
+#include "qmljsglobal_p.h"
+
 #include <QtCore/QString>
 
 QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h
index b485138..f571a2e 100644
--- a/src/declarative/qml/parser/qmljsastfwd_p.h
+++ b/src/declarative/qml/parser/qmljsastfwd_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLJSAST_FWD_P_H
 #define QMLJSAST_FWD_P_H
 
+#include "qmljsglobal_p.h"
+
 #include <QtCore/qglobal.h>
-#include <private/qmljsglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/declarative/qml/parser/qmljsastvisitor.cpp b/src/declarative/qml/parser/qmljsastvisitor.cpp
index 089fe76..1290c89 100644
--- a/src/declarative/qml/parser/qmljsastvisitor.cpp
+++ b/src/declarative/qml/parser/qmljsastvisitor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsastvisitor_p.h>
+#include "qmljsastvisitor_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h
index b49a151..1b50bcc 100644
--- a/src/declarative/qml/parser/qmljsastvisitor_p.h
+++ b/src/declarative/qml/parser/qmljsastvisitor_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmljsastfwd_p.h>
-#include <private/qmljsglobal_p.h>
+#include "qmljsastfwd_p.h"
+#include "qmljsglobal_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp
index ab317aa..b8ecd18 100644
--- a/src/declarative/qml/parser/qmljsengine_p.cpp
+++ b/src/declarative/qml/parser/qmljsengine_p.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmljsnodepool_p.h>
+#include "qmljsengine_p.h"
+
+#include "qmljsglobal_p.h"
+#include "qmljsnodepool_p.h"
+
 #include <qnumeric.h>
 #include <QHash>
 
diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h
index 6ae470c..2c15af3 100644
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ b/src/declarative/qml/parser/qmljsengine_p.h
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+#include "qmljsastfwd_p.h"
+
 #include <QString>
 #include <QSet>
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsastfwd_p.h>
-
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 9ad61e6..b8c6560 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -40,7 +40,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsgrammar_p.h>
+#include "qmljsgrammar_p.h"
 
 const char *const QmlJSGrammar::spell [] = {
   "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", 
diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp
index 2edd553..e9ea604 100644
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ b/src/declarative/qml/parser/qmljslexer.cpp
@@ -40,13 +40,14 @@
 ****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmljslexer_p.h>
-#include <private/qmljsgrammar_p.h>
+#include "qmljslexer_p.h"
+
+#include "qmljsglobal_p.h"
+#include "qmljsengine_p.h"
+#include "qmljsgrammar_p.h"
 
 #include <QtGui/qapplication.h>
 
diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h
index b483316..b830071 100644
--- a/src/declarative/qml/parser/qmljslexer_p.h
+++ b/src/declarative/qml/parser/qmljslexer_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include <QtCore/QString>
+#include "qmljsglobal_p.h"
 
-#include <private/qmljsglobal_p.h>
+#include <QtCore/QString>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
index e5d3e27..3da2678 100644
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ b/src/declarative/qml/parser/qmljsmemorypool_p.h
@@ -53,11 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+
 #include <QtCore/qglobal.h>
 #include <QtCore/qshareddata.h>
-#include <string.h>
 
-#include <private/qmljsglobal_p.h>
+#include <string.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
index ffd1287..abe4cc8 100644
--- a/src/declarative/qml/parser/qmljsnodepool_p.h
+++ b/src/declarative/qml/parser/qmljsnodepool_p.h
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+#include "qmljsmemorypool_p.h"
+
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsmemorypool_p.h>
-
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 472f67e..7a81557 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -41,21 +41,19 @@
 **
 ****************************************************************************/
 
+#include "qmljsparser_p.h"
+
+#include "qmljsengine_p.h"
+#include "qmljslexer_p.h"
+#include "qmljsast_p.h"
+#include "qmljsnodepool_p.h"
+
 #include <QtCore/QtDebug>
 #include <QtGui/QApplication>
+#include <QVarLengthArray>
 
 #include <string.h>
 
-#include <private/qmljsengine_p.h>
-#include <private/qmljslexer_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsnodepool_p.h>
-
-
-
-#include <private/qmljsparser_p.h>
-#include <QVarLengthArray>
-
 //
 // This file is automatically generated from qmljs.g.
 // Changes will be lost.
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 1f0c1a7..2cefb5c 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -60,10 +60,10 @@
 #ifndef QMLJSPARSER_P_H
 #define QMLJSPARSER_P_H
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsgrammar_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsengine_p.h>
+#include "qmljsglobal_p.h"
+#include "qmljsgrammar_p.h"
+#include "qmljsast_p.h"
+#include "qmljsengine_p.h"
 
 #include <QtCore/QList>
 #include <QtCore/QString>