diff options
Diffstat (limited to 'tests/auto')
27 files changed, 191 insertions, 109 deletions
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 fed87cc438..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 <QtTest/QtTest> - -#include <QtDBus> +#include <QTest> +#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 615b25e01a..7cdf9dfe9c 100644 --- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp @@ -26,13 +26,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcoreapplication.h> -#include <qdebug.h> -#include <qsharedpointer.h> -#include <QtTest/QtTest> - -#include <QtDBus> +#include <QTest> +#include <QTestEventLoop> +#include <QDebug> +#include <QCoreApplication> +#include <QSharedPointer> +#include <QSignalSpy> +#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 77ae6f154d..cd6288ee34 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -29,11 +29,14 @@ #include "tst_qdbusconnection.h" -#include <qcoreapplication.h> -#include <qdebug.h> - -#include <QtTest/QtTest> -#include <QtDBus/QtDBus> +#include <QTest> +#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 14a7243cf0..a2e80149bc 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h @@ -31,8 +31,12 @@ #define TST_QDBUSCONNECTION_H #include <QObject> -#include <QtDBus/QtDBus> -#include <QtTest/QtTest> +#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 5f54dff39b..b93ebbc4cd 100644 --- a/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp +++ b/tests/auto/dbus/qdbusconnection_delayed/tst_qdbusconnection_delayed.cpp @@ -26,8 +26,10 @@ ** ****************************************************************************/ -#include <QtDBus> -#include <QtTest> +#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 f97f891ff8..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 <QtTest/QtTest> -#include <QtDBus/QtDBus> +#include <QTest> +#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 e93b8aa609..1dc1c07124 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 @@ -28,8 +28,7 @@ #include <qcoreapplication.h> #include <qdebug.h> -#include <QtTest/QtTest> -#include <QtDBus/QtDBus> +#include <QTest> #include <stdlib.h> diff --git a/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp index cd49a7c742..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 <QtTest> + +#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 4cf2a81c6b..0d619e9c91 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -25,17 +25,22 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -/* -*- C++ -*- - */ - -#include <qcoreapplication.h> -#include <qmetatype.h> -#include <QtTest/QtTest> -#include <QtCore/qregularexpression.h> -#include <QtCore/qvariant.h> -#include <QtDBus/QtDBus> -#include <QtDBus/private/qdbus_symbols_p.h> -#include <qdebug.h> + +#include <QTest> +#include <QDebug> +#include <QTestEventLoop> +#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 90e0421883..5caea5b14d 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -25,13 +25,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QList> -#include <QtCore/QList> -#include <QtTest/QtTest> -#include <QtDBus> +#include <QTest> +#include <QTestEventLoop> +#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 aaa6e22392..c6928ca28d 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ #include <QtCore/QtCore> -#include <QtTest/QtTest> -#include <QtDBus/QtDBus> +#include <QTest> +#include <QTestEventLoop> #include "common.h" #include <limits> diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp index ae0f7a4140..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 <QtTest/QtTest> -#include <QtDBus/QtDBus> +#include <QTest> +#include <QCoreApplication> +#include <QMetaType> +#include <QDBusArgument> +#include <QDBusMetaType> +#include <QDBusError> +#include <QDBusUnixFileDescriptor> + #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 4fd8b8103f..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 <QtTest/QtTest> -#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 818579932b..0698c4591f 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -26,12 +26,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtCore/QObject> -#include <QtCore/QVariant> -#include <QtCore/QList> -#include <QtCore/QThread> -#include <QtTest/QtTest> -#include <QtDBus> + +#include <QTest> +#include <QTestEventLoop> +#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 2648b22f1f..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 <QtTest/QtTest> -#include <QtDBus> + +#include <QTest> +#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 362cbab902..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 <QtTest/QtTest> - -#include <QtDBus> +#include <QTest> +#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 1ba7ee51b1..d2c3a830ca 100644 --- a/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp +++ b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp @@ -27,9 +27,11 @@ ** ****************************************************************************/ -#include <QtDBus/QDBusServiceWatcher> -#include <QtDBus> -#include <QtTest> +#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 13c2c2bb61..3e1ec4242b 100644 --- a/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp @@ -25,15 +25,21 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest> -#include <QtDBus> -#include <QtCore/QVarLengthArray> -#include <QtCore/QThread> -#include <QtCore/QObject> -#include <QtCore/QSemaphore> -#include <QtCore/QMutex> -#include <QtCore/QWaitCondition> -#include <QtCore/QMap> + +#include <QTest> +#include <QTestEventLoop> +#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 264dbe127f..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 <QtTest/QtTest> -#include <QtDBus/QtDBus> -#include <QtXml/QDomDocument> + +#include <QCoreApplication> +#include <QDomDocument> +#include <QMetaType> +#include <QTest> #define USE_PRIVATE_CODE #include "../qdbusmarshall/common.h" |