dbus: Include own headers first

cpp files should include their own headers first (but below config.h)

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

diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index ce0cc49..e8236dd 100644 (file)
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdbusabstractadaptor.h"
+#include "qdbusabstractadaptor_p.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qmetaobject.h>
@@ -50,7 +51,6 @@
 #include "qdbusconnection.h"
 
 #include "qdbusconnection_p.h"  // for qDBusParametersForMethod
-#include "qdbusabstractadaptor_p.h"
 #include "qdbusmetatype_p.h"
 
 #include <algorithm>

diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index 0969aef..6d782e2 100644 (file)
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdbusargument.h"
+#include "qdbusargument_p.h"
 
 #include <qatomic.h>
 #include <qbytearray.h>
@@ -52,7 +53,6 @@
 #include <qrect.h>
 #include <qline.h>
 
-#include "qdbusargument_p.h"
 #include "qdbusmetatype_p.h"
 #include "qdbusutil_p.h"
 

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index cd867c2..411830b 100644 (file)
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -39,17 +39,18 @@
 **
 ****************************************************************************/
 
+#include "qdbusconnection.h"
+#include "qdbusconnection_p.h"
+
 #include <qdebug.h>
 #include <qcoreapplication.h>
 #include <qstringlist.h>
 #include <qthread.h>
 
-#include "qdbusconnection.h"
 #include "qdbusconnectioninterface.h"
 #include "qdbuserror.h"
 #include "qdbusmessage.h"
 #include "qdbusmessage_p.h"
-#include "qdbusconnection_p.h"
 #include "qdbusinterface_p.h"
 #include "qdbusutil_p.h"
 #include "qdbusconnectionmanager_p.h"

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 4ed1cbb..ff6927c 100644 (file)
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include "qdbusintegrator_p.h"
+
 #include <qcoreapplication.h>
 #include <qdebug.h>
 #include <qmetaobject.h>
@@ -62,7 +64,6 @@
 #include "qdbusmessage_p.h"
 #include "qdbuscontext_p.h"
 #include "qdbuspendingcall_p.h"
-#include "qdbusintegrator_p.h"
 
 #include "qdbusthreaddebug_p.h"
 

diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp
index 844b0b7..47b5b7b 100644 (file)
--- a/src/dbus/qdbusinterface.cpp
+++ b/src/dbus/qdbusinterface.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "qdbusinterface.h"
+#include "qdbusinterface_p.h"
 
 #include "qdbus_symbols_p.h"
 #include <QtCore/qpointer.h>
 #include <QtCore/qstringlist.h>
 
 #include "qdbusmetatype_p.h"
-#include "qdbusinterface_p.h"
 #include "qdbusconnection_p.h"
 
 #ifndef QT_NO_DBUS

diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 8863766..3f9e752 100644 (file)
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdbusmessage.h"
+#include "qdbusmessage_p.h"
 
 #include <qdebug.h>
 #include <qstringlist.h>
@@ -48,7 +49,6 @@
 
 #include "qdbusargument_p.h"
 #include "qdbuserror.h"
-#include "qdbusmessage_p.h"
 #include "qdbusmetatype.h"
 #include "qdbusconnection_p.h"
 #include "qdbusutil_p.h"

diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index e75aff4..dade978 100644 (file)
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdbusmetatype.h"
+#include "qdbusmetatype_p.h"
 
 #include <string.h>
 #include "qdbus_symbols_p.h"
@@ -49,7 +50,6 @@
 #include <qreadwritelock.h>
 #include <qvector.h>
 
-#include "qdbusmetatype_p.h"
 #include "qdbusargument_p.h"
 #include "qdbusutil_p.h"
 #include "qdbusunixfiledescriptor.h"