summaryrefslogtreecommitdiff
path: root/tests/test-dbus-pong
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-11 11:21:01 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-11 11:21:01 +0200
commit346a7524047a1aa1ec64810abb8b0243ae90c3bb (patch)
treeff122182776b0a08bea4e5074d39ed3cd9a76416 /tests/test-dbus-pong
parent7fc9e4c25b87945487723e594bb5320bd253526f (diff)
astyled the code
Diffstat (limited to 'tests/test-dbus-pong')
-rw-r--r--tests/test-dbus-pong/pong.h8
-rw-r--r--tests/test-dbus-pong/test-dbus-pong.cpp134
2 files changed, 67 insertions, 75 deletions
diff --git a/tests/test-dbus-pong/pong.h b/tests/test-dbus-pong/pong.h
index 21f0082..3e81aa0 100644
--- a/tests/test-dbus-pong/pong.h
+++ b/tests/test-dbus-pong/pong.h
@@ -5,11 +5,11 @@
class Pong: public QObject
{
- Q_OBJECT
+ Q_OBJECT
public slots:
- Q_SCRIPTABLE QString ping(const QString &arg);
- Q_SCRIPTABLE unsigned int quit();
- Q_SCRIPTABLE unsigned int timeout();
+ Q_SCRIPTABLE QString ping(const QString &arg);
+ Q_SCRIPTABLE unsigned int quit();
+ Q_SCRIPTABLE unsigned int timeout();
};
#endif // _PONG_H_
diff --git a/tests/test-dbus-pong/test-dbus-pong.cpp b/tests/test-dbus-pong/test-dbus-pong.cpp
index c936cc4..fa4f71c 100644
--- a/tests/test-dbus-pong/test-dbus-pong.cpp
+++ b/tests/test-dbus-pong/test-dbus-pong.cpp
@@ -9,87 +9,79 @@
QString Pong::ping(const QString &arg)
{
- // Just return back
- return QString("%1").arg(arg);
+ // Just return back
+ return QString("%1").arg(arg);
}
unsigned int Pong::quit()
{
- // Quit application
- QMetaObject::invokeMethod(QCoreApplication::instance(), "quit");
- // Magic number
- return 12345;
+ // Quit application
+ QMetaObject::invokeMethod(QCoreApplication::instance(), "quit");
+ // Magic number
+ return 12345;
}
unsigned int Pong::timeout()
{
- // Timeout in testing application should be set to less than 2 seconds!
- sleep(2);
- // Just to suppress warning
- return 54321;
+ // Timeout in testing application should be set to less than 2 seconds!
+ sleep(2);
+ // Just to suppress warning
+ return 54321;
}
int main(int argc, char **argv)
{
- bool useSessionBus = false;
-
- QCoreApplication app(argc, argv);
- if( app.arguments().count() > 1 )
- {
- if( app.arguments().at(1) == "--session" )
- {
- useSessionBus = true;
- }
- }
-
- QDBusConnection* myBus;
- if( useSessionBus )
- {
- myBus = new QDBusConnection(QDBusConnection::systemBus().sessionBus());
- qDebug("Using session bus ...");
- }
- else
- {
- myBus = new QDBusConnection(QDBusConnection::systemBus().systemBus());
- qDebug("Using system bus ...");
- }
-
- // Check system bus connection
- if( !myBus->isConnected() )
- {
- // Cleanup!!
- delete myBus;
- myBus = NULL;
-
- if( useSessionBus )
- {
- qDebug("Cannot connect to the D-Bus session bus.");
- }
- else
- {
- qDebug("Cannot connect to the D-Bus system bus.");
- }
-
- return 1;
- }
-
- // Create listener service
- if( !myBus->registerService("com.nokia.dbusqeventloop.test") )
- {
- qDebug("%s", qPrintable(QDBusConnection::systemBus().lastError().message()));
- exit(2);
- }
-
- Pong pong;
- // Register all slots as dbus methods
- myBus->registerObject("/", &pong, QDBusConnection::ExportAllSlots);
-
- // Let's go!
- app.exec();
-
- // Cleanup!!
- delete myBus;
- myBus = NULL;
-
- return 0;
+ bool useSessionBus = false;
+
+ QCoreApplication app(argc, argv);
+ if (app.arguments().count() > 1) {
+ if (app.arguments().at(1) == "--session") {
+ useSessionBus = true;
+ }
+ }
+
+ QDBusConnection* myBus;
+ if (useSessionBus) {
+ myBus = new QDBusConnection(QDBusConnection::systemBus().sessionBus());
+ qDebug("Using session bus ...");
+ }
+ else {
+ myBus = new QDBusConnection(QDBusConnection::systemBus().systemBus());
+ qDebug("Using system bus ...");
+ }
+
+ // Check system bus connection
+ if (!myBus->isConnected()) {
+ // Cleanup!!
+ delete myBus;
+ myBus = NULL;
+
+ if (useSessionBus) {
+ qDebug("Cannot connect to the D-Bus session bus.");
+ }
+ else {
+ qDebug("Cannot connect to the D-Bus system bus.");
+ }
+
+ return 1;
+ }
+
+ // Create listener service
+ if (!myBus->registerService("com.nokia.dbusqeventloop.test")) {
+ qDebug("%s", qPrintable(QDBusConnection::systemBus().lastError().message()));
+ exit(2);
+ }
+
+ Pong pong;
+ // Register all slots as dbus methods
+ myBus->registerObject("/", &pong, QDBusConnection::ExportAllSlots);
+
+ // Let's go!
+ app.exec();
+
+ // Cleanup!!
+ delete myBus;
+ myBus = NULL;
+
+ return 0;
}