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.

5 files changed, 25 insertions, 15 deletions

diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
index 6c6037e..dc779ac 100644
--- a/src/declarative/debugger/qmldebug.cpp
+++ b/src/declarative/debugger/qmldebug.cpp
@@ -38,10 +38,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <private/qmldebug_p.h>
-#include <private/qmldebugclient_p.h>
+
+#include "qmldebug_p.h"
+
+#include "qmldebugclient_p.h"
+
+#include <qmlenginedebug_p.h>
+
 #include <private/qobject_p.h>
-#include <private/qmlenginedebug_p.h>
 
 class QmlEngineDebugClient : public QmlDebugClient
 {
diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
index f1473c2..68e14c2 100644
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ b/src/declarative/debugger/qmldebugclient.cpp
@@ -39,12 +39,15 @@
 **
 ****************************************************************************/
 
-#include <private/qmldebugclient_p.h>
-#include <private/qobject_p.h>
-#include <private/qpacketprotocol_p.h>
+#include "qmldebugclient_p.h"
+
+#include "qpacketprotocol_p.h"
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlDebugConnectionPrivate : public QObject
@@ -201,4 +204,4 @@ void QmlDebugClient::messageReceived(const QByteArray &)
 
 QT_END_NAMESPACE
 
-#include "qmldebugclient.moc"
+#include <qmldebugclient.moc>
diff --git a/src/declarative/debugger/qmldebuggerstatus.cpp b/src/declarative/debugger/qmldebuggerstatus.cpp
index 208c7a1..dc1cfb0 100644
--- a/src/declarative/debugger/qmldebuggerstatus.cpp
+++ b/src/declarative/debugger/qmldebuggerstatus.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmldebuggerstatus_p.h>
+#include "qmldebuggerstatus_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp
index adf592f..810fbed 100644
--- a/src/declarative/debugger/qmldebugservice.cpp
+++ b/src/declarative/debugger/qmldebugservice.cpp
@@ -39,14 +39,17 @@
 **
 ****************************************************************************/
 
-#include <private/qmldebugservice_p.h>
+#include "qmldebugservice_p.h"
+
+#include "qpacketprotocol_p.h"
+
 #include <QtCore/qdebug.h>
 #include <QtNetwork/qtcpserver.h>
 #include <QtNetwork/qtcpsocket.h>
-#include <private/qobject_p.h>
-#include <private/qpacketprotocol_p.h>
 #include <QtCore/qstringlist.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlDebugServerPrivate;
@@ -387,4 +390,4 @@ void QmlDebugService::messageReceived(const QByteArray &)
 
 QT_END_NAMESPACE
 
-#include "qmldebugservice.moc"
+#include <qmldebugservice.moc>
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index 60b8303..b76c461 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -39,7 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qpacketprotocol_p.h>
+#include "qpacketprotocol_p.h"
+
 #include <QBuffer>
 
 QT_BEGIN_NAMESPACE
@@ -494,5 +495,4 @@ QPacketAutoSend::~QPacketAutoSend()
 
 QT_END_NAMESPACE
 
-#include "qpacketprotocol.moc"
-
+#include <qpacketprotocol.moc>