Remove obsolete ServiceTypes definitions

Task: https://phabricator.kde.org/T14483
pluginloader: Do not check ServiceTypes in Sailfish OS codepath
2021-06-09 08:26:41 +02:00 · 2021-06-09 08:26:27 +02:00
29 changed files with 3 additions and 91 deletions
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@ -33,12 +33,8 @@ PluginLoader::PluginLoader()
    for (auto& staticPlugin : staticPlugins) {
        QJsonObject jsonMetadata = staticPlugin.metaData().value(QStringLiteral("MetaData")).toObject();
        KPluginMetaData metadata(jsonMetadata, QString());
-        if (metadata.serviceTypes().contains(QStringLiteral("KdeConnect/Plugin"))) {
-            plugins.insert(metadata.pluginId(), metadata);
-            pluginsFactories.insert(
-                metadata.pluginId(),
-                qobject_cast<KPluginFactory*>(staticPlugin.instance()));
-        }
+        plugins.insert(metadata.pluginId(), metadata);
+        pluginsFactories.insert( metadata.pluginId(), qobject_cast<KPluginFactory*>(staticPlugin.instance()));
    }
 #else
    const QVector<KPluginMetaData> data = KPluginLoader::findPlugins(QStringLiteral("kdeconnect/"));
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@ -134,9 +134,6 @@
        "Name[x-test]": "xxBattery monitorxx",
        "Name[zh_CN]": "电池监视器",
        "Name[zh_TW]": "電池監視器",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/bigscreen/kdeconnect_bigscreen.json
+++ b/plugins/bigscreen/kdeconnect_bigscreen.json
@ -104,9 +104,6 @@
        "Name[uk]": "Великий екран",
        "Name[x-test]": "xxBigscreenxx",
        "Name[zh_CN]": "大屏幕",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://aiix.tk"
    },
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@ -135,9 +135,6 @@
        "Name[x-test]": "xxClipboardxx",
        "Name[zh_CN]": "剪切板",
        "Name[zh_TW]": "剪貼簿",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/connectivity-report/kdeconnect_connectivity_report.json
+++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json
@ -85,9 +85,6 @@
        "Name[uk]": "Монітор з'єднання",
        "Name[x-test]": "xxConnectivity monitorxx",
        "Name[zh_CN]": "信号监视器",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "1.0"
    },
    "X-KdeConnect-OutgoingPacketType": [
--- a/plugins/contacts/kdeconnect_contacts.json
+++ b/plugins/contacts/kdeconnect_contacts.json
@ -116,9 +116,6 @@
        "Name[x-test]": "xxContactsxx",
        "Name[zh_CN]": "联系人",
        "Name[zh_TW]": "聯絡人",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@ -175,9 +175,6 @@
        "Name[x-test]": "xxRing my phonexx",
        "Name[zh_CN]": "让我的手机响铃",
        "Name[zh_TW]": "撥打我的電話",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://kde.org"
    },
--- a/plugins/findthisdevice/kdeconnect_findthisdevice.json
+++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json
@ -116,9 +116,6 @@
        "Name[x-test]": "xxFind this devicexx",
        "Name[zh_CN]": "查找此设备",
        "Name[zh_TW]": "尋找這個裝置",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://kde.org"
    },
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@ -129,9 +129,6 @@
        "Name[x-test]": "xxLockDevicexx",
        "Name[zh_CN]": "锁定设备",
        "Name[zh_TW]": "鎖定裝置",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://kde.org"
    },
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@ -134,9 +134,6 @@
        "Name[x-test]": "xxVirtual inputxx",
        "Name[zh_CN]": "虚拟输入",
        "Name[zh_TW]": "虛擬輸入",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1"
    },
    "X-KdeConnect-OutgoingPacketType": [
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@ -132,9 +132,6 @@
        "Name[x-test]": "xxMultimedia control receiverxx",
        "Name[zh_CN]": "多媒体控制接收器",
        "Name[zh_TW]": "多媒體控制接收器",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@ -128,9 +128,6 @@
        "Name[x-test]": "xxMprisRemotexx",
        "Name[zh_CN]": "远程 Mpris",
        "Name[zh_TW]": "MprisRemote",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://kde.org"
    },
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@ -131,9 +131,6 @@
        "Name[x-test]": "xxReceive notificationsxx",
        "Name[zh_CN]": "接收通知",
        "Name[zh_TW]": "收到通知",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@ -133,9 +133,6 @@
        "Name[x-test]": "xxPause media during callsxx",
        "Name[zh_CN]": "来电时暂停媒体",
        "Name[zh_TW]": "在通話過程中暫停媒體",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/photo/kdeconnect_photo.json
+++ b/plugins/photo/kdeconnect_photo.json
@ -117,9 +117,6 @@
        "Name[x-test]": "xxPhotoxx",
        "Name[zh_CN]": "照片",
        "Name[zh_TW]": "相片",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://nicolasfella.wordpress.com"
    },
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@ -135,9 +135,6 @@
        "Name[x-test]": "xxPingxx",
        "Name[zh_CN]": "Ping",
        "Name[zh_TW]": "Ping 回應封包",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/presenter/kdeconnect_presenter.json
+++ b/plugins/presenter/kdeconnect_presenter.json
@ -117,10 +117,7 @@
        "Name[uk]": "Презентатор",
        "Name[x-test]": "xxPresenterxx",
        "Name[zh_CN]": "演讲者",
-        "Name[zh_TW]": "提供者",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ]
+        "Name[zh_TW]": "提供者"
    },
    "X-KdeConnect-OutgoingPacketType": [],
    "X-KdeConnect-SupportedPacketType": [
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@ -128,9 +128,6 @@
        "Name[x-test]": "xxHost remote commandsxx",
        "Name[zh_CN]": "主机远程命令",
        "Name[zh_TW]": "主機與遠端指令",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1"
    },
    "X-KdeConnect-OutgoingPacketType": [
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@ -130,9 +130,6 @@
        "Name[x-test]": "xxRemoteControlxx",
        "Name[zh_CN]": "远程控制",
        "Name[zh_TW]": "遠端控制",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://kde.org"
    },
--- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
+++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
@ -129,9 +129,6 @@
        "Name[x-test]": "xxRemote keyboard from the desktopxx",
        "Name[zh_CN]": "来自桌面的远程键盘",
        "Name[zh_TW]": "從桌面遠端控制鍵盤",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1"
    },
    "X-KdeConnect-OutgoingPacketType": [
--- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
+++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
@ -115,9 +115,6 @@
        "Name[x-test]": "xxRemote system volumexx",
        "Name[zh_CN]": "远程系统音量",
        "Name[zh_TW]": "遠端系統音量",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://nicolasfella.wordpress.com"
    },
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@ -178,9 +178,6 @@
        "Name[x-test]": "xxRun commandsxx",
        "Name[zh_CN]": "执行命令",
        "Name[zh_TW]": "執行命令",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@ -132,9 +132,6 @@
        "Name[x-test]": "xxInhibit screensaverxx",
        "Name[zh_CN]": "禁止屏保",
        "Name[zh_TW]": "停止螢幕保護",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    }
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json.in
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json.in
@ -82,9 +82,6 @@
        "Name[x-test]": "xxSend notificationsxx",
        "Name[zh_CN]": "发送通知",
        "Name[zh_TW]": "傳送通知",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@ -133,9 +133,6 @@
        "Name[x-test]": "xxRemote filesystem browserxx",
        "Name[zh_CN]": "远程文件系统浏览器",
        "Name[zh_TW]": "遠端檔案瀏覽器",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@ -134,9 +134,6 @@
        "Name[x-test]": "xxShare and receivexx",
        "Name[zh_CN]": "分享和接收",
        "Name[zh_TW]": "分享及接收",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },
--- a/plugins/sms/kdeconnect_sms.json
+++ b/plugins/sms/kdeconnect_sms.json
@ -119,9 +119,6 @@
        "Name[x-test]": "xxSMSxx",
        "Name[zh_CN]": "短信",
        "Name[zh_TW]": "文字簡訊",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://nicolasfella.wordpress.com"
    },
--- a/plugins/systemvolume/kdeconnect_systemvolume.json
+++ b/plugins/systemvolume/kdeconnect_systemvolume.json
@ -116,9 +116,6 @@
        "Name[x-test]": "xxSystem volumexx",
        "Name[zh_CN]": "系统音量",
        "Name[zh_TW]": "系統音量",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://nicolasfella.wordpress.com"
    },
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@ -126,9 +126,6 @@
        "Name[x-test]": "xxTelephony integrationxx",
        "Name[zh_CN]": "Telephony 集成",
        "Name[zh_TW]": "電話整合",
-        "ServiceTypes": [
-            "KdeConnect/Plugin"
-        ],
        "Version": "0.1",
        "Website": "https://albertvaka.wordpress.com"
    },