Review Request 126691: Add DBusMenuShortcut type overload for QDBusArgument

[Dāvis Mosāns]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/126691/
-----------------------------------------------------------

(Updated Feb. 8, 2016, 11:56 p.m.)


Status
------

This change has been marked as submitted.


Review request for Plasma.


Changes
-------

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


Repository: plasma-workspace


Description
-------

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


Diffs
-----

  dataengines/statusnotifieritem/libdbusmenuqt/dbusmenutypes_p.h 4950a22279c09fb93c68fe3d38ff600279e856ca 
  dataengines/statusnotifieritem/libdbusmenuqt/dbusmenutypes_p.cpp e98c4b93bc8532367ee96138ce72a54f44ac05ca 

Diff: https://git.reviewboard.kde.org/r/126691/diff/


Testing
-------

Compiles


Thanks,

Dāvis Mosāns

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20160208/6be8a83c/attachment.html>