From f83816ec4fe3907e8545e8de2d4ff3c54c864c10 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 21 Jan 2016 20:19:49 +0300 Subject: [PATCH] dbusmenu: Fix return type for QDBusMenuAdaptor::EventGroup method Change-Id: If7454eeaafb31737f023e7359b2a1c513dd5772f Reviewed-by: Shawn Rutledge --- src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp | 3 ++- src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp b/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp index 381caf77b3..ef5f30470a 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp +++ b/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp @@ -102,10 +102,11 @@ void QDBusMenuAdaptor::Event(int id, const QString &eventId, const QDBusVariant item->trigger(); } -void QDBusMenuAdaptor::EventGroup(const QDBusMenuEventList &events) +QList QDBusMenuAdaptor::EventGroup(const QDBusMenuEventList &events) { Q_FOREACH (const QDBusMenuEvent &ev, events) Event(ev.m_id, ev.m_eventId, ev.m_data, ev.m_timestamp); + return QList(); // idErrors } QDBusMenuItemList QDBusMenuAdaptor::GetGroupProperties(const QList &ids, const QStringList &propertyNames) diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h b/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h index 41ab761f12..98eae53f0b 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h +++ b/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h @@ -157,7 +157,7 @@ public Q_SLOTS: // METHODS bool AboutToShow(int id); QList AboutToShowGroup(const QList &ids, QList &idErrors); void Event(int id, const QString &eventId, const QDBusVariant &data, uint timestamp); - void EventGroup(const QDBusMenuEventList &events); + QList EventGroup(const QDBusMenuEventList &events); QDBusMenuItemList GetGroupProperties(const QList &ids, const QStringList &propertyNames); uint GetLayout(int parentId, int recursionDepth, const QStringList &propertyNames, QDBusMenuLayoutItem &layout); QDBusVariant GetProperty(int id, const QString &name);