From 94d7f0e0fe652632069d4442f3d4d0ec42a6f4cb Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 26 Nov 2014 00:07:01 +0000 Subject: [PATCH] Format code --- app/main.cpp | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index ebe080b..94ddd34 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -61,7 +61,6 @@ int main( int argc, char *argv[] ) if( sessionBusInterface ) { - Bool force_new = false; QStringList filenameList; for( Int i = 1; i < argc; i++ ) @@ -84,8 +83,8 @@ int main( int argc, char *argv[] ) if( foundRunningService ) { // open given session - QDBusMessage m = QDBusMessage::createMethodCall( PLAYUVER_DBUS_SESSION_NAME, QStringLiteral( PLAYUVER_DBUS_PATH ), QStringLiteral( PLAYUVER_DBUS_SESSION_NAME ), - QStringLiteral( "activate" ) ); + QDBusMessage m = QDBusMessage::createMethodCall( PLAYUVER_DBUS_SESSION_NAME, QStringLiteral( PLAYUVER_DBUS_PATH ), + QStringLiteral( PLAYUVER_DBUS_SESSION_NAME ), QStringLiteral( "activate" ) ); QDBusConnection::sessionBus().call( m ); @@ -95,33 +94,33 @@ int main( int argc, char *argv[] ) QStringList tokens; // open given files... - foreach(const QString & file, filenameList){ - QDBusMessage m = QDBusMessage::createMethodCall(PLAYUVER_DBUS_SESSION_NAME, - QStringLiteral(PLAYUVER_DBUS_PATH), QStringLiteral(PLAYUVER_DBUS_SESSION_NAME), QStringLiteral("loadFile")); - - QList dbusargs; - dbusargs.append( file ); - m.setArguments(dbusargs); - - QDBusMessage res = QDBusConnection::sessionBus().call(m); - if (res.type() == QDBusMessage::ReplyMessage) + foreach(const QString & file, filenameList) { - if (res.arguments().count() == 1) + QDBusMessage m = QDBusMessage::createMethodCall(PLAYUVER_DBUS_SESSION_NAME, + QStringLiteral(PLAYUVER_DBUS_PATH), QStringLiteral(PLAYUVER_DBUS_SESSION_NAME), QStringLiteral("loadFile")); + + QList dbusargs; + dbusargs.append( file ); + m.setArguments(dbusargs); + + QDBusMessage res = QDBusConnection::sessionBus().call(m); + if (res.type() == QDBusMessage::ReplyMessage) { - QVariant v = res.arguments()[0]; - if (v.isValid()) + if (res.arguments().count() == 1) { - QString s = v.toString(); - if ((!s.isEmpty()) && (s != QStringLiteral("ERROR"))) + QVariant v = res.arguments()[0]; + if (v.isValid()) { - tokens << s; + QString s = v.toString(); + if ((!s.isEmpty()) && (s != QStringLiteral("ERROR"))) + { + tokens << s; + } } } } } - } - - // this will wait until exiting is emitted by the used instance, if wanted... + // this will wait until exiting is emitted by the used instance, if wanted... return needToBlock ? application.exec() : 0; } }