diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-23 15:10:42 +0000 |
---|---|---|
committer | Tarmac <> | 2012-11-23 15:10:42 +0000 |
commit | 7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (patch) | |
tree | ce1737ac7431963279409530ca9f6fec7f812eae /tests/script/dbusmenuscript.cpp | |
parent | de8eea63b919b81132895dfe04ed676778c53f6f (diff) | |
parent | 5d755f40091afb5e1f2c4db1c7ba75c36e2d4a74 (diff) | |
download | qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.gz qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.bz2 qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.zip |
Removed QAction dependency from QStateAction.
Exported activate function on QStateAction.
Approved by Ugo Riboni, PS Jenkins bot.
Diffstat (limited to 'tests/script/dbusmenuscript.cpp')
-rw-r--r-- | tests/script/dbusmenuscript.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/script/dbusmenuscript.cpp b/tests/script/dbusmenuscript.cpp index b190d5b..8fa46c7 100644 --- a/tests/script/dbusmenuscript.cpp +++ b/tests/script/dbusmenuscript.cpp @@ -92,15 +92,20 @@ void DBusMenuScript::run() } } -QString DBusMenuScript::popActivatedAction() +QPair<QString, QVariant> DBusMenuScript::popActivatedAction() { if (m_script) { QDBusMessage reply = m_script->call("popActivatedAction"); if (reply.arguments().count() > 0) { - return reply.arguments()[0].toString(); + QVariant value; + QString name = reply.arguments()[0].toString(); + if (reply.arguments().count() > 1) { + value = reply.arguments()[1]; + } + return qMakePair(name, value); } } - return QString(); + return qMakePair(QString(), QVariant()); } |