diff options
Diffstat (limited to 'src/platformsupport/dbusmenu')
5 files changed, 18 insertions, 7 deletions
diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp b/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp index f6a5144e2b..354b9c3a2e 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp +++ b/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp @@ -105,7 +105,7 @@ QList<int> QDBusMenuAdaptor::AboutToShowGroup(const QList<int> &ids, QList<int> qCDebug(qLcMenu) << ids; Q_UNUSED(idErrors) idErrors.clear(); - Q_FOREACH (int id, ids) + for (int id : ids) AboutToShow(id); return QList<int>(); // updatesNeeded } @@ -134,7 +134,7 @@ void QDBusMenuAdaptor::Event(int id, const QString &eventId, const QDBusVariant QList<int> QDBusMenuAdaptor::EventGroup(const QDBusMenuEventList &events) { - Q_FOREACH (const QDBusMenuEvent &ev, events) + for (const QDBusMenuEvent &ev : events) Event(ev.m_id, ev.m_eventId, ev.m_data, ev.m_timestamp); return QList<int>(); // idErrors } diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp b/src/platformsupport/dbusmenu/qdbusmenutypes.cpp index 546483fcec..82a13d2fa0 100644 --- a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp +++ b/src/platformsupport/dbusmenu/qdbusmenutypes.cpp @@ -113,7 +113,8 @@ uint QDBusMenuLayoutItem::populate(int id, int depth, const QStringList &propert void QDBusMenuLayoutItem::populate(const QDBusPlatformMenu *menu, int depth, const QStringList &propertyNames) { - Q_FOREACH (QDBusPlatformMenuItem *item, menu->items()) { + const auto items = menu->items(); + for (QDBusPlatformMenuItem *item : items) { QDBusMenuLayoutItem child; child.populate(item, depth - 1, propertyNames); m_children << child; @@ -136,7 +137,7 @@ const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuLayoutItem &i arg.beginStructure(); arg << item.m_id << item.m_properties; arg.beginArray(qMetaTypeId<QDBusVariant>()); - foreach (const QDBusMenuLayoutItem& child, item.m_children) + for (const QDBusMenuLayoutItem &child : item.m_children) arg << QDBusVariant(QVariant::fromValue<QDBusMenuLayoutItem>(child)); arg.endArray(); arg.endStructure(); @@ -190,11 +191,13 @@ QDBusMenuItem::QDBusMenuItem(const QDBusPlatformMenuItem *item) m_properties.insert(QLatin1String("toggle-type"), toggleType); m_properties.insert(QLatin1String("toggle-state"), item->isChecked() ? 1 : 0); } +#ifndef QT_NO_SHORTCUT const QKeySequence &scut = item->shortcut(); if (!scut.isEmpty()) { QDBusMenuShortcut shortcut = convertKeySequence(scut); m_properties.insert(QLatin1String("shortcut"), QVariant::fromValue(shortcut)); } +#endif const QIcon &icon = item->icon(); if (!icon.name().isEmpty()) { m_properties.insert(QLatin1String("icon-name"), icon.name()); @@ -211,9 +214,9 @@ QDBusMenuItemList QDBusMenuItem::items(const QList<int> &ids, const QStringList { Q_UNUSED(propertyNames) QDBusMenuItemList ret; - QList<const QDBusPlatformMenuItem *> items = QDBusPlatformMenuItem::byIds(ids); + const QList<const QDBusPlatformMenuItem *> items = QDBusPlatformMenuItem::byIds(ids); ret.reserve(items.size()); - Q_FOREACH (const QDBusPlatformMenuItem *item, items) + for (const QDBusPlatformMenuItem *item : items) ret << QDBusMenuItem(item); return ret; } @@ -230,6 +233,7 @@ QString QDBusMenuItem::convertMnemonic(const QString &label) return ret; } +#ifndef QT_NO_SHORTCUT QDBusMenuShortcut QDBusMenuItem::convertKeySequence(const QKeySequence &sequence) { QDBusMenuShortcut shortcut; @@ -258,6 +262,7 @@ QDBusMenuShortcut QDBusMenuItem::convertKeySequence(const QKeySequence &sequence } return shortcut; } +#endif const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuEvent &ev) { diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes_p.h b/src/platformsupport/dbusmenu/qdbusmenutypes_p.h index 1de71b69e4..fd6727d3be 100644 --- a/src/platformsupport/dbusmenu/qdbusmenutypes_p.h +++ b/src/platformsupport/dbusmenu/qdbusmenutypes_p.h @@ -74,7 +74,9 @@ public: static QDBusMenuItemList items(const QList<int> &ids, const QStringList &propertyNames); static QString convertMnemonic(const QString &label); +#ifndef QT_NO_SHORTCUT static QDBusMenuShortcut convertKeySequence(const QKeySequence &sequence); +#endif static void registerDBusTypes(); int m_id; diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp index 446c3dfa83..15440a03cd 100644 --- a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp +++ b/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp @@ -134,10 +134,12 @@ void QDBusPlatformMenuItem::setHasExclusiveGroup(bool hasExclusiveGroup) m_hasExclusiveGroup = hasExclusiveGroup; } +#ifndef QT_NO_SHORTCUT void QDBusPlatformMenuItem::setShortcut(const QKeySequence &shortcut) { m_shortcut = shortcut; } +#endif void QDBusPlatformMenuItem::trigger() { @@ -156,7 +158,7 @@ QDBusPlatformMenuItem *QDBusPlatformMenuItem::byId(int id) QList<const QDBusPlatformMenuItem *> QDBusPlatformMenuItem::byIds(const QList<int> &ids) { QList<const QDBusPlatformMenuItem *> ret; - Q_FOREACH (int id, ids) { + for (int id : ids) { if (menuItemsByID.contains(id)) ret << menuItemsByID[id]; } diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h index f641ff5d8e..38c27e8051 100644 --- a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h +++ b/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h @@ -99,8 +99,10 @@ public: void setChecked(bool isChecked) Q_DECL_OVERRIDE; bool hasExclusiveGroup() const { return m_hasExclusiveGroup; } void setHasExclusiveGroup(bool hasExclusiveGroup) Q_DECL_OVERRIDE; +#ifndef QT_NO_SHORTCUT QKeySequence shortcut() const { return m_shortcut; } void setShortcut(const QKeySequence& shortcut) Q_DECL_OVERRIDE; +#endif void setIconSize(int size) Q_DECL_OVERRIDE { Q_UNUSED(size); } void setNativeContents(WId item) Q_DECL_OVERRIDE { Q_UNUSED(item); } |