Add DBusMenuShortcut type overload for QDBusArgument

Review Request #126691 - Created Jan. 10, 2016 and submitted

Information
Dāvis Mosāns
plasma-workspace
master
Reviewers
plasma

Add DBusMenuShortcut type overload for QDBusArgument.
I don't know if there's a better way to fix this than this kinda code duplication.

This is needed because otherwise it wouldn't compile with latest Qt dev branch. It's probably because QList<T> overload was removed in http://code.qt.io/cgit/qt/qtbase.git/commit/src/dbus/qdbusargument.h?h=dev&id=5f542f3cca13f2da58b82aee2efbaffefeee00a7

and Container<T> doesn't work...

/usr/include/QtDBus/qdbusargument.h:244:29: note: candidate: template<template<class> class Container, class T> const QDBusArgument& operator>>(const QDBusArgument&, Container<T>&)
inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<T> &list)
^
/usr/include/QtDBus/qdbusargument.h:244:29: note: template argument deduction/substitution failed:
/mnt/KDE/kde/workspace/plasma-workspace/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenuimporter.cpp:261:16: note: can't deduce a template for ‘Container<T>’ from non-template type ‘DBusMenuShortcut’
arg >> dmShortcut;
^
In file included from /usr/include/QtDBus/qdbuspendingreply.h:39:0,
from /usr/include/QtDBus/qdbusreply.h:44,
from /usr/include/QtDBus/QDBusReply:1,
from /mnt/KDE/kde/workspace/plasma-workspace/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenuimporter.cpp:27

Compiles

David Edmundson
David Edmundson
Dāvis Mosāns
Review request changed

Status: Closed (submitted)

Change Summary:

Submitted with commit 51266c34af7d778f850f41334f5527293680419a by D?vis Mos?ns to branch master.
Loading...