diff --git a/plugins/bluetooth/bluetoothplugin.cpp b/plugins/bluetooth/bluetoothplugin.cpp index ce4c6e178..7b70444fa 100644 --- a/plugins/bluetooth/bluetoothplugin.cpp +++ b/plugins/bluetooth/bluetoothplugin.cpp @@ -111,15 +111,6 @@ QWidget *BluetoothPlugin::itemPopupApplet(const QString &itemKey) return nullptr; } -const QString BluetoothPlugin::itemContextMenu(const QString &itemKey) -{ - if (itemKey == BLUETOOTH_KEY) { - return m_bluetoothItem->contextMenu(); - } - - return QString(); -} - void BluetoothPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) { if (itemKey == BLUETOOTH_KEY) { diff --git a/plugins/bluetooth/bluetoothplugin.h b/plugins/bluetooth/bluetoothplugin.h index 094eb4bf4..567c5fc2d 100644 --- a/plugins/bluetooth/bluetoothplugin.h +++ b/plugins/bluetooth/bluetoothplugin.h @@ -49,7 +49,6 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; QWidget *itemPopupApplet(const QString &itemKey) override; - const QString itemContextMenu(const QString &itemKey) override; void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; int itemSortKey(const QString &itemKey) override; void setSortKey(const QString &itemKey, const int order) override; diff --git a/plugins/onboard/onboardplugin.cpp b/plugins/onboard/onboardplugin.cpp index ba46219b6..c1c5b51e6 100644 --- a/plugins/onboard/onboardplugin.cpp +++ b/plugins/onboard/onboardplugin.cpp @@ -102,26 +102,6 @@ const QString OnboardPlugin::itemCommand(const QString &itemKey) return QString("dbus-send --print-reply --dest=org.onboard.Onboard /org/onboard/Onboard/Keyboard org.onboard.Onboard.Keyboard.ToggleVisible"); } -const QString OnboardPlugin::itemContextMenu(const QString &itemKey) -{ - Q_UNUSED(itemKey); - - QList items; - - QMap onboardSettings; - onboardSettings["itemId"] = "onboard-settings"; - onboardSettings["itemText"] = tr("Settings"); - onboardSettings["isActive"] = true; - items.push_back(onboardSettings); - - QMap menu; - menu["items"] = items; - menu["checkableMenu"] = false; - menu["singleCheck"] = false; - - return QJsonDocument::fromVariant(menu).toJson(); -} - void OnboardPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) { Q_UNUSED(itemKey) diff --git a/plugins/onboard/onboardplugin.h b/plugins/onboard/onboardplugin.h index 3d08b1795..ca79e2463 100644 --- a/plugins/onboard/onboardplugin.h +++ b/plugins/onboard/onboardplugin.h @@ -51,7 +51,6 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; const QString itemCommand(const QString &itemKey) override; - const QString itemContextMenu(const QString &itemKey) override; void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; void displayModeChanged(const Dock::DisplayMode displayMode) override; diff --git a/plugins/sound/soundplugin.cpp b/plugins/sound/soundplugin.cpp index 5e97e5f01..38f8b712b 100644 --- a/plugins/sound/soundplugin.cpp +++ b/plugins/sound/soundplugin.cpp @@ -110,15 +110,6 @@ QWidget *SoundPlugin::itemPopupApplet(const QString &itemKey) return nullptr; } -const QString SoundPlugin::itemContextMenu(const QString &itemKey) -{ - if (itemKey == SOUND_KEY) { - return m_soundItem->contextMenu(); - } - - return QString(); -} - void SoundPlugin::invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) { if (itemKey == SOUND_KEY) { diff --git a/plugins/sound/soundplugin.h b/plugins/sound/soundplugin.h index f14f5020a..29c1ad3e4 100644 --- a/plugins/sound/soundplugin.h +++ b/plugins/sound/soundplugin.h @@ -46,7 +46,6 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; QWidget *itemPopupApplet(const QString &itemKey) override; - const QString itemContextMenu(const QString &itemKey) override; void invokedMenuItem(const QString &itemKey, const QString &menuId, const bool checked) override; int itemSortKey(const QString &itemKey) override; void setSortKey(const QString &itemKey, const int order) override;