Remove QtDBus includes

Per the discussion of QTBUG-88831, we determined that module-wide
imports are unfortunate, especially for compile times. Following this,
all QtDBus includes have been replaced with the headers for the classes
actually used in each file. Additionally, some cleanup of header file
order and format has been performed in the changed files.

Pick-to: 6.0
Change-Id: I62c1b75682a48422f0ba1168dd5d7bd0952808ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

6 files changed, 39 insertions, 31 deletions

diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
index cf2535930d..8878083ee9 100644
--- a/examples/dbus/complexpingpong/complexping.cpp
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -48,17 +48,18 @@
 **
 ****************************************************************************/
 
-#include <stdio.h>
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtCore/QProcess>
-#include <QtDBus/QtDBus>
-
 #include "ping-common.h"
 #include "complexping.h"
 
+#include <QCoreApplication>
+#include <QDBusReply>
+#include <QDBusServiceWatcher>
+#include <QFile>
+#include <QDebug>
+#include <QProcess>
+
+#include <stdio.h>
+
 void Ping::start(const QString &name)
 {
     if (name != SERVICE_NAME)
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp
index c9cc78b376..6b3430bc94 100644
--- a/examples/dbus/complexpingpong/complexpong.cpp
+++ b/examples/dbus/complexpingpong/complexpong.cpp
@@ -48,16 +48,17 @@
 **
 ****************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtDBus/QtDBus>
-
 #include "ping-common.h"
 #include "complexpong.h"
 
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QTimer>
+
+#include <stdio.h>
+#include <stdlib.h>
+
 // the property
 QString Pong::value() const
 {
diff --git a/examples/dbus/listnames/listnames.cpp b/examples/dbus/listnames/listnames.cpp
index 50203da73d..fcd0e060a4 100644
--- a/examples/dbus/listnames/listnames.cpp
+++ b/examples/dbus/listnames/listnames.cpp
@@ -48,10 +48,13 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-#include <QtDBus/QtDBus>
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDebug>
+#include <QStringList>
 
 void method1()
 {
diff --git a/examples/dbus/pingpong/ping.cpp b/examples/dbus/pingpong/ping.cpp
index e013a82eb2..64c1fe6bbf 100644
--- a/examples/dbus/pingpong/ping.cpp
+++ b/examples/dbus/pingpong/ping.cpp
@@ -48,12 +48,14 @@
 **
 ****************************************************************************/
 
-#include <stdio.h>
+#include "ping-common.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtDBus/QtDBus>
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusReply>
 
-#include "ping-common.h"
+#include <stdio.h>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp
index e1e362f218..37f6261142 100644
--- a/examples/dbus/pingpong/pong.cpp
+++ b/examples/dbus/pingpong/pong.cpp
@@ -48,16 +48,17 @@
 **
 ****************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtDBus/QtDBus>
-
 #include "ping-common.h"
 #include "pong.h"
 
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QTimer>
+
+#include <stdio.h>
+#include <stdlib.h>
+
 QString Pong::ping(const QString &arg)
 {
     QMetaObject::invokeMethod(QCoreApplication::instance(), "quit");
diff --git a/examples/dbus/remotecontrolledcar/controller/main.cpp b/examples/dbus/remotecontrolledcar/controller/main.cpp
index 88edd13c1b..4aeff8635e 100644
--- a/examples/dbus/remotecontrolledcar/controller/main.cpp
+++ b/examples/dbus/remotecontrolledcar/controller/main.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 #include <QtWidgets>
-#include <QtDBus>
+
 
 #include "controller.h"