diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2016-03-17 09:25:23 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2016-03-17 09:25:23 -0500 |
commit | 65eba5e107b0499aec4bed55be202bf1df6710bb (patch) | |
tree | 6bb113dc095b2b5db19bd318441aeaf1b596d475 /tests/unit | |
parent | 3ef931c4bc8d87497dbe9f6ceda9ce4ca3bb116f (diff) | |
download | ayatana-indicator-display-65eba5e107b0499aec4bed55be202bf1df6710bb.tar.gz ayatana-indicator-display-65eba5e107b0499aec4bed55be202bf1df6710bb.tar.bz2 ayatana-indicator-display-65eba5e107b0499aec4bed55be202bf1df6710bb.zip |
add tests/utils/qdbus-helpers.h so that we only define qDBusArgumentToMap() in one place
Diffstat (limited to 'tests/unit')
-rw-r--r-- | tests/unit/usb-snap-test.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp index 84555cc..e8f8bb2 100644 --- a/tests/unit/usb-snap-test.cpp +++ b/tests/unit/usb-snap-test.cpp @@ -19,6 +19,7 @@ #define QT_NO_KEYWORDS #include <tests/utils/dbus-types.h> +#include <tests/utils/qdbus-helpers.h> #include <tests/utils/glib-fixture.h> #include <tests/utils/gtest-qt-print-helpers.h> @@ -64,20 +65,6 @@ public: protected: - bool qDBusArgumentToMap(QVariant const& variant, QVariantMap& map) - { - if (variant.canConvert<QDBusArgument>()) - { - QDBusArgument value(variant.value<QDBusArgument>()); - if (value.currentType() == QDBusArgument::MapType) - { - value >> map; - return true; - } - } - return false; - } - void SetUp() override { super::SetUp(); |