diff options
51 files changed, 339 insertions, 235 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" diff --git a/src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp b/src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp index a851e9f39f..92b4be9829 100644 --- a/src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp +++ b/src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include <QtCore> -#include <QtDBus> + static QVariant callMyDBusFunction() { return QVariant(); } diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp index 9cdc1601e6..a9e508c666 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp +++ b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp @@ -45,15 +45,17 @@ However it is maintained manually. */ -#include "qdbusmenuadaptor_p.h" -#include "qdbusplatformmenu_p.h" -#include <QtCore/QMetaObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QMetaObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QLocale> + +#include <private/qdbusmenuadaptor_p.h> +#include <private/qdbusplatformmenu_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor_p.h index 6612f019a7..396f9d220f 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor_p.h +++ b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor_p.h @@ -62,9 +62,10 @@ // We mean it. // -#include <QtCore/QObject> -#include <QtDBus/QtDBus> -#include "qdbusmenutypes_p.h" +#include <QObject> +#include <QDBusAbstractAdaptor> + +#include <private/qdbusmenutypes_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp index 429460f9e8..7f7c3975e8 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp +++ b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp @@ -39,18 +39,19 @@ #include <QtGui/qtgui-config.h> +#include <QDBusMessage> +#include <QDBusInterface> +#include <QDBusServiceWatcher> +#include <QDBusConnectionInterface> +#include <QDebug> +#include <QCoreApplication> + #ifndef QT_NO_SYSTEMTRAYICON -#include "../dbustray/qdbustrayicon_p.h" +#include <private/qdbustrayicon_p.h> #endif -#include "qdbusmenuconnection_p.h" -#include "qdbusmenuadaptor_p.h" -#include "qdbusplatformmenu_p.h" - -#include <QtDBus/QDBusMessage> -#include <QtDBus/QDBusServiceWatcher> -#include <QtDBus/QDBusConnectionInterface> -#include <qdebug.h> -#include <qcoreapplication.h> +#include <private/qdbusmenuconnection_p.h> +#include <private/qdbusmenuadaptor_p.h> +#include <private/qdbusplatformmenu_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/platform/unix/dbustray/qdbustrayicon.cpp b/src/gui/platform/unix/dbustray/qdbustrayicon.cpp index 9d222ffef6..1194e4ac66 100644 --- a/src/gui/platform/unix/dbustray/qdbustrayicon.cpp +++ b/src/gui/platform/unix/dbustray/qdbustrayicon.cpp @@ -41,23 +41,28 @@ #ifndef QT_NO_SYSTEMTRAYICON -#include <private/qdbusmenuconnection_p.h> -#include "qstatusnotifieritemadaptor_p.h" -#include <private/qdbusmenuadaptor_p.h> -#include <private/qdbusplatformmenu_p.h> -#include "qxdgnotificationproxy_p.h" +#include <QString> +#include <QDebug> +#include <QRect> +#include <QLoggingCategory> +#include <QStandardPaths> +#include <QDir> +#include <QMetaObject> +#include <QMetaEnum> +#include <QDBusConnectionInterface> +#include <QDBusArgument> +#include <QDBusMetaType> +#include <QDBusServiceWatcher> #include <qpa/qplatformmenu.h> -#include <qstring.h> -#include <qdebug.h> -#include <qrect.h> -#include <qloggingcategory.h> -#include <qstandardpaths.h> -#include <qdir.h> -#include <qmetaobject.h> #include <qpa/qplatformintegration.h> #include <qpa/qplatformservices.h> -#include <qdbusconnectioninterface.h> + +#include <private/qdbusmenuconnection_p.h> +#include <private/qstatusnotifieritemadaptor_p.h> +#include <private/qdbusmenuadaptor_p.h> +#include <private/qdbusplatformmenu_p.h> +#include <private/qxdgnotificationproxy_p.h> #include <private/qlockfile_p.h> #include <private/qguiapplication_p.h> diff --git a/src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor_p.h b/src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor_p.h index f2bb156b1d..01722348bb 100644 --- a/src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor_p.h +++ b/src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor_p.h @@ -62,14 +62,14 @@ // We mean it. // -#include <QtGui/private/qtguiglobal_p.h> +#include <private/qtguiglobal_p.h> QT_REQUIRE_CONFIG(systemtrayicon); -#include <QtCore/QObject> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QDBusAbstractAdaptor> -#include "qdbustraytypes_p.h" +#include <private/qdbustraytypes_p.h> QT_BEGIN_NAMESPACE class QDBusTrayIcon; diff --git a/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h b/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h index 495208f873..eb916e7512 100644 --- a/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h +++ b/src/gui/platform/unix/dbustray/qxdgnotificationproxy_p.h @@ -62,15 +62,17 @@ // We mean it. // -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QLoggingCategory> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QLoggingCategory> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> +#include <QDBusReply> QT_BEGIN_NAMESPACE diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp index 85a1d28999..86f2a266ea 100644 --- a/src/gui/platform/unix/qgenericunixthemes.cpp +++ b/src/gui/platform/unix/qgenericunixthemes.cpp @@ -39,32 +39,34 @@ #include "qgenericunixthemes_p.h" -#include "qpa/qplatformtheme_p.h" -#include "qpa/qplatformfontdatabase.h" // lcQpaFonts - -#include <QtGui/QPalette> -#include <QtGui/QFont> -#include <QtGui/QGuiApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QDebug> -#include <QtCore/QHash> +#include <QPalette> +#include <QFont> +#include <QGuiApplication> +#include <QDir> +#include <QFileInfo> +#include <QFile> +#include <QDebug> +#include <QHash> +#include <QLoggingCategory> +#include <QVariant> +#include <QStandardPaths> +#include <QStringList> #if QT_CONFIG(mimetype) -#include <QtCore/QMimeDatabase> +#include <QMimeDatabase> #endif -#include <QtCore/QLoggingCategory> #if QT_CONFIG(settings) -#include <QtCore/QSettings> +#include <QSettings> #endif -#include <QtCore/QVariant> -#include <QtCore/QStandardPaths> -#include <QtCore/QStringList> -#include <private/qguiapplication_p.h> + +#include <qpa/qplatformfontdatabase.h> // lcQpaFonts #include <qpa/qplatformintegration.h> #include <qpa/qplatformservices.h> #include <qpa/qplatformdialoghelper.h> +#include <qpa/qplatformtheme_p.h> + +#include <private/qguiapplication_p.h> #ifndef QT_NO_DBUS +#include <QDBusConnectionInterface> #include <private/qdbusplatformmenu_p.h> #include <private/qdbusmenubar_p.h> #endif diff --git a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h index 396a213aaa..3d11706c06 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h +++ b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h @@ -11,14 +11,16 @@ #ifndef QIBUSINPUTCONTEXTPROXY_H_1394889529 #define QIBUSINPUTCONTEXTPROXY_H_1394889529 -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> + /* * Proxy class for interface org.freedesktop.IBus.InputContext diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 7f8a0ea47b..32f9a834e0 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -38,30 +38,33 @@ ****************************************************************************/ #include "qibusplatforminputcontext.h" -#include <QtDebug> +#include <QDebug> #include <QTextCharFormat> #include <QGuiApplication> +#include <QWindow> +#include <QEvent> +#include <QFile> +#include <QStandardPaths> #include <QDBusVariant> -#include <qwindow.h> -#include <qevent.h> - -#include <qpa/qplatformcursor.h> -#include <qpa/qplatformscreen.h> -#include <qpa/qwindowsysteminterface_p.h> - -#include <QtGui/private/qguiapplication_p.h> - -#include <QtGui/private/qxkbcommon_p.h> +#include <QDBusPendingReply> +#include <QDBusReply> +#include <QDBusServiceWatcher> #include "qibusproxy.h" #include "qibusproxyportal.h" #include "qibusinputcontextproxy.h" #include "qibustypes.h" +#include <qpa/qplatformcursor.h> +#include <qpa/qplatformscreen.h> +#include <qpa/qwindowsysteminterface_p.h> + +#include <private/qguiapplication_p.h> +#include <private/qxkbcommon_p.h> + #include <sys/types.h> #include <signal.h> -#include <QtDBus> #ifndef IBUS_RELEASE_MASK #define IBUS_RELEASE_MASK (1 << 30) diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp index 6b46e106ab..9f6fbf4392 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp @@ -13,6 +13,8 @@ #include "qibusproxy.h" +#include <QDBusReply> + /* * Implementation of interface class QIBusProxy */ diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.h b/src/plugins/platforminputcontexts/ibus/qibusproxy.h index c9876deebf..c66e900664 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusproxy.h +++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.h @@ -11,14 +11,15 @@ #ifndef QIBUSPROXY_H_1308831142 #define QIBUSPROXY_H_1308831142 -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> #include "qibustypes.h" diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h b/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h index bdd1d9c395..4b921db814 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h +++ b/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h @@ -11,14 +11,15 @@ #ifndef QIBUSPROXYPORTAL_H #define QIBUSPROXYPORTAL_H -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> /* * Proxy class for interface org.freedesktop.IBus.Portal diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp index 443df271a8..eb1c0e3e06 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qibustypes.h" -#include <QtDBus> + #include <QHash> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp index c4dc2da623..ec153f6e0c 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp @@ -39,21 +39,21 @@ #include "qxdgdesktopportalfiledialog_p.h" -#include <QtCore/qeventloop.h> - -#include <QtDBus/QtDBus> #include <QDBusConnection> #include <QDBusMessage> #include <QDBusPendingCall> #include <QDBusPendingCallWatcher> #include <QDBusPendingReply> +#include <QDBusMetaType> +#include <QEventLoop> #include <QFile> #include <QMetaType> #include <QMimeType> #include <QMimeDatabase> #include <QRandomGenerator> #include <QWindow> +#include <QRegularExpression> QT_BEGIN_NAMESPACE diff --git a/tests/auto/dbus/qdbusabstractadaptor/myobject.h b/tests/auto/dbus/qdbusabstractadaptor/myobject.h index a0c5d5c129..768e817043 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/myobject.h +++ b/tests/auto/dbus/qdbusabstractadaptor/myobject.h @@ -29,8 +29,11 @@ #ifndef MYOBJECT_H #define MYOBJECT_H -#include <QtCore/QObject> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QVariant> +#include <QUrl> +#include <QDBusMessage> +#include <QDBusAbstractAdaptor> extern const char *slotSpy; extern QString valueSpy; diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp index 3e79fb77f4..a452d299b4 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp @@ -26,8 +26,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> -#include <QtDBus/QtDBus> + +#include <QCoreApplication> +#include <QDBusServer> +#include <QDBusContext> +#include <QDBusConnection> +#include <QDBusVariant> +#include <QDBusServer> #include "../myobject.h" diff --git a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp index fd74f45336..23fe3ff51a 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp @@ -26,12 +26,15 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qdebug.h> #include <QTest> - -#include <QtDBus> +#include <QDebug> +#include <QCoreApplication> +#include <QProcess> +#include <QTimer> +#include <QDBusConnection> +#include <QDBusInterface> +#include <QDBusConnectionInterface> #include "../qdbusmarshall/common.h" #include "myobject.h" diff --git a/tests/auto/dbus/qdbusabstractinterface/interface.h b/tests/auto/dbus/qdbusabstractinterface/interface.h index 209c7d359c..f9e6c0e028 100644 --- a/tests/auto/dbus/qdbusabstractinterface/interface.h +++ b/tests/auto/dbus/qdbusabstractinterface/interface.h @@ -29,9 +29,9 @@ #ifndef INTERFACE_H #define INTERFACE_H -#include <QtCore/QObject> -#include <QtCore/QHash> -#include <QtDBus/QDBusArgument> +#include <QObject> +#include <QHash> +#include <QDBusArgument> struct RegisteredType { diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp index 7f098aeb36..2ff7d31332 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp @@ -26,8 +26,15 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> -#include <QtDBus/QtDBus> + +#include <QCoreApplication> + +#include <QDBusServer> +#include <QDBusContext> +#include <QDBusMetaType> +#include <QDBusConnection> +#include <QDBusMessage> + #include "../interface.h" static const char serviceName[] = "org.qtproject.autotests.qpinger"; diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp index 613baaab41..7cdf9dfe9c 100644 --- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp @@ -26,15 +26,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qdebug.h> -#include <qsharedpointer.h> #include <QTest> #include <QTestEventLoop> +#include <QDebug> +#include <QCoreApplication> +#include <QSharedPointer> #include <QSignalSpy> - -#include <QtDBus> +#include <QProcess> +#include <QSemaphore> +#include <QDBusMetaType> +#include <QDBusConnectionInterface> +#include <QDBusInterface> #include "interface.h" #include "pinger_interface.h" diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index 314a23f987..cd6288ee34 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -29,12 +29,14 @@ #include "tst_qdbusconnection.h" -#include <qcoreapplication.h> -#include <qdebug.h> - #include <QTest> - -#include <QtDBus/QtDBus> +#include <QDebug> +#include <QProcess> +#include <QCoreApplication> +#include <QDBusConnection> +#include <QDBusReply> +#include <QDBusInterface> +#include <QDBusConnectionInterface> #ifdef Q_OS_UNIX # include <sys/types.h> diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h index d87d0e3773..a2e80149bc 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h @@ -31,9 +31,12 @@ #define TST_QDBUSCONNECTION_H #include <QObject> -#include <QtDBus/QtDBus> #include <QTest> #include <QTestEventLoop> +#include <QDBusMessage> +#include <QDBusConnection> +#include <QDBusServer> +#include <QDBusVirtualObject> class BaseObject: public QObject { diff --git a/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp b/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp index a150451d34..b93ebbc4cd 100644 --- a/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp +++ b/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp @@ -26,9 +26,10 @@ ** ****************************************************************************/ -#include <QtDBus> #include <QTest> #include <QTestEventLoop> +#include <QDBusConnection> +#include <QDBusConnectionInterface> #ifdef Q_OS_WIN # include <process.h> diff --git a/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp index 845360c93d..715b94d404 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp +++ b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp @@ -25,11 +25,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qdebug.h> #include <QTest> -#include <QtDBus/QtDBus> +#include <QDebug> +#include <QCoreApplication> +#include <QDBusConnection> #include <stdlib.h> diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp b/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp index cf306a7eb4..946a9a2d97 100644 --- a/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp +++ b/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp @@ -29,7 +29,7 @@ #include <qdebug.h> #include <QTest> -#include <QtDBus/QtDBus> + #include <stdlib.h> diff --git a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp index af1c64336d..87e2c8a1c1 100644 --- a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp +++ b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp @@ -25,8 +25,12 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtDBus> + #include <QTest> +#include <QDBusContext> +#include <QDBusConnection> +#include <QDBusInterface> +#include <QDBusReply> const char errorName[] = "org.qtproject.tst_QDBusContext.Error"; const char errorMsg[] = "A generic error"; diff --git a/tests/auto/dbus/qdbusinterface/myobject.h b/tests/auto/dbus/qdbusinterface/myobject.h index 32da7348f2..e6f6d4a505 100644 --- a/tests/auto/dbus/qdbusinterface/myobject.h +++ b/tests/auto/dbus/qdbusinterface/myobject.h @@ -29,9 +29,10 @@ #ifndef MYOBJECT_H #define MYOBJECT_H -#include <QtCore/QObject> -#include <QtDBus/QtDBus> - +#include <QObject> +#include <QDBusMessage> +#include <QDBusContext> +#include <QDBusConnection> class MyObject: public QObject, protected QDBusContext { diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp index 53eb9585f8..f7a935b1ba 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp @@ -26,8 +26,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> -#include <QtDBus/QtDBus> + +#include <QCoreApplication> +#include <QDBusServer> #include "../myobject.h" diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index 8ed8762987..0d619e9c91 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -25,18 +25,22 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -/* -*- C++ -*- - */ -#include <qcoreapplication.h> -#include <qmetatype.h> #include <QTest> +#include <QDebug> #include <QTestEventLoop> -#include <QtCore/qregularexpression.h> -#include <QtCore/qvariant.h> -#include <QtDBus/QtDBus> -#include <QtDBus/private/qdbus_symbols_p.h> -#include <qdebug.h> +#include <QCoreApplication> +#include <QMetaType> +#include <QRegularExpression> +#include <QVariant> +#include <QProcess> +#include <QTimer> +#include <QDBusInterface> +#include <QDBusConnectionInterface> +#include <QDBusVirtualObject> + +#include <private/qdbus_symbols_p.h> + #include "../qdbusmarshall/common.h" #include "myobject.h" diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index 705e1e065d..5caea5b14d 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -25,14 +25,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QList> -#include <QtCore/QList> + #include <QTest> #include <QTestEventLoop> -#include <QtDBus> - +#include <QObject> +#include <QVariant> +#include <QList> +#include <QDBusConnection> +#include <QDBusVariant> +#include <QDBusPendingCallWatcher> +#include <QDBusMetaType> class tst_QDBusLocalCalls: public QObject { diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h index 3dfe3e39bb..9bdc1ebe66 100644 --- a/tests/auto/dbus/qdbusmarshall/common.h +++ b/tests/auto/dbus/qdbusmarshall/common.h @@ -25,8 +25,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qmath.h> // qIsNan -#include <qvariant.h> + +#include <QtGlobal> +#include <QMap> +#include <QString> +#include <QVariant> +#include <QDateTime> +#include <QLine> +#include <QDBusObjectPath> +#include <QDBusSignature> +#include <QDBusUnixFileDescriptor> +#include <QDBusArgument> +#include <QDBusMetaType> #ifdef Q_OS_UNIX # include <private/qcore_unix_p.h> diff --git a/tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp b/tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp index cfcd51da7d..7333f5961d 100644 --- a/tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp +++ b/tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp @@ -25,8 +25,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> -#include <QtDBus/QtDBus> + +#include <QCoreApplication> +#include <QDBusMessage> +#include <QDBusConnection> static const char serviceName[] = "org.qtproject.autotests.qpong"; static const char objectPath[] = "/org/qtproject/qpong"; diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index 9078ef02ab..c6928ca28d 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -30,8 +30,6 @@ #include <QTest> #include <QTestEventLoop> -#include <QtDBus/QtDBus> - #include "common.h" #include <limits> diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp index 059b8cd483..3743a8ad07 100644 --- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp +++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp @@ -25,11 +25,15 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qmetatype.h> + #include <QTest> +#include <QCoreApplication> +#include <QMetaType> +#include <QDBusArgument> +#include <QDBusMetaType> +#include <QDBusError> +#include <QDBusUnixFileDescriptor> -#include <QtDBus/QtDBus> #include <private/qdbusmetaobject_p.h> class tst_QDBusMetaObject: public QObject diff --git a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp index 7bc6637a08..6735bdaf80 100644 --- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp @@ -25,11 +25,12 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qmetatype.h> -#include <QTest> -#include <QtDBus/QtDBus> +#include <QTest> +#include <QCoreApplication> +#include <QMetaType> +#include <QDBusArgument> +#include <QDBusMetaType> class tst_QDBusMetaType: public QObject { diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 474f9b9119..0698c4591f 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -26,13 +26,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QList> -#include <QtCore/QThread> + #include <QTest> #include <QTestEventLoop> -#include <QtDBus> +#include <QObject> +#include <QVariant> +#include <QList> +#include <QThread> +#include <QDBusAbstractAdaptor> +#include <QDBusMessage> +#include <QDBusConnection> +#include <QDBusPendingCallWatcher> +#include <QDBusInterface> #define TEST_INTERFACE_NAME "org.qtproject.QtDBus.MyObject" diff --git a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp index 647749da8e..21563799d4 100644 --- a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp +++ b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp @@ -25,11 +25,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QList> + #include <QTest> -#include <QtDBus> +#include <QObject> +#include <QVariant> +#include <QList> +#include <QDBusArgument> +#include <QDBusInterface> +#include <QDBusMetaType> +#include <QDBusAbstractAdaptor> +#include <QDBusPendingReply> typedef QMap<int,QString> IntStringMap; Q_DECLARE_METATYPE(IntStringMap) diff --git a/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp index c68f0e4300..0d217dae69 100644 --- a/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp +++ b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp @@ -25,13 +25,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qdebug.h> -#include <qvariant.h> #include <QTest> - -#include <QtDBus> +#include <QDebug> +#include <QCoreApplication> +#include <QVariant> +#include <QDBusArgument> +#include <QDBusInterface> +#include <QDBusMetaType> +#include <QDBusAbstractAdaptor> +#include <QDBusReply> typedef QMap<int,QString> IntStringMap; Q_DECLARE_METATYPE(IntStringMap) diff --git a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp index d1ebabdad3..d2c3a830ca 100644 --- a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp +++ b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp @@ -27,11 +27,11 @@ ** ****************************************************************************/ -#include <QtDBus/QDBusServiceWatcher> -#include <QtDBus> #include <QTest> #include <QSignalSpy> #include <QTestEventLoop> +#include <QDBusConnection> +#include <QDBusServiceWatcher> class tst_QDBusServiceWatcher: public QObject { diff --git a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp index 9c12dc8235..3e1ec4242b 100644 --- a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp @@ -25,16 +25,21 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include <QTest> #include <QTestEventLoop> -#include <QtDBus> -#include <QtCore/QVarLengthArray> -#include <QtCore/QThread> -#include <QtCore/QObject> -#include <QtCore/QSemaphore> -#include <QtCore/QMutex> -#include <QtCore/QWaitCondition> -#include <QtCore/QMap> +#include <QVarLengthArray> +#include <QThread> +#include <QObject> +#include <QSemaphore> +#include <QMutex> +#include <QWaitCondition> +#include <QMap> +#include <QDBusAbstractAdaptor> +#include <QDBusConnection> +#include <QDBusReply> +#include <QDBusConnectionInterface> +#include <QDBusInterface> class Thread : public QThread { diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp index 2867b64595..e935934fa1 100644 --- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp +++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp @@ -25,13 +25,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -/* -*- C++ -*- - */ -#include <qcoreapplication.h> -#include <qmetatype.h> + +#include <QCoreApplication> +#include <QDomDocument> +#include <QMetaType> #include <QTest> -#include <QtDBus/QtDBus> -#include <QtXml/QDomDocument> #define USE_PRIVATE_CODE #include "../qdbusmarshall/common.h" diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp index 6f0bca8bb1..3831a62f71 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ #include <QtCore/QtCore> -#include <QtDBus/QtDBus> + #include "../serverobject.h" diff --git a/tests/benchmarks/dbus/qdbusperformance/serverobject.h b/tests/benchmarks/dbus/qdbusperformance/serverobject.h index f3c2d96f02..b7ef2991c2 100644 --- a/tests/benchmarks/dbus/qdbusperformance/serverobject.h +++ b/tests/benchmarks/dbus/qdbusperformance/serverobject.h @@ -31,7 +31,8 @@ #define SERVEROBJECT_H #include <QObject> -#include <QtDBus/QtDBus> +#include <QDBusConnection> +#include <QDBusVariant> class ServerObject: public QObject { diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp index 60d6ba88cb..1f76c413be 100644 --- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp @@ -25,10 +25,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QtCore> + #include <QTest> #include <QTestEventLoop> -#include <QtDBus/QtDBus> +#include <QProcess> +#include <QDBusServiceWatcher> +#include <QDBusConnectionInterface> +#include <QDBusInterface> #include "./serverobject.h" |