From fbf4fcbce0cf31739e4a76aeef84fe605dbf1c03 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Mon, 18 Apr 2022 21:21:21 +0200 Subject: [PATCH] Derive plugin id from filename, clean up json files We ignore the name/description and only display the id in the ui. To make sure the is are the same, the OUTPUT_NAME cmake target property is set. Otherwise, we would need a json file with the KPlugin object and then the id in it, which is unnecessary work for sth. that can be done in a single line. Having the file base name and id differ is also discouraged, see https://phabricator.kde.org/T14499 --- CMakeLists.txt | 2 +- events/x11/CMakeLists.txt | 1 + events/x11/krfb_events_x11.json | 66 --------------- events/x11/x11eventsplugin.cpp | 2 +- events/xdp/CMakeLists.txt | 1 + events/xdp/krfb_events_xdp.json | 66 --------------- events/xdp/xdpeventsplugin.cpp | 2 +- framebuffers/pipewire/CMakeLists.txt | 1 + .../pipewire/krfb_framebuffer_pw.json | 70 ---------------- .../pipewire/pw_framebufferplugin.cpp | 2 +- framebuffers/qt/CMakeLists.txt | 1 + framebuffers/qt/krfb_framebuffer_qt.json | 81 ------------------- framebuffers/qt/qtframebufferplugin.cpp | 2 +- framebuffers/xcb/CMakeLists.txt | 1 + framebuffers/xcb/krfb_framebuffer_xcb.json | 81 ------------------- framebuffers/xcb/xcb_framebufferplugin.cpp | 2 +- krfb/eventsmanager.cpp | 2 +- krfb/framebuffermanager.cpp | 2 +- krfb/mainwindow.cpp | 2 +- 19 files changed, 14 insertions(+), 373 deletions(-) delete mode 100644 events/x11/krfb_events_x11.json delete mode 100644 events/xdp/krfb_events_xdp.json delete mode 100644 framebuffers/pipewire/krfb_framebuffer_pw.json delete mode 100644 framebuffers/qt/krfb_framebuffer_qt.json delete mode 100644 framebuffers/xcb/krfb_framebuffer_xcb.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 885ee425..56e4f5cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE project(krfb VERSION ${RELEASE_SERVICE_VERSION}) set(QT_MIN_VERSION 5.15.0) -set(KF5_MIN_VERSION 5.86.0) +set(KF5_MIN_VERSION 5.91.0) find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH}) diff --git a/events/x11/CMakeLists.txt b/events/x11/CMakeLists.txt index a1af0e54..43921f4a 100644 --- a/events/x11/CMakeLists.txt +++ b/events/x11/CMakeLists.txt @@ -14,5 +14,6 @@ target_link_libraries (krfb_events_x11 KF5::CoreAddons krfbprivate ) +set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11) install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events) diff --git a/events/x11/krfb_events_x11.json b/events/x11/krfb_events_x11.json deleted file mode 100644 index c3c0407e..00000000 --- a/events/x11/krfb_events_x11.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "Encoding": "UTF-8", - "KPlugin": { - "Description": "X11 XFakeInput based event handler for KRfb", - "Description[ca@valencia]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per a KRfb", - "Description[ca]": "Gestor d'esdeveniments basat en «XFakeInput» de l'X11 per al KRfb", - "Description[da]": "X11 XFakeInput baseret hændelseshåndtering til KRfb", - "Description[de]": "Ereignis-Modul basierend auf X11 XFakeInput für KRfb", - "Description[el]": "Χειριστής γεγονότων με βάση το X11 XFakeInput για το KRfb", - "Description[en_GB]": "X11 XFakeInput based event handler for KRfb", - "Description[es]": "Gestor de eventos basado en XFakeInput de X11 para KRfb", - "Description[et]": "KRfb X11 XFakeInput'i põhine sündmuste käitleja", - "Description[eu]": "KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea", - "Description[fi]": "KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä", - "Description[fr]": "Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb", - "Description[gl]": "Xestor de eventos para KRfb baseado no XFakeInput de X11", - "Description[ia]": "Maneator de evento de X11 basate sur XFakeInput per KRfb", - "Description[it]": "Gestore eventi basato su XFakeInput di X11 per KRfb", - "Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러", - "Description[nl]": "Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb", - "Description[nn]": "X11 XFakeInput-basert hendingshandtering for KRfb", - "Description[pl]": "Obsługa wydarzeń X11 oparta na XFakeInput dla KRfb", - "Description[pt]": "Tratamento de eventos baseado no XFakeInput do X11 para o KRfb", - "Description[pt_BR]": "Manipulador de eventos baseado no XFakeInput do X11 para o KRfb", - "Description[sk]": "X11 Spracovateľ udalostí založený na XFakeInput pre KRfb", - "Description[sl]": "Upravljavec dogodkov za KRfb na osnovi X11 XFakeInput", - "Description[sv]": "Händelsehanterare för KRfb baserad på X11 XFakeInput", - "Description[uk]": "Обробник подій для KRfb на основі XFakeInput X11", - "Description[x-test]": "xxX11 XFakeInput based event handler for KRfbxx", - "Description[zh_CN]": "基于 X11 XFakeInput 的 KRfb 事件处理器", - "Description[zh_TW]": "KRfb 基於 X11 XFakeInput 的事件處理器", - "EnabledByDefault": true, - "Id": "x11", - "License": "GPL", - "Name": "X11 Event handler for KRfb", - "Name[ca@valencia]": "Gestor d'esdeveniments de l'X11 per a KRfb", - "Name[ca]": "Gestor d'esdeveniments de l'X11 per al KRfb", - "Name[da]": "X11 hændelseshåndtering til KRfb", - "Name[de]": "Ereignis-Modul basierend auf X11 für KRfb", - "Name[el]": "Χειριστής γεγονότων X11 για το KRfb", - "Name[en_GB]": "X11 Event handler for KRfb", - "Name[es]": "Gestor de eventos de X11 para KRfb", - "Name[et]": "KRfb X11 sündmuste käitleja", - "Name[eu]": "KRfb-rako X11 gertaera maneiatzailea", - "Name[fi]": "KRfb:n X11-tapahtumakäsittelijä", - "Name[fr]": "Gestionnaire d'évènements X11 pour KRfb", - "Name[gl]": "Xestor de eventos de X11 para KRfb", - "Name[ia]": "Manipulator de evento de X11 per KRfb", - "Name[it]": "Gestore eventi X11 per KRfb", - "Name[ko]": "KRfb X11 이벤트 핸들러", - "Name[nl]": "Op X11 behandelaar van gebeurtenis voor KRfb", - "Name[nn]": "X11-hendingshandsamar for KRfb", - "Name[pl]": "Obsługa wydarzeń X11 dla KRfb", - "Name[pt]": "Tratamento de eventos do X11 para o KRfb", - "Name[pt_BR]": "Manipulador de eventos do X11 para o KRfb", - "Name[sk]": "X11 Obsluha udalostí pre KRfb", - "Name[sl]": "Upravljavec dogodkov za KRfb na osnovi X11", - "Name[sv]": "X11-händelsehanterare för Krfb", - "Name[uk]": "Обробник подій для KRfb на основі X11", - "Name[x-test]": "xxX11 Event handler for KRfbxx", - "Name[zh_CN]": "X11 KRfb 事件处理器", - "Name[zh_TW]": "KRfb 的 X11 事件處理器", - "Version": "0.1", - "Website": "http://www.kde.org" - } -} diff --git a/events/x11/x11eventsplugin.cpp b/events/x11/x11eventsplugin.cpp index 89da5207..d45accd3 100644 --- a/events/x11/x11eventsplugin.cpp +++ b/events/x11/x11eventsplugin.cpp @@ -24,7 +24,7 @@ #include #include -K_PLUGIN_CLASS_WITH_JSON(X11EventsPlugin, "krfb_events_x11.json") +K_PLUGIN_CLASS(X11EventsPlugin) X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args) : EventsPlugin(parent, args) diff --git a/events/xdp/CMakeLists.txt b/events/xdp/CMakeLists.txt index 206abed1..dec815e7 100644 --- a/events/xdp/CMakeLists.txt +++ b/events/xdp/CMakeLists.txt @@ -21,6 +21,7 @@ target_link_libraries (krfb_events_xdp Qt5::DBus krfbprivate ) +set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp) install (TARGETS krfb_events_xdp DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/events diff --git a/events/xdp/krfb_events_xdp.json b/events/xdp/krfb_events_xdp.json deleted file mode 100644 index 88d4d0a1..00000000 --- a/events/xdp/krfb_events_xdp.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "Encoding": "UTF-8", - "KPlugin": { - "Description": "Xdg-desktop-portal based event handler for KRfb", - "Description[ca@valencia]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per a KRfb", - "Description[ca]": "Gestor d'esdeveniments basat en «Xdg-desktop-portal» per al KRfb", - "Description[da]": "Xdg-desktop-portal baseret hændelseshåndtering til KRfb", - "Description[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb", - "Description[el]": "Χειριστής γεγονότων με βάση το xdg-desktop-portal για το KRfb", - "Description[en_GB]": "Xdg-desktop-portal based event handler for KRfb", - "Description[es]": "Gestor de eventos basado en Xdg-desktop-portal para KRfb", - "Description[et]": "KRfb Xdg-desktop-portal'i põhine sündmuste käitleja", - "Description[eu]": "KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea", - "Description[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä", - "Description[fr]": "Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb", - "Description[gl]": "Xestor de eventos para KRfb baseado en Xdg-desktop-portal", - "Description[ia]": "Maneator de evento basate sur Xdg-desktop-portal per KRfb", - "Description[it]": "Gestore eventi basato su xdg-desktop-portal per KRfb", - "Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러", - "Description[nl]": "Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb", - "Description[nn]": "Xdg-desktop-portal-basert hendingshandtering for KRfb", - "Description[pl]": "Obsługa wydarzeń oparta na Xdg-desktop-portal dla KRfb", - "Description[pt]": "Tratamento de eventos baseado no Xdg-desktop-portal para o KRfb", - "Description[pt_BR]": "Manipulador de eventos baseado no xdg-desktop-portal para o KRfb", - "Description[sk]": "Obsluha udalostí založená na Xdg-desktop-portal pre KRfb", - "Description[sl]": "Upravljavec dogodkov, na osnovi portala Xdg-desktop za KRfb", - "Description[sv]": "Händelsehanterare för KRfb baserad på xdg-desktop-portal", - "Description[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal", - "Description[x-test]": "xxXdg-desktop-portal based event handler for KRfbxx", - "Description[zh_CN]": "基于 xdg-desktop-portal 的 KRfb 事件处理器", - "Description[zh_TW]": "KRfb 基於 Xdg-desktop-portal 的事件處理器", - "EnabledByDefault": true, - "Id": "xdp", - "License": "GPL", - "Name": "Xdg-desktop-portal Event handler for KRfb", - "Name[ca@valencia]": "Gestor d'esdeveniments «Xdg-desktop-portal» per a KRfb", - "Name[ca]": "Gestor d'esdeveniments «Xdg-desktop-portal» per al KRfb", - "Name[da]": "Xdg-desktop-portal hændelseshåndtering til KRfb", - "Name[de]": "Ereignis-Modul basierend auf Xdg-desktop-portal für KRfb", - "Name[el]": "Χειριστής γεγονότων xdg-desktop-portal για το KRfb", - "Name[en_GB]": "Xdg-desktop-portal Event handler for KRfb", - "Name[es]": "Gestor de eventos de Xdg-desktop-portal para KRfb", - "Name[et]": "KRfb Xdg-desktop-portal'i sündmuste käitleja", - "Name[eu]": "KRfb-rako «xdg-desktop-portal» gertaera maneiatzailea", - "Name[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä", - "Name[fr]": "Gestionnaire d'évènements Xdg-desktop-portal pour KRfb", - "Name[gl]": "Xestor de eventos de Xdg-desktop-portal para KRfb", - "Name[ia]": "Maneator de evento basate sur Xdg-desktop-portal per KRfb", - "Name[it]": "Gestore eventi xdg-desktop-portal per KRfb", - "Name[ko]": "KRfb Xdg-desktop-portal 이벤트 핸들러", - "Name[nl]": "Op Xdg-desktop-portal behandelaar van gebeurtenis voor KRfb", - "Name[nn]": "Xdg-desktop-portal-hendingshandtering for KRfb", - "Name[pl]": "Obsługa wydarzeń Xdg-desktop-portal dla KRfb", - "Name[pt]": "Tratamento de eventos do Xdg-desktop-portal para o KRfb", - "Name[pt_BR]": "Manipulador de eventos xdg-desktop-portal para o KRfb", - "Name[sk]": "Xdg-desktop-portal Obsluha udalostí pre KRfb", - "Name[sl]": "Upravljavec dogodkov za KRfb na osnovi portala Xdg-desktop", - "Name[sv]": "Xdg-desktop-portal händelsehanterare för Krfb", - "Name[uk]": "Обробник подій для KRfb на основі Xdg-desktop-portal", - "Name[x-test]": "xxXdg-desktop-portal Event handler for KRfbxx", - "Name[zh_CN]": "xdg-desktop-portal KRfb 事件处理器", - "Name[zh_TW]": "KRfb 的 Xdg-desktop-portal 事件處理器", - "Version": "0.1", - "Website": "http://www.kde.org" - } -} diff --git a/events/xdp/xdpeventsplugin.cpp b/events/xdp/xdpeventsplugin.cpp index a6dae61e..37f0141a 100644 --- a/events/xdp/xdpeventsplugin.cpp +++ b/events/xdp/xdpeventsplugin.cpp @@ -25,7 +25,7 @@ #include -K_PLUGIN_CLASS_WITH_JSON(XdpEventsPlugin, "krfb_events_xdp.json") +K_PLUGIN_CLASS(XdpEventsPlugin) XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args) : EventsPlugin(parent, args) diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt index 6a012f13..c311eb67 100644 --- a/framebuffers/pipewire/CMakeLists.txt +++ b/framebuffers/pipewire/CMakeLists.txt @@ -58,6 +58,7 @@ if (HAVE_DMA_BUF) ) endif() +set_target_properties(krfb_framebuffer_pw PROPERTIES OUTPUT_NAME pw) install (TARGETS krfb_framebuffer_pw DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer ) diff --git a/framebuffers/pipewire/krfb_framebuffer_pw.json b/framebuffers/pipewire/krfb_framebuffer_pw.json deleted file mode 100644 index a38179e1..00000000 --- a/framebuffers/pipewire/krfb_framebuffer_pw.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "Encoding": "UTF-8", - "KPlugin": { - "Description": "PipeWire based Framebuffer for KRfb.", - "Description[ca@valencia]": "«Framebuffer» basat en «PipeWire» per a KRfb.", - "Description[ca]": "«Framebuffer» basat en «PipeWire» per al KRfb.", - "Description[cs]": "Framebuffer založený na Pipe pro KRfb.", - "Description[da]": "PipeWire baseret framebuffer til KRfb.", - "Description[de]": "PipeWire-basierter Framebuffer für KRfb.", - "Description[el]": "Μνήμη ανανέωσης με βάση το pipewire για το KRfb.", - "Description[en_GB]": "PipeWire based Framebuffer for KRfb.", - "Description[es]": "Framebuffer basado en PipeWire para KRfb.", - "Description[et]": "KRfb PipeWire põhine kaadripuhver", - "Description[eu]": "KRfb-rako «PipeWire»n oinarritutako «Framebuffer».", - "Description[fi]": "KRfb:n PipeWire-pohjainen kehyspuskuri.", - "Description[fr]": "Tampon d'images utilisant PipeWire pour KRfb.", - "Description[gl]": "Búfer de fotograma para KRfb baseado en PipeWire.", - "Description[ia]": "Framebuffer basate sur PipeWire per KRfb.", - "Description[it]": "Framebuffer basato su PipeWire per KRfb.", - "Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.", - "Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.", - "Description[nn]": "PipeWire-basert biletbuffer for KRfb.", - "Description[pl]": "Bufor ramki oparty na PipeWire dla KRfb.", - "Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.", - "Description[pt_BR]": "Framebuffer baseado no PipeWire para o KRfb.", - "Description[ru]": "Буфер кадров для KRfb на базе Framebuffer", - "Description[sk]": "Framebuffer založený na PipeWire pre KRfb.", - "Description[sl]": "Slikovni medpomnilnik na osnovi PipeWire za KRfb.", - "Description[sv]": "Rambuffert för Krfb baserad på PipeWire", - "Description[uk]": "Буфер кадрів на основі PipeWire для KRfb.", - "Description[x-test]": "xxPipeWire based Framebuffer for KRfb.xx", - "Description[zh_CN]": "基于 PipeWire 的 KRfb 帧缓冲机制。", - "Description[zh_TW]": "KRfb 基於 PipeWire 的 Framebuffer。", - "EnabledByDefault": true, - "Id": "pw", - "License": "GPL3", - "Name": "PipeWire Framebuffer for KRfb", - "Name[ca@valencia]": "«Framebuffer» de «PipeWire» per a KRfb", - "Name[ca]": "«Framebuffer» del «PipeWire» per al KRfb", - "Name[cs]": "PipeWire Framebuffer pro KRfb", - "Name[da]": "PipeWire framebuffer til KRfb", - "Name[de]": "PipeWire-Framebuffer für KRfb", - "Name[el]": "Μνήμη ανανέωσης pipewire για το KRfb", - "Name[en_GB]": "PipeWire Framebuffer for KRfb", - "Name[es]": "Framebuffer de PipeWire para KRfb", - "Name[et]": "KRfb PipeWire kaadripuhver", - "Name[eu]": "KRfb-rako «PipeWire Framebuffer»", - "Name[fi]": "KRfb:n PipeWire-kehyspuskuri", - "Name[fr]": "Tampon d'images PipeWire pour KRfb", - "Name[gl]": "Búfer de fotograma de PipeWire para KRfb", - "Name[ia]": "Framebuffer de PipeWire per KRfb", - "Name[it]": "Framebuffer PipeWire per KRfb", - "Name[ko]": "KRfb용 PipeWire 프레임버퍼", - "Name[nl]": "PipeWire-framebuffer voor KRfb", - "Name[nn]": "PipeWire-biletbuffer for KRfb", - "Name[pl]": "Wtyczki buforów ramek PipeWire dla KRfb", - "Name[pt]": "'Framebuffer' do PipeWire para o KRfb", - "Name[pt_BR]": "Framebuffer PipeWire para o KRfb", - "Name[ru]": "Буфер кадров PipeWire для KRfb", - "Name[sk]": "PipeWire Framebuffer pre KRfb", - "Name[sl]": "Slikovni medpomnilnik za KRfb na osnovi PipeWire", - "Name[sv]": "PipeWire-rambuffert för Krfb", - "Name[uk]": "Буфер кадрів PipeWire для KRfb", - "Name[x-test]": "xxPipeWire Framebuffer for KRfbxx", - "Name[zh_CN]": "KRfb 的 PipeWire 帧缓冲机制", - "Name[zh_TW]": "KRfb 的 PipeWire Framebuffer", - "Version": "0.1", - "Website": "http://www.kde.org" - } -} diff --git a/framebuffers/pipewire/pw_framebufferplugin.cpp b/framebuffers/pipewire/pw_framebufferplugin.cpp index 4dc9f2ed..8f54889d 100644 --- a/framebuffers/pipewire/pw_framebufferplugin.cpp +++ b/framebuffers/pipewire/pw_framebufferplugin.cpp @@ -22,7 +22,7 @@ #include "pw_framebuffer.h" #include -K_PLUGIN_CLASS_WITH_JSON(PWFrameBufferPlugin, "krfb_framebuffer_pw.json") +K_PLUGIN_CLASS(PWFrameBufferPlugin) PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args) : FrameBufferPlugin(parent, args) diff --git a/framebuffers/qt/CMakeLists.txt b/framebuffers/qt/CMakeLists.txt index 703c7ec8..215e5a2c 100644 --- a/framebuffers/qt/CMakeLists.txt +++ b/framebuffers/qt/CMakeLists.txt @@ -27,6 +27,7 @@ target_link_libraries (krfb_framebuffer_qt krfbprivate ) +set_target_properties(krfb_framebuffer_qt PROPERTIES OUTPUT_NAME qt) install (TARGETS krfb_framebuffer_qt DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer ) diff --git a/framebuffers/qt/krfb_framebuffer_qt.json b/framebuffers/qt/krfb_framebuffer_qt.json deleted file mode 100644 index ccfffcd0..00000000 --- a/framebuffers/qt/krfb_framebuffer_qt.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "KPlugin": { - "Description": "Qt based Framebuffer for KRfb.", - "Description[ca@valencia]": "«Framebuffer» basat en les Qt per a KRfb.", - "Description[ca]": "«Framebuffer» basat en les Qt per al KRfb.", - "Description[cs]": "Framebuffer založený na Qt pro KRfb.", - "Description[da]": "Qt-baseret framebuffer til KRfb.", - "Description[de]": "Qt-basierter Framebuffer für KRfb.", - "Description[el]": "Μνήμη ανανέωσης βίντεο με βάση τhn Qt για το KRfb.", - "Description[en_GB]": "Qt based Framebuffer for KRfb.", - "Description[es]": "Framebuffer basado en Qt para KRfb.", - "Description[et]": "KRfb Qt põhine kaadripuhver", - "Description[eu]": "KRfb-rako Qt-n oinarritutako «Framebuffer».", - "Description[fi]": "KRfb:n Qt-pohjainen kehyspuskuri.", - "Description[fr]": "Tampon d'images utilisant Qt pour KRfb.", - "Description[gl]": "Framebuffer baseado en Qt para KRfb.", - "Description[ia]": "Framebuffer basate sur Qt per KRfb", - "Description[id]": "Framebuffer berbasiskan Qt untuk KRfb.", - "Description[it]": "Framebuffer basato su Qt per KRfb.", - "Description[ko]": "KRfb용 Qt 기반 프레임버퍼입니다.", - "Description[nl]": "Op Qt gebaseerd framebuffer voor KRfb.", - "Description[nn]": "Qt-basert biletbuffer for KRfb.", - "Description[pl]": "Bufor ramki oparty na Qt dla KRfb.", - "Description[pt]": "'Framebuffer' baseado no Qt para o KRfb.", - "Description[pt_BR]": "Framebuffer baseado no Qt para o KRfb.", - "Description[ru]": "Буфер кадров для KRfb на базе Qt", - "Description[sk]": "Framebuffer založený na Qt pre KRfb.", - "Description[sl]": "Slikovni medpomnilnik za KRfb na osnovi Qt.", - "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу КуТ‑у", - "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu Qt‑u", - "Description[sr@latin]": "Kadrobafer za KRFB na osnovu Qt‑u", - "Description[sr]": "Кадробафер за КРФБ на основу КуТ‑у", - "Description[sv]": "X11-rambuffert för Krfb.", - "Description[tr]": "KRfb için Qt tabanlı Çerçeve tamponu.", - "Description[uk]": "Заснований на Qt буфер кадрів для KRfb.", - "Description[x-test]": "xxQt based Framebuffer for KRfb.xx", - "Description[zh_CN]": "KRfb 的基于 Qt 的帧缓冲。", - "Description[zh_TW]": "KRfb 的 Qt-based Framebuffer", - "EnabledByDefault": true, - "Id": "qt", - "License": "GPL", - "Name": "Qt Framebuffer for KRfb", - "Name[ca@valencia]": "«Framebuffer» de les Qt per a KRfb", - "Name[ca]": "«Framebuffer» de les Qt per al KRfb", - "Name[cs]": "Qt Framebuffer pro KRfb", - "Name[da]": "Qt-framebuffer til KRfb", - "Name[de]": "Qt-Framebuffer für KRfb", - "Name[el]": "Μνήμη ανανέωσης βίντεο Qt για το KRfb", - "Name[en_GB]": "Qt Framebuffer for KRfb", - "Name[es]": "Framebuffer de Qt para KRfb", - "Name[et]": "KRfb Qt kaadripuhver", - "Name[eu]": "KRfb-rako Qt «Framebuffer»", - "Name[fi]": "KRfb:n Qt-kehyspuskuri", - "Name[fr]": "Tampon d'images Qt pour KRfb", - "Name[gl]": "Framebuffer de Qt para KRfb", - "Name[ia]": "Framebuffer Qt per KRfb", - "Name[id]": "Qt Framebuffer untuk KRfb", - "Name[it]": "Framebuffer Qt per KRfb", - "Name[ko]": "KRfb용 Qt 프레임버퍼", - "Name[nl]": "Qt-framebuffer voor KRfb", - "Name[nn]": "Qt-biletbuffer for KRfb", - "Name[pl]": "Bufor ramki Qt dla KRfb", - "Name[pt]": "'Framebuffer' do Qt para o KRfb", - "Name[pt_BR]": "Framebuffer do Qt para o KRfb", - "Name[ru]": "Буфер кадров Qt для KRfb", - "Name[sk]": "Qt Framebuffer pre KRfb", - "Name[sl]": "Slikovni medpomnilnik za KRfb na osnovi Qt", - "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ", - "Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB", - "Name[sr@latin]": "Qt‑ov kadrobafer za KRFB", - "Name[sr]": "КуТ‑ов кадробафер за КРФБ", - "Name[sv]": "QT-rambuffert för Krfb", - "Name[tr]": "KRfb için Qt Çerçeve tamponu", - "Name[uk]": "Буфер кадрів на Qt для KRfb", - "Name[x-test]": "xxQt Framebuffer for KRfbxx", - "Name[zh_CN]": "KRfb 的 Qt 帧缓冲", - "Name[zh_TW]": "Krfb 的 Qt Framebuffer", - "Version": "0.1", - "Website": "https://www.kde.org" - } -} diff --git a/framebuffers/qt/qtframebufferplugin.cpp b/framebuffers/qt/qtframebufferplugin.cpp index 7178047d..8bfa38bf 100644 --- a/framebuffers/qt/qtframebufferplugin.cpp +++ b/framebuffers/qt/qtframebufferplugin.cpp @@ -24,7 +24,7 @@ #include -K_PLUGIN_CLASS_WITH_JSON(QtFrameBufferPlugin, "krfb_framebuffer_qt.json") +K_PLUGIN_CLASS(QtFrameBufferPlugin) QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args) : FrameBufferPlugin(parent, args) diff --git a/framebuffers/xcb/CMakeLists.txt b/framebuffers/xcb/CMakeLists.txt index b3820460..e29a148e 100644 --- a/framebuffers/xcb/CMakeLists.txt +++ b/framebuffers/xcb/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries (krfb_framebuffer_xcb krfbprivate ) +set_target_properties(krfb_framebuffer_xcb PROPERTIES OUTPUT_NAME xcb) install (TARGETS krfb_framebuffer_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer ) diff --git a/framebuffers/xcb/krfb_framebuffer_xcb.json b/framebuffers/xcb/krfb_framebuffer_xcb.json deleted file mode 100644 index ddb7b5b2..00000000 --- a/framebuffers/xcb/krfb_framebuffer_xcb.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "KPlugin": { - "Description": "X11 XDamage/XShm based Framebuffer for KRfb.", - "Description[ca@valencia]": "«Framebuffer» basat en «XDamage/XShm» de l'X11 per a KRfb.", - "Description[ca]": "«Framebuffer» basat en «XDamage/XShm» de l'X11 per al KRfb.", - "Description[cs]": "Framebuffer založený na X11 XDamage/XShm pro KRfb.", - "Description[da]": "X11 XDamage/XShm-baseret framebuffer til KRfb.", - "Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.", - "Description[el]": "Μνήμη ανανέωσης βίντεο με βάση το X11 XDamage/XShm για το KRfb.", - "Description[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.", - "Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.", - "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver", - "Description[eu]": "KRfb-rako «X11 XDamage/XShm»en oinarritutako «Framebuffer».", - "Description[fi]": "KRfb:n X11 XDamage/XShm -pohjainen kehyspuskuri.", - "Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.", - "Description[gl]": "Framebuffer baseado en X11 XDamage/Xshm para XRfb.", - "Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.", - "Description[id]": "Framebuffer berbasiskan X11 XDamage/XShm untuk KRfb.", - "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.", - "Description[ko]": "KRfb용 X11 XDamage/XShm 기반 프레임버퍼입니다.", - "Description[nl]": "Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.", - "Description[nn]": "X11 XDamage/XShm-basert biletbuffer for KRfb.", - "Description[pl]": "Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.", - "Description[pt]": "'Framebuffer' do X11, baseado no XDamage/XShm, para o KRfb.", - "Description[pt_BR]": "Framebuffer baseado no XDamage/XShm do X11 para o KRfb.", - "Description[ru]": "Буфер кадров для KRfb на базе X11 XDamage/XShm", - "Description[sk]": "Framebuffer založený na X11 XDamage/XShm pre KRfb.", - "Description[sl]": "Slikovni medpomnilnik za KRfb, na osnovi X11 XDamage/XShm.", - "Description[sr@ijekavian]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.", - "Description[sr@ijekavianlatin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.", - "Description[sr@latin]": "Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.", - "Description[sr]": "Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.", - "Description[sv]": "X11 XDamage/XShm-baserad rambuffert för Krfb.", - "Description[tr]": "KRfb için X11 XDamage/XShm tabanlı Çerçeve tamponu.", - "Description[uk]": "Заснований на XDamage/XShm X11 буфер кадрів для KRfb.", - "Description[x-test]": "xxX11 XDamage/XShm based Framebuffer for KRfb.xx", - "Description[zh_CN]": "KRfb 的基于 X11 XDamage/XShm 的帧缓冲。", - "Description[zh_TW]": "KRfb 的 X11 XDamage/XShm based Framebuffer", - "EnabledByDefault": true, - "Id": "xcb", - "License": "GPL", - "Name": "X11 Framebuffer for KRfb", - "Name[ca@valencia]": "«Framebuffer» de l'X11 per a KRfb", - "Name[ca]": "«Framebuffer» de l'X11 per al KRfb", - "Name[cs]": "X11 Framebuffer pro KRfb", - "Name[da]": "X11-framebuffer til KRfb", - "Name[de]": "X11-Framebuffer für KRfb", - "Name[el]": "Μνήμη ανανέωσης βίντεο X11 για το KRfb.", - "Name[en_GB]": "X11 Framebuffer for KRfb", - "Name[es]": "Framebuffer X11 para KRfb", - "Name[et]": "KRfb X11 kaadripuhver", - "Name[eu]": "KRfb-rako «X11 Framebuffer»", - "Name[fi]": "KRfb:n X11-kehyspuskuri", - "Name[fr]": "Tampon d'images X11 pour KRfb", - "Name[gl]": "Framebuffer de X11 para KRfb", - "Name[ia]": "Framebuffer X11 per KRfb", - "Name[id]": "Framebuffer X11 untuk KRfb", - "Name[it]": "Framebuffer X11 per KRfb", - "Name[ko]": "KRfb용 X11 프레임버퍼", - "Name[nl]": "X11 framebuffer voor KRfb", - "Name[nn]": "X11-biletbuffer for KRfb", - "Name[pl]": "Bufor ramki X11 dla KRfb", - "Name[pt]": "'Framebuffer' do X11 para o KRfb", - "Name[pt_BR]": "Framebuffer do X11 para o KRfb", - "Name[ru]": "Буфер кадров X11 для KRfb", - "Name[sk]": "X11 Framebuffer pre KRfb", - "Name[sl]": "Slikovni medpomnilnik za KRfb na osnovi X11", - "Name[sr@ijekavian]": "Икс11 кадробафер за КРФБ.", - "Name[sr@ijekavianlatin]": "X11 kadrobafer za KRFB.", - "Name[sr@latin]": "X11 kadrobafer za KRFB.", - "Name[sr]": "Икс11 кадробафер за КРФБ.", - "Name[sv]": "X11-rambuffert för Krfb", - "Name[tr]": "KRfb için X11 Çerçeve tamponu", - "Name[uk]": "Буфер кадрів X11 для KRfb", - "Name[x-test]": "xxX11 Framebuffer for KRfbxx", - "Name[zh_CN]": "XRfb 的 X11 帧缓冲", - "Name[zh_TW]": "KRfb 的 X11 Framebuffer", - "Version": "0.1", - "Website": "https://www.kde.org" - } -} diff --git a/framebuffers/xcb/xcb_framebufferplugin.cpp b/framebuffers/xcb/xcb_framebufferplugin.cpp index b8bf4e40..dbcb599a 100644 --- a/framebuffers/xcb/xcb_framebufferplugin.cpp +++ b/framebuffers/xcb/xcb_framebufferplugin.cpp @@ -22,7 +22,7 @@ #include "xcb_framebuffer.h" #include -K_PLUGIN_CLASS_WITH_JSON(XCBFrameBufferPlugin, "krfb_framebuffer_xcb.json") +K_PLUGIN_CLASS(XCBFrameBufferPlugin) XCBFrameBufferPlugin::XCBFrameBufferPlugin(QObject *parent, const QVariantList &args) : FrameBufferPlugin(parent, args) diff --git a/krfb/eventsmanager.cpp b/krfb/eventsmanager.cpp index a6c63978..44351556 100644 --- a/krfb/eventsmanager.cpp +++ b/krfb/eventsmanager.cpp @@ -42,7 +42,7 @@ Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic) EventsManager::EventsManager() { - const QVector plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events")); + const QVector plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"), {}, KPluginMetaData::AllowEmptyMetaData); for (const KPluginMetaData &data : plugins) { const KPluginFactory::Result result = KPluginFactory::instantiatePlugin(data); if (result.plugin) { diff --git a/krfb/framebuffermanager.cpp b/krfb/framebuffermanager.cpp index 20242ce1..f1141dea 100644 --- a/krfb/framebuffermanager.cpp +++ b/krfb/framebuffermanager.cpp @@ -41,7 +41,7 @@ Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic) FrameBufferManager::FrameBufferManager() { - const QVector plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer")); + const QVector plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData); for (const KPluginMetaData &data : plugins) { const KPluginFactory::Result result = KPluginFactory::instantiatePlugin(data); if (result.plugin) { diff --git a/krfb/mainwindow.cpp b/krfb/mainwindow.cpp index 190ba123..c7d48d99 100644 --- a/krfb/mainwindow.cpp +++ b/krfb/mainwindow.cpp @@ -82,7 +82,7 @@ public: } void fillFrameBuffersCombo() { - const QVector plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer")); + const QVector plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData); for (const KPluginMetaData &metadata : plugins) { cb_preferredFrameBufferPlugin->addItem(metadata.pluginId()); }