Merge lp:~davispuh/libdbusmenu-qt/libdbusmenu-qt into lp:libdbusmenu-qt

[Dāvis]

Add DBusMenuShortcut type overload for QDBusArgument

On Qt dev branch QList<T> overload is removed and thus this doesn't compile anymore. Also previously it worked only by luck.

See https://git.reviewboard.kde.org/r/126691/
and https://codereview.qt-project.org/144823

[Albert Astals Cid (aacid)]

dpkg-buildpackage fails

Linking CXX executable dbusmenuexportertest
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `DBusMenuExporterTest::testMenuShortcut()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/dbusmenuexportertest.cpp:489: undefined reference to `operator>>(QDBusArgument const&, DBusMenuShortcut&)'
collect2: error: ld returned 1 exit status

review: Needs Fixing

[Albert Astals Cid (aacid)]

Setting to Work in Progress, please set back to Needs Review when you fix the issue above.

[Dāvis (davispuh)]

Currently this isn't actually needed because commit which broke this was reverted for Qt 5.7 but it might be needed for some later release, that's not known yet...

Unmerged revisions

271. By Dāvis on 2016-08-29

merge

270. By Dāvis on 2016-08-29

Add DBusMenuShortcut type overload for QDBusArgument

=== modified file 'src/dbusmenutypes_p.cpp'
--- src/dbusmenutypes_p.cpp	2011-02-23 13:23:56 +0000
+++ src/dbusmenutypes_p.cpp	2016-08-29 17:03:23 +0000
@@ -95,6 +95,31 @@
     return argument;
 }
 
+//// DBusMenuShortcut
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &obj)
+{
+    argument.beginArray(qMetaTypeId<QStringList>());
+    typename QList<QStringList>::ConstIterator it = obj.constBegin();
+    typename QList<QStringList>::ConstIterator end = obj.constEnd();
+    for ( ; it != end; ++it)
+        argument << *it;
+    argument.endArray();
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &obj)
+{
+    argument.beginArray();
+    obj.clear();
+    while (!argument.atEnd()) {
+        QStringList item;
+        argument >> item;
+        obj.push_back(item);
+    }
+    argument.endArray();
+    return argument;
+}
+
 void DBusMenuTypes_register()
 {
     static bool registered = false;

=== modified file 'src/dbusmenutypes_p.h'
--- src/dbusmenutypes_p.h	2011-02-23 13:23:56 +0000
+++ src/dbusmenutypes_p.h	2016-08-29 17:03:23 +0000
@@ -50,6 +50,12 @@
 
 Q_DECLARE_METATYPE(DBusMenuItemList)
 
+//// DBusMenuShortcut
+
+class DBusMenuShortcut;
+
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &);
+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &);
 
 //// DBusMenuItemKeys
 /**

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-03-05 14:46:16 +0000
+++ tests/CMakeLists.txt	2016-08-29 17:03:23 +0000
@@ -75,6 +75,7 @@
 set(dbusmenuexportertest_SRCS
     dbusmenuexportertest.cpp
     testutils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/dbusmenutypes_p.cpp
     )
 
 if (NOT USE_QT5)