Port framebuffers away from deprecated QDesktopWidget

Use QPlatformNativeInterface to get the WId instead
Fix broken WId refactoring
2026-07-02 00:01:18 -07:00 · 2022-08-04 13:22:57 +02:00 · 2022-08-04 11:57:55 +02:00 · 2022-08-03 22:00:16 +02:00 · 2022-07-16 01:03:44 +02:00 · 2022-07-16 01:01:12 +02:00
48 changed files with 124 additions and 736 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.16)

 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "22")
-set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "2")
+set (RELEASE_SERVICE_VERSION_MINOR "11")
+set (RELEASE_SERVICE_VERSION_MICRO "70")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(krfb VERSION ${RELEASE_SERVICE_VERSION})

-set(QT_MIN_VERSION 5.15.0)
-set(KF5_MIN_VERSION 5.86.0)
+set(QT_MIN_VERSION 5.15.2)
+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})
@@ -21,6 +21,7 @@ include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMSetupVersion)
 include(ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
 include(FeatureSummary)
 include(CheckIncludeFile)

@@ -60,22 +61,11 @@ if(WIN32)
    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
 endif(WIN32)

-add_definitions(
-    -DQT_DEPRECATED_WARNINGS
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_CAST_FROM_ASCII
-    -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_STRICT_ITERATORS
-    -DQT_NO_URL_CAST_FROM_STRING
-    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-    -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+    KF 5.91
 )

-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00)
-
-
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )

 find_package(LibVNCServer REQUIRED)
@@ -136,6 +126,9 @@ add_subdirectory(framebuffers)
 add_subdirectory(doc)
 add_subdirectory(icons)

+ki18n_install(po)
+kdoctools_install(po)
+
 ecm_qt_install_logging_categories(
    EXPORT KRFB
    FILE krfb.categories
--- 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)
--- a/events/x11/krfb_events_x11.json
+++ b/events/x11/krfb_events_x11.json
@@ -1,66 +0,0 @@
-{
-    "Encoding": "UTF-8",
-    "KPlugin": {
-        "Description": "X11 XFakeInput based event handler for KRfb",
-        "Description[ca@valencia]": "Gestor de successos 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 de successos 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"
-    }
-}
--- a/events/x11/x11eventsplugin.cpp
+++ b/events/x11/x11eventsplugin.cpp
@@ -24,8 +24,7 @@
 #include <KPluginFactory>
 #include <QX11Info>

-K_PLUGIN_FACTORY_WITH_JSON(X11EventsPluginFactory, "krfb_events_x11.json",
-               registerPlugin<X11EventsPlugin>();)
+K_PLUGIN_CLASS(X11EventsPlugin)

 X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
    : EventsPlugin(parent, args)
--- a/events/x11/x11eventsplugin.h
+++ b/events/x11/x11eventsplugin.h
@@ -31,7 +31,6 @@ class X11EventsPlugin : public EventsPlugin
    Q_OBJECT
 public:
    X11EventsPlugin(QObject *parent, const QVariantList &args);
-    ~X11EventsPlugin() override = default;

    EventHandler *eventHandler() override;

--- 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
--- a/events/xdp/krfb_events_xdp.json
+++ b/events/xdp/krfb_events_xdp.json
@@ -1,66 +0,0 @@
-{
-    "Encoding": "UTF-8",
-    "KPlugin": {
-        "Description": "Xdg-desktop-portal based event handler for KRfb",
-        "Description[ca@valencia]": "Gestor de successos 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 de successos «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"
-    }
-}
--- a/events/xdp/xdpeventsplugin.cpp
+++ b/events/xdp/xdpeventsplugin.cpp
@@ -25,8 +25,7 @@

 #include <KPluginFactory>

-K_PLUGIN_FACTORY_WITH_JSON(XdpEventsPluginFactory, "krfb_events_xdp.json",
-               registerPlugin<XdpEventsPlugin>();)
+K_PLUGIN_CLASS(XdpEventsPlugin)

 XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
    : EventsPlugin(parent, args)
--- a/events/xdp/xdpeventsplugin.h
+++ b/events/xdp/xdpeventsplugin.h
@@ -33,7 +33,6 @@ class XdpEventsPlugin : public EventsPlugin
    Q_OBJECT
 public:
    XdpEventsPlugin(QObject *parent, const QVariantList &args);
-    ~XdpEventsPlugin() override = default;

    EventHandler *eventHandler() override;

--- 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
 )
--- a/framebuffers/pipewire/krfb_framebuffer_pw.json
+++ b/framebuffers/pipewire/krfb_framebuffer_pw.json
@@ -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"
-    }
-}
--- a/framebuffers/pipewire/pw_framebuffer.cpp
+++ b/framebuffers/pipewire/pw_framebuffer.cpp
@@ -961,8 +961,8 @@ PWFrameBuffer::Private::~Private()
    }
 }

-PWFrameBuffer::PWFrameBuffer(WId winid, QObject *parent)
-    : FrameBuffer (winid, parent),
+PWFrameBuffer::PWFrameBuffer(QObject *parent)
+    : FrameBuffer (parent),
      d(new Private(this))
 {
    fb = nullptr;
--- a/framebuffers/pipewire/pw_framebuffer.h
+++ b/framebuffers/pipewire/pw_framebuffer.h
@@ -30,7 +30,7 @@ public:
    };
    using Streams = QList<Stream>;

-    PWFrameBuffer(WId winid, QObject *parent = nullptr);
+    PWFrameBuffer(QObject *parent = nullptr);
    virtual ~PWFrameBuffer() override;

    void initDBus();
--- a/framebuffers/pipewire/pw_framebufferplugin.cpp
+++ b/framebuffers/pipewire/pw_framebufferplugin.cpp
@@ -22,9 +22,7 @@
 #include "pw_framebuffer.h"
 #include <KPluginFactory>

-
-K_PLUGIN_FACTORY_WITH_JSON(PWFrameBufferPluginFactory, "krfb_framebuffer_pw.json",
-               registerPlugin<PWFrameBufferPlugin>();)
+K_PLUGIN_CLASS(PWFrameBufferPlugin)

 PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args)
    : FrameBufferPlugin(parent, args)
@@ -32,15 +30,9 @@ PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &ar
 }


-PWFrameBufferPlugin::~PWFrameBufferPlugin()
+FrameBuffer *PWFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
-}
-
-FrameBuffer *PWFrameBufferPlugin::frameBuffer(WId id, const QVariantMap &args)
-{
-    //NOTE WId is irrelevant in Wayland
-
-    auto pwfb = new PWFrameBuffer(id);
+    auto pwfb = new PWFrameBuffer;
    if (args.contains(QLatin1String("name"))) {
        pwfb->startVirtualMonitor(args[QStringLiteral("name")].toString(), args[QStringLiteral("resolution")].toSize(), args[QStringLiteral("scale")].toDouble());
    } else {
--- a/framebuffers/pipewire/pw_framebufferplugin.h
+++ b/framebuffers/pipewire/pw_framebufferplugin.h
@@ -33,9 +33,8 @@ class PWFrameBufferPlugin: public FrameBufferPlugin

 public:
   PWFrameBufferPlugin(QObject *parent, const QVariantList &args);
-   virtual ~PWFrameBufferPlugin() override;

-   FrameBuffer *frameBuffer(WId id, const QVariantMap &args) override;
+   FrameBuffer *frameBuffer(const QVariantMap &args) override;

 private:
   Q_DISABLE_COPY(PWFrameBufferPlugin)
--- a/framebuffers/pipewire/screencasting.cpp
+++ b/framebuffers/pipewire/screencasting.cpp
@@ -21,7 +21,7 @@ public:
        : q(q)
    {
    }
-    ~ScreencastingStreamPrivate()
+    ~ScreencastingStreamPrivate() override
    {
        close();
        q->deleteLater();
@@ -75,7 +75,7 @@ public:
    {
    }

-    ~ScreencastingPrivate()
+    ~ScreencastingPrivate() override
    {
        destroy();
    }
--- a/framebuffers/pipewire/screencasting.h
+++ b/framebuffers/pipewire/screencasting.h
@@ -58,7 +58,7 @@ public:
        Embedded = 2,
        Metadata = 4,
    };
-    Q_ENUM(CursorMode);
+    Q_ENUM(CursorMode)

    ScreencastingStream *createOutputStream(KWayland::Client::Output *output, CursorMode mode);
    ScreencastingStream *createWindowStream(KWayland::Client::PlasmaWindow *window, CursorMode mode);
--- a/framebuffers/qt/CMakeLists.txt
+++ b/framebuffers/qt/CMakeLists.txt
@@ -24,9 +24,11 @@ target_link_libraries (krfb_framebuffer_qt
                       Qt5::Core
                       Qt5::Gui
                       KF5::CoreAddons
+                       Qt::GuiPrivate
                       krfbprivate
 )

+set_target_properties(krfb_framebuffer_qt PROPERTIES OUTPUT_NAME qt)
 install (TARGETS krfb_framebuffer_qt
         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb/framebuffer
 )
--- a/framebuffers/qt/krfb_framebuffer_qt.json
+++ b/framebuffers/qt/krfb_framebuffer_qt.json
@@ -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"
-    }
-}
--- a/framebuffers/qt/qtframebuffer.cpp
+++ b/framebuffers/qt/qtframebuffer.cpp
@@ -13,17 +13,20 @@
 #include <QRegion>
 #include <QPixmap>
 #include <QBitmap>
-#include <QGuiApplication>
+#include <QApplication>
 #include <QScreen>
-
+#include <qpa/qplatformnativeinterface.h>

 const int UPDATE_TIME = 500;

-QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
-    : FrameBuffer(id, parent)
+QtFrameBuffer::QtFrameBuffer(QObject *parent)
+    : FrameBuffer(parent)
 {
    QScreen *screen = QGuiApplication::primaryScreen();
+    QPlatformNativeInterface* native = qApp->platformNativeInterface();
+
    if (screen) {
+        win = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), screen));
        primaryScreen = screen;
        fbImage = screen->grabWindow(win).toImage();
        fb = new char[fbImage.sizeInBytes()];
--- a/framebuffers/qt/qtframebuffer.h
+++ b/framebuffers/qt/qtframebuffer.h
@@ -22,7 +22,7 @@ class QtFrameBuffer : public FrameBuffer
 {
    Q_OBJECT
 public:
-    explicit QtFrameBuffer(WId id, QObject *parent = nullptr);
+    explicit QtFrameBuffer(QObject *parent = nullptr);

    ~QtFrameBuffer() override;

@@ -38,6 +38,7 @@ public Q_SLOTS:
    void updateFrameBuffer();

 private:
+    WId win;
    QImage fbImage;
    QTimer *t;
    QScreen *primaryScreen;
--- a/framebuffers/qt/qtframebufferplugin.cpp
+++ b/framebuffers/qt/qtframebufferplugin.cpp
@@ -24,22 +24,17 @@

 #include <KPluginFactory>

-K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
-			   registerPlugin<QtFrameBufferPlugin>();)
+K_PLUGIN_CLASS(QtFrameBufferPlugin)

 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
    : FrameBufferPlugin(parent, args)
 {
 }

-QtFrameBufferPlugin::~QtFrameBufferPlugin()
-{
-}
-
-FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id, const QVariantMap &args)
+FrameBuffer *QtFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
    Q_UNUSED(args);
-    return new QtFrameBuffer(id);
+    return new QtFrameBuffer;
 }

 #include "qtframebufferplugin.moc"
--- a/framebuffers/qt/qtframebufferplugin.h
+++ b/framebuffers/qt/qtframebufferplugin.h
@@ -33,9 +33,8 @@ class QtFrameBufferPlugin : public FrameBufferPlugin

 public:
    QtFrameBufferPlugin(QObject *parent, const QVariantList &args);
-    ~QtFrameBufferPlugin() override;

-    FrameBuffer *frameBuffer(WId id, const QVariantMap &args) override;
+    FrameBuffer *frameBuffer(const QVariantMap &args) override;

 private:
    Q_DISABLE_COPY(QtFrameBufferPlugin)
--- a/framebuffers/xcb/CMakeLists.txt
+++ b/framebuffers/xcb/CMakeLists.txt
@@ -20,6 +20,7 @@ add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
 target_link_libraries (krfb_framebuffer_xcb
                       Qt5::Core
                       Qt5::Gui
+                       Qt::GuiPrivate
                       XCB::XCB
                       XCB::RENDER
                       XCB::SHAPE
@@ -31,6 +32,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
 )
--- a/framebuffers/xcb/krfb_framebuffer_xcb.json
+++ b/framebuffers/xcb/krfb_framebuffer_xcb.json
@@ -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"
-    }
-}
--- a/framebuffers/xcb/xcb_framebuffer.cpp
+++ b/framebuffers/xcb/xcb_framebuffer.cpp
@@ -10,7 +10,6 @@
 #include "xcb_framebuffer.h"
 #include "krfb_fb_xcb_debug.h"

-#include <xcb/xcb.h>
 #include <xcb/xproto.h>
 #include <xcb/damage.h>
 #include <xcb/shm.h>
@@ -20,10 +19,11 @@
 #include <sys/shm.h>

 #include <QX11Info>
-#include <QCoreApplication>
+#include <QApplication>
 #include <QGuiApplication>
 #include <QScreen>
 #include <QAbstractNativeEventFilter>
+#include <qpa/qplatformnativeinterface.h>


 class KrfbXCBEventFilter: public QAbstractNativeEventFilter
@@ -131,6 +131,7 @@ public:
    bool                    running;

    QRect                   area;  // capture area, primary monitor coordinates
+    WId                     win;
 };


@@ -145,8 +146,8 @@ static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {



-XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
-    FrameBuffer(winid, parent), d(new XCBFrameBuffer::P)
+XCBFrameBuffer::XCBFrameBuffer(QObject *parent):
+    FrameBuffer(parent), d(new XCBFrameBuffer::P)
 {
    d->running = false;
    d->damage = XCB_NONE;
@@ -163,6 +164,8 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):

    QScreen *primaryScreen = QGuiApplication::primaryScreen();
    if (primaryScreen) {
+        QPlatformNativeInterface* native = qApp->platformNativeInterface();
+        d->win = reinterpret_cast<WId>(native->nativeResourceForScreen(QByteArrayLiteral("rootwindow"), primaryScreen));
        qreal scaleFactor = primaryScreen->devicePixelRatio();
        d->area = { primaryScreen->geometry().topLeft() * scaleFactor,
                    primaryScreen->geometry().bottomRight() * scaleFactor };
@@ -178,7 +181,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
    }

    d->framebufferImage = xcb_image_get(QX11Info::connection(),
-                                        this->win,
+                                        d->win,
                                        d->area.left(),
                                        d->area.top(),
                                        d->area.width(),
@@ -247,7 +250,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
            // will return 1 on success (yes!)
            int shmget_res = xcb_image_shm_get(
                        QX11Info::connection(),
-                        this->win,
+                        d->win,
                        d->updateTile,
                        d->shminfo,
                        d->area.left(), // x
@@ -555,7 +558,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                // translate whe coordinates
                xcb_shm_get_image_cookie_t sgi_cookie = xcb_shm_get_image(
                            QX11Info::connection(),
-                            this->win,
+                            d->win,
                            d->area.left() + r.left(),
                            d->area.top()  + r.top(),
                            r.width(),
@@ -610,7 +613,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                // need function that copies pixels from one image to another
                xcb_image_t *damagedImage = xcb_image_get(
                            QX11Info::connection(),
-                            this->win,
+                            d->win,
                            r.left(),
                            r.top(),
                            r.width(),
@@ -650,7 +653,7 @@ void XCBFrameBuffer::startMonitor() {

    d->running = true;
    d->damage = xcb_generate_id(QX11Info::connection());
-    xcb_damage_create(QX11Info::connection(), d->damage, this->win,
+    xcb_damage_create(QX11Info::connection(), d->damage, d->win,
            XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);

    // (currently) we do not call xcb_damage_subtract() EVER, because
--- a/framebuffers/xcb/xcb_framebuffer.h
+++ b/framebuffers/xcb/xcb_framebuffer.h
@@ -22,7 +22,7 @@ class XCBFrameBuffer: public FrameBuffer
 {
    Q_OBJECT
 public:
-    explicit XCBFrameBuffer(WId winid, QObject *parent = nullptr);
+    explicit XCBFrameBuffer(QObject *parent = nullptr);
    ~XCBFrameBuffer() override;

 public:
--- a/framebuffers/xcb/xcb_framebufferplugin.cpp
+++ b/framebuffers/xcb/xcb_framebufferplugin.cpp
@@ -22,25 +22,17 @@
 #include "xcb_framebuffer.h"
 #include <KPluginFactory>

-
-K_PLUGIN_FACTORY_WITH_JSON(XCBFrameBufferPluginFactory, "krfb_framebuffer_xcb.json",
-               registerPlugin<XCBFrameBufferPlugin>();)
+K_PLUGIN_CLASS(XCBFrameBufferPlugin)

 XCBFrameBufferPlugin::XCBFrameBufferPlugin(QObject *parent, const QVariantList &args)
    : FrameBufferPlugin(parent, args)
 {
 }

-
-XCBFrameBufferPlugin::~XCBFrameBufferPlugin()
-{
-}
-
-
-FrameBuffer *XCBFrameBufferPlugin::frameBuffer(WId id, const QVariantMap &args)
+FrameBuffer *XCBFrameBufferPlugin::frameBuffer(const QVariantMap &args)
 {
    Q_UNUSED(args);
-    return new XCBFrameBuffer(id);
+    return new XCBFrameBuffer;
 }

 #include "xcb_framebufferplugin.moc"
--- a/framebuffers/xcb/xcb_framebufferplugin.h
+++ b/framebuffers/xcb/xcb_framebufferplugin.h
@@ -33,9 +33,8 @@ class XCBFrameBufferPlugin: public FrameBufferPlugin

 public:
   XCBFrameBufferPlugin(QObject *parent, const QVariantList &args);
-   ~XCBFrameBufferPlugin() override;

-   FrameBuffer *frameBuffer(WId id, const QVariantMap &args) override;
+   FrameBuffer *frameBuffer(const QVariantMap &args) override;

 private:
   Q_DISABLE_COPY(XCBFrameBufferPlugin)
--- a/krfb/CMakeLists.txt
+++ b/krfb/CMakeLists.txt
@@ -40,12 +40,6 @@ install (TARGETS krfbprivate
         LIBRARY NAMELINK_SKIP
 )

-install (FILES
-         krfb-framebuffer.desktop
-         krfb-events.desktop
-         DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}
-)
-
 #####################################
 # Second target: krfb - the app
 # itself.
--- a/krfb/eventsmanager.cpp
+++ b/krfb/eventsmanager.cpp
@@ -30,7 +30,6 @@
 #include <KPluginFactory>
 #include <KPluginMetaData>

-#include <QtCore/QSharedPointer>

 class EventsManagerStatic
 {
@@ -42,64 +41,33 @@ Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic)

 EventsManager::EventsManager()
 {
-    //qDebug();
-
-    loadPlugins();
-}
-
-EventsManager::~EventsManager()
-{
-    //qDebug();
-}
-
-EventsManager *EventsManager::instance()
-{
-    //qDebug();
-
-    return &eventsManagerStatic->instance;
-}
-
-void EventsManager::loadPlugins()
-{
-    //qDebug();
-
-    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"));
-
-    QVectorIterator<KPluginMetaData> i(plugins);
-    i.toBack();
-    QSet<QString> unique;
-    while (i.hasPrevious()) {
-        KPluginMetaData data = i.previous();
-        // only load plugins once, even if found multiple times!
-        if (unique.contains(data.name())) {
-            continue;
-        }
-
+    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"), {}, KPluginMetaData::AllowEmptyMetaData);
+    for (const KPluginMetaData &data : plugins) {
        const KPluginFactory::Result<EventsPlugin> result = KPluginFactory::instantiatePlugin<EventsPlugin>(data);
        if (result.plugin) {
            m_plugins.insert(data.pluginId(), result.plugin);
            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
        } else {
-            qCDebug(KRFB) << "unable to load plugin for " << data.fileName();
+            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
        }
-        unique.insert (data.name());
    }
 }

+EventsManager::~EventsManager() = default;
+
+EventsManager *EventsManager::instance()
+{
+    return &eventsManagerStatic->instance;
+}
+
 QSharedPointer<EventHandler> EventsManager::eventHandler()
 {
-    QMap<QString, EventsPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        QSharedPointer<EventHandler> eventHandler(iter.value()->eventHandler());
-
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        QSharedPointer<EventHandler> eventHandler(it.value()->eventHandler());
        if (eventHandler) {
            eventHandler->setFrameBufferPlugin(RfbServerManager::instance()->framebuffer());
            return eventHandler;
        }
-
-        ++iter;
    }

    // No valid events plugin found.
--- a/krfb/eventsmanager.h
+++ b/krfb/eventsmanager.h
@@ -52,8 +52,6 @@ private:

    EventsManager();

-    void loadPlugins();
-
    QMap<QString, EventsPlugin *> m_plugins;
    QList<QWeakPointer<EventHandler> > m_eventHandlers;
 };
--- a/krfb/framebuffer.cpp
+++ b/krfb/framebuffer.cpp
@@ -13,8 +13,8 @@
 #include <QCursor>


-FrameBuffer::FrameBuffer(WId id, QObject *parent)
-    : QObject(parent), win(id)
+FrameBuffer::FrameBuffer(QObject *parent)
+    : QObject(parent)
 {
 }

--- a/krfb/framebuffer.h
+++ b/krfb/framebuffer.h
@@ -29,7 +29,7 @@ class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
    Q_OBJECT
 public:
-    explicit FrameBuffer(WId id, QObject *parent = nullptr);
+    explicit FrameBuffer(QObject *parent = nullptr);

    ~FrameBuffer() override;

@@ -52,7 +52,6 @@ Q_SIGNALS:
    void frameBufferChanged();

 protected:
-    WId win;
    char *fb = nullptr;
    QList<QRect> tiles;

--- a/krfb/framebuffermanager.cpp
+++ b/krfb/framebuffermanager.cpp
@@ -29,7 +29,6 @@
 #include <KPluginFactory>
 #include <KPluginMetaData>

-#include <QSharedPointer>

 class FrameBufferManagerStatic
 {
@@ -41,51 +40,29 @@ Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)

 FrameBufferManager::FrameBufferManager()
 {
-    //qDebug();
-
-    loadPlugins();
-}
-
-FrameBufferManager::~FrameBufferManager()
-{
-    //qDebug();
-}
-
-FrameBufferManager *FrameBufferManager::instance()
-{
-    //qDebug();
-
-    return &frameBufferManagerStatic->instance;
-}
-
-void FrameBufferManager::loadPlugins()
-{
-    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"));
-
-    QVectorIterator<KPluginMetaData> i(plugins);
-    i.toBack();
-    QSet<QString> unique;
-    while (i.hasPrevious()) {
-        const KPluginMetaData &data = i.previous();
-        // only load plugins once, even if found multiple times!
-        if (unique.contains(data.name()))
-            continue;
-
+    const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
+    for (const KPluginMetaData &data : plugins) {
        const KPluginFactory::Result<FrameBufferPlugin> result = KPluginFactory::instantiatePlugin<FrameBufferPlugin>(data);
        if (result.plugin) {
            m_plugins.insert(data.pluginId(), result.plugin);
            qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
        } else {
-            qCDebug(KRFB) << "unable to load plugin for " << data.fileName();
+            qCDebug(KRFB) << "unable to load plugin for " << data.fileName() << result.errorString;
        }
-        unique.insert (data.name());
    }
 }

+FrameBufferManager::~FrameBufferManager()
+{
+}
+
+FrameBufferManager *FrameBufferManager::instance()
+{
+    return &frameBufferManagerStatic->instance;
+}
+
 QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVariantMap &args)
 {
-    //qDebug();
-
    // See if there is still an existing framebuffer to this WId.
    if (m_frameBuffers.contains(id)) {
        QWeakPointer<FrameBuffer> weakFrameBuffer = m_frameBuffers.value(id);
@@ -100,23 +77,17 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVaria
    }

    // We don't already have that frame buffer.
-    QMap<QString, FrameBufferPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        if (it.key() == KrfbConfig::preferredFrameBufferPlugin()) {
            qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();

-            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id, args));
-
+            QSharedPointer<FrameBuffer> frameBuffer(it.value()->frameBuffer(args));
            if (frameBuffer) {
                m_frameBuffers.insert(id, frameBuffer.toWeakRef());

                return frameBuffer;
            }
        }
-
-        ++iter;
    }

    // No valid framebuffer plugin found.
--- a/krfb/framebuffermanager.h
+++ b/krfb/framebuffermanager.h
@@ -52,8 +52,6 @@ private:

    FrameBufferManager();

-    void loadPlugins();
-
    QMap<QString, FrameBufferPlugin *> m_plugins;
    QMap<WId, QWeakPointer<FrameBuffer> > m_frameBuffers;
 };
--- a/krfb/framebufferplugin.h
+++ b/krfb/framebufferplugin.h
@@ -37,7 +37,7 @@ public:
    explicit FrameBufferPlugin(QObject *parent, const QVariantList &args);
    ~FrameBufferPlugin() override;

-    virtual FrameBuffer *frameBuffer(WId id, const QVariantMap &args) = 0;
+    virtual FrameBuffer *frameBuffer(const QVariantMap &args) = 0;
 };

 #endif  // Header guard
--- a/krfb/krfb-events.desktop
+++ b/krfb/krfb-events.desktop
@@ -1,35 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=krfb/events
-
-Comment=Event plugins for KRfb
-Comment[ca]=Connectors d'esdeveniments per al KRfb
-Comment[ca@valencia]=Conectors de successos per a KRfb
-Comment[cs]=Moduly událostí pro KRfb
-Comment[da]=Hændelses-plugins til KRfb
-Comment[de]=Ereignis-Module für KRfb
-Comment[el]=Πρόσθετα γεγονότων για το KRfb
-Comment[en_GB]=Event plugins for KRfb
-Comment[es]=Complementos de eventos para KRfb
-Comment[et]=KRfb sündmuste pluginad
-Comment[eu]=KRfb-rako gertaeren pluginak
-Comment[fi]=KRfb:n tapahtumaliitännäinen
-Comment[fr]=Modules externes d'évènements pour Krfb
-Comment[gl]=Complementos de eventos para KRfb
-Comment[ia]=Plug-ins de evento per KRfb
-Comment[it]=Estensioni degli eventi per KRfb
-Comment[ko]=KRfb 이벤트 플러그인
-Comment[nl]=Plug-ins voor gebeurtenis voor KRfb
-Comment[nn]=Hendingstillegg for KRfb
-Comment[pl]=Wtyczki wydarzeń dla KRfb
-Comment[pt]='Plugins' de eventos para o KRfb
-Comment[pt_BR]=Plugins de evento para o KRfb
-Comment[ro]=Extensii de evenimente pentru KRfb
-Comment[sk]=Doplnky udalostí pre KRfb
-Comment[sl]=Vstavki dogodkov za KRFB
-Comment[sv]=Händelseinsticksprogram för Krfb
-Comment[uk]=Додатки обробки подій для KRfb
-Comment[x-test]=xxEvent plugins for KRfbxx
-Comment[zh_CN]=KRfb 事件插件
-Comment[zh_TW]=KRfb 的事件外掛程式
-
--- a/krfb/krfb-events.json
+++ b/krfb/krfb-events.json
@@ -1,34 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Events plugins for KRfb",
-        "Description[ca@valencia]": "Conectors de successos per a KRfb",
-        "Description[ca]": "Connectors d'esdeveniments per al KRfb",
-        "Description[cs]": "Moduly událostí pro KRfb",
-        "Description[da]": "Hændelses-plugins til KRfb",
-        "Description[de]": "Ereignis-Module für KRfb",
-        "Description[el]": "Πρόσθετα γεγονότων για το KRfb",
-        "Description[en_GB]": "Events plugins for KRfb",
-        "Description[es]": "Complementos de eventos para KRfb",
-        "Description[et]": "KRfb sündmuste pluginad",
-        "Description[eu]": "KRfb-rako gertaeren pluginak",
-        "Description[fi]": "KRfb:n tapahtumaliitännäinen",
-        "Description[fr]": "Modules externes d'évènements pour KRfb",
-        "Description[gl]": "Complementos de eventos para KRfb",
-        "Description[ia]": "Plug-ins de eventos per KRfb",
-        "Description[it]": "Estensioni degli eventi per KRfb",
-        "Description[ko]": "KRfb 이벤트 플러그인",
-        "Description[nl]": "Plug-ins voor gebeurtenis voor KRfb",
-        "Description[nn]": "Hendingstillegg for KRfb",
-        "Description[pl]": "Wtyczki wydarzeń dla KRfb",
-        "Description[pt]": "'Plugins' de eventos para o KRfb",
-        "Description[pt_BR]": "Plugins de evento para o KRfb",
-        "Description[sk]": "Doplnky udalostí pre KRfb",
-        "Description[sl]": "Vtičniki za dogodke za KRfb",
-        "Description[sv]": "Händelseinsticksprogram för Krfb",
-        "Description[uk]": "Додатки обробки подій для KRfb",
-        "Description[x-test]": "xxEvents plugins for KRfbxx",
-        "Description[zh_CN]": "KRfb 事件插件",
-        "Description[zh_TW]": "KRfb 的事件外掛程式"
-    },
-    "X-KDE-ServiceType": "krfb/events"
-}
--- a/krfb/krfb-framebuffer.desktop
+++ b/krfb/krfb-framebuffer.desktop
@@ -1,56 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=krfb/framebuffer
-
-Comment=Frame Buffer plugins for KRfb
-Comment[bg]=Приставки за фреймбуфер за KRfb
-Comment[bs]=Priključci framebafera za KRfb
-Comment[ca]=Connectors de «framebuffer» per al KRfb
-Comment[ca@valencia]=Conectors de «framebuffer» per a KRfb
-Comment[cs]=Moduly Frame bufferu pro KRfb
-Comment[da]=Framebuffer-plugins til KRfb
-Comment[de]=Framebuffer-Module für KRfb
-Comment[el]=Πρόσθετα μνήμης εξόδου βίντεο καρέ για το KRfb
-Comment[en_GB]=Frame Buffer plugins for KRfb
-Comment[es]=Complementos de memoria intermedia de vídeo para KRfb
-Comment[et]=KRfb kaadripuhvri plugin
-Comment[eu]=Irteerako bideoaren pluginak KRfb-rentzako
-Comment[fi]=Kehyspuskuriliitännäinen kohteelle KRfb
-Comment[fr]=Modules externes de sortie vidéo pour Krfb
-Comment[ga]=Breiseáin Mhaoláin Fráma le haghaidh KRfb
-Comment[gl]=Complementos de búfer de fotograma para KRfb
-Comment[hr]=Priključci za međuspremnike okvira za KRfb
-Comment[hu]=Framebuffer bővítmények a Krfb-hez
-Comment[ia]=Plug-ins de Frame Buffer per KRfb
-Comment[id]=Plugin Frame Buffer untuk KRfb
-Comment[it]=Estensioni del framebuffer per KRfb
-Comment[ja]=KRfb の フレームバッファプラグイン
-Comment[kk]=KRfb кадр буфер плагині
-Comment[km]=កម្មវិធីជំនួយ Frame Buffer សម្រាប់ KRfb
-Comment[ko]=KRfb 프레임버퍼 플러그인
-Comment[lt]=Frame Buffer papildiniai skirti KRfb
-Comment[lv]=Kadru bufera sprudņi priekš KRfb
-Comment[nb]=Rammebuffer-programtillegg for KRfb
-Comment[nds]=Bildpuffer-Modulen för KRfb
-Comment[nl]=Framebuffer-plugins voor KRfb
-Comment[nn]=Framebuffer-tillegg KRfb
-Comment[pa]=KRfb ਲਈ ਫਰੇਮ ਬਫ਼ਰ ਪਲੱਗਇਨ
-Comment[pl]=Wtyczki buforów ramek dla KRfb
-Comment[pt]='Plugins' do 'Framebuffer' para o KRfb
-Comment[pt_BR]=Plugins de framebuffers para o KRfb
-Comment[ro]=Extensii de tampon de cadre pentru KRfb
-Comment[ru]=Модуль буфера кадров для KRfb
-Comment[si]=KRfb සඳහා රාමු බෆර ප්ලගින
-Comment[sk]=Frame Buffer modul pre KRfb
-Comment[sl]=Vstavki slikovnih medpomnilnikov za KRFB
-Comment[sr]=Прикључци кадробафера за КРФБ
-Comment[sr@ijekavian]=Прикључци кадробафера за КРФБ
-Comment[sr@ijekavianlatin]=Priključci kadrobafera za KRFB
-Comment[sr@latin]=Priključci kadrobafera za KRFB
-Comment[sv]=Insticksprogram med rambuffert för Krfb
-Comment[th]=ส่วนเสริมของ KRfb สำหรับจัดการเฟรมบัฟเฟอร์
-Comment[tr]=KRfb için Çerçeve Tamponu eklentileri
-Comment[uk]=Додатки буфера кадрів для KRfb
-Comment[x-test]=xxFrame Buffer plugins for KRfbxx
-Comment[zh_CN]=KRfb 的帧缓冲插件
-Comment[zh_TW]=KRfb 的 Frame Buffer 外掛程式
--- a/krfb/krfb-framebuffer.json
+++ b/krfb/krfb-framebuffer.json
@@ -1,41 +0,0 @@
-{
-    "KPlugin": {
-        "Description": "Frame Buffer plugins for KRfb",
-        "Description[ca@valencia]": "Conectors de «Frame Buffer» per a KRfb",
-        "Description[ca]": "Connectors de «Frame Buffer» per al KRfb",
-        "Description[cs]": "Moduly Frame bufferu pro KRfb",
-        "Description[da]": "Framebuffer-plugins til KRfb",
-        "Description[de]": "Framebuffer-Module für KRfb",
-        "Description[el]": "Πρόσθετα μνήμης ανανέωσης βίντεο καρέ για το KRfb",
-        "Description[en_GB]": "Frame Buffer plugins for KRfb",
-        "Description[es]": "Complementos de framebuffer para KRfb",
-        "Description[et]": "KRfb kaadripuhvri pluginad",
-        "Description[eu]": "KRfb-rako «Frame Buffer» pluginak",
-        "Description[fi]": "KRfb:n kehyspuskuriliitännäinen",
-        "Description[fr]": "Modules de tampons d'image pour KRfb",
-        "Description[gl]": "Complemento de búfer de fotograma para KRfb",
-        "Description[ia]": "Plug-ins de Frame Buffer per KRfb",
-        "Description[id]": "Plugin Frame Buffer untuk KRfb",
-        "Description[it]": "Estensioni del framebuffer per KRfb",
-        "Description[ko]": "KRfb 프레임버퍼 플러그인",
-        "Description[nl]": "Framebuffer-plugins voor KRfb",
-        "Description[nn]": "Biletbuffer-tillegg KRfb",
-        "Description[pl]": "Wtyczki buforów ramek dla KRfb",
-        "Description[pt]": "'Plugins' do 'Framebuffer' para o KRfb",
-        "Description[pt_BR]": "Plugins de framebuffers para o KRfb",
-        "Description[ru]": "Модули буфера кадров для KRfb",
-        "Description[sk]": "Frame Buffer modul pre KRfb",
-        "Description[sl]": "Vtičniki vmesnika medpomnilnika za KRfb",
-        "Description[sr@ijekavian]": "Прикључци кадробафера за КРФБ",
-        "Description[sr@ijekavianlatin]": "Priključci kadrobafera za KRFB",
-        "Description[sr@latin]": "Priključci kadrobafera za KRFB",
-        "Description[sr]": "Прикључци кадробафера за КРФБ",
-        "Description[sv]": "Insticksprogram med rambuffert för Krfb",
-        "Description[tr]": "KRfb için Çerçeve Tamponu eklentileri",
-        "Description[uk]": "Додатки буфера кадрів для KRfb",
-        "Description[x-test]": "xxFrame Buffer plugins for KRfbxx",
-        "Description[zh_CN]": "KRfb 的帧缓冲插件",
-        "Description[zh_TW]": "KRfb 的 Frame Buffer 外掛程式"
-    },
-    "X-KDE-ServiceType": "krfb/framebuffer"
-}
--- a/krfb/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
@@ -817,7 +817,7 @@ Comment[bg]=Поискана е връзка, следва потребител
 Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Veza je zahtijevana, korinik mora da je prihvati
 Comment[ca]=Connexió sol·licitada, l'usuari l'ha d'acceptar
-Comment[ca@valencia]=Connexió solicitada, l'usuari l'ha d'acceptar
+Comment[ca@valencia]=Connexió sol·licitada, l'usuari l'ha d'acceptar
 Comment[cs]=Vyžadováno spojení, uživatel musí přijmout
 Comment[cy]=Cais wedi'i wneud am gysylltiad,rhaid i'r ddefnyddiwr ei dderbyn
 Comment[da]=Forbindelse forespurgt, bruger skal acceptere
@@ -1080,7 +1080,7 @@ Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার কর
 Comment[br]=Dalc'het, kevreadenn disteuleret
 Comment[bs]=Zauzeto, veza je odbijena
 Comment[ca]=Ocupat, connexió rebutjada
-Comment[ca@valencia]=Ocupat, connexió rebujada
+Comment[ca@valencia]=Ocupat, connexió rebutjada
 Comment[cs]=Zaneprázdněn, spojení odmítnuto
 Comment[cy]=Prysur, gwrthodwyd y cysylltiad
 Comment[da]=Optaget, forbindelse afslået
--- a/krfb/main.cpp
+++ b/krfb/main.cpp
@@ -158,6 +158,15 @@ int main(int argc, char *argv[])
    MainWindow mainWindow;
    TrayIcon trayicon(&mainWindow);

+    QObject::connect(&service, &KDBusService::activateRequested, &mainWindow, [&mainWindow](const QStringList & /*arguments*/, const QString & /*workdir*/) {
+        if (!mainWindow.isVisible()) {
+            mainWindow.setVisible(true);
+        } else {
+            KWindowSystem::updateStartupId(mainWindow.windowHandle());
+            KWindowSystem::activateWindow(mainWindow.windowHandle());
+        }
+    });
+
    if (KrfbConfig::startMinimized()) {
      mainWindow.hide();
    } else if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {
--- a/krfb/mainwindow.cpp
+++ b/krfb/mainwindow.cpp
@@ -33,7 +33,7 @@
 #include <QSet>
 #include <QNetworkInterface>
 #include <QHostInfo>
-
+#include <QMessageBox>

 class TCP: public QWidget, public Ui::TCP
 {
@@ -82,15 +82,9 @@ public:
    }

    void fillFrameBuffersCombo() {
-        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"));
-        QSet<QString> unique;
-        QVectorIterator<KPluginMetaData> i(plugins);
-        i.toBack();
-        while (i.hasPrevious()) {
-            const KPluginMetaData &metadata = i.previous();
-            if (unique.contains(metadata.pluginId())) continue;
+        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
+        for (const KPluginMetaData &metadata : plugins) {
            cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
-            unique.insert(metadata.pluginId());
        }
    }
 };
@@ -225,16 +219,16 @@ void MainWindow::passwordChanged(const QString& password)

 void MainWindow::aboutConnectionAddress()
 {
-    KMessageBox::about(this,
-            i18n("This field contains the address of your computer and the port number, separated by a colon.\n\nThe address is just a hint - you can use any address that can reach your computer.\n\nDesktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so.\n\nIf your computer is behind a firewall it may have a different address or be unreachable for other computers."),
-            i18n("KDE Desktop Sharing"));
+    QMessageBox::about(this,
+            i18n("KDE Desktop Sharing"),
+            i18n("This field contains the address of your computer and the port number, separated by a colon.\n\nThe address is just a hint - you can use any address that can reach your computer.\n\nDesktop Sharing tries to guess your address from your network configuration, but does not always succeed in doing so.\n\nIf your computer is behind a firewall it may have a different address or be unreachable for other computers."));
 }

 void MainWindow::aboutUnattendedMode()
 {
-    KMessageBox::about(this,
-            i18n("Any remote user with normal desktop sharing password will have to be authenticated.\n\nIf unattended access is on, and the remote user provides unattended mode password, desktop sharing access will be granted without explicit confirmation."),
-            i18n("KDE Desktop Sharing"));
+    QMessageBox::about(this,
+            i18n("KDE Desktop Sharing"),
+            i18n("Any remote user with normal desktop sharing password will have to be authenticated.\n\nIf unattended access is on, and the remote user provides unattended mode password, desktop sharing access will be granted without explicit confirmation."));
 }

 void MainWindow::showConfiguration()
--- a/krfb/org.kde.krfb.appdata.xml
+++ b/krfb/org.kde.krfb.appdata.xml
@@ -42,7 +42,7 @@
  <name xml:lang="zh-TW">Krfb</name>
  <summary>Share your desktop to another computer via VNC</summary>
  <summary xml:lang="ca">Comparteix l'escriptori amb un altre ordinador a través de VNC</summary>
-  <summary xml:lang="ca-valencia">Compartix l'escriptori amb un atre ordinador a través de VNC</summary>
+  <summary xml:lang="ca-valencia">Compartix l'escriptori amb un altre ordinador a través de VNC</summary>
  <summary xml:lang="cs">Sdílejte své pracovní prostředí na jiný počítač pomocí VNC</summary>
  <summary xml:lang="da">Del dit skrivebord til en anden computer via VNC</summary>
  <summary xml:lang="de">Verbindung Ihrer Arbeitsfläche zu anderen Rechnern über VNC</summary>
@@ -63,16 +63,18 @@
  <summary xml:lang="pt">Partilhar o seu ecrã com outro computador por VNC</summary>
  <summary xml:lang="pt-BR">Compartilhar sua área de trabalho com outro computador via VNC</summary>
  <summary xml:lang="ro">Partajați-vă biroul cu alt calculator prin VNC</summary>
+  <summary xml:lang="ru">Предоставление другому компьютеру доступа к рабочему столу с помощью VNC</summary>
  <summary xml:lang="sk">Zdieľajte vašu plochu s iným počítačom cez VNC</summary>
  <summary xml:lang="sl">Deli namizje z drugim računalnikom prek VNC</summary>
  <summary xml:lang="sv">Dela ditt skrivbord med en annan dator via VNC</summary>
+  <summary xml:lang="tr">Masaüstünüzü başka bir bilgisayara VNC aracılığıyla paylaşın</summary>
  <summary xml:lang="uk">Надайте вашу стільницю у спільне користування з іншим комп'ютером за допомогою VNC</summary>
  <summary xml:lang="x-test">xxShare your desktop to another computer via VNCxx</summary>
  <summary xml:lang="zh-CN">通过 VNC 分享您的桌面到另一台电脑</summary>
  <description>
    <p>Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
    <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
-    <p xml:lang="ca-valencia">Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una atra màquina, la qual pot emprar un client VNC per a vore o controlar l'escriptori.</p>
+    <p xml:lang="ca-valencia">Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
    <p xml:lang="da">Krfb-skrivebordsdeling er et serverprogram der giver dig mulighed for at dele din nuværende session med en bruger på en anden maskine som kan bruge en VNC-klient til at vise eller endda styrer skrivebordet.</p>
    <p xml:lang="de">Krfb ist eine Serveranwendung, welche die gemeinsame Benutzung der aktuellen Sitzung mit einem Benutzer auf einem anderen Rechner ermöglicht, der mit Hilfe eines VNC-Programms den Bildschirminhalt sehen oder sogar die Arbeitsfläche bedienen kann.</p>
    <p xml:lang="el">Η κοινή χρήση επιφάνειας εργασίας Krfb είναι μια εφαρμογή εξυπηρετητή που σας επιτρέπει να μοιράζεστε την τρέχουσα συνεδρία σας με έναν χρήστη σε άλλο μηχάνημα, ο οποίος μπορεί να χρησιμοποιεί έναν πελάτη VNC για να παρακολουθεί ή και να ελέγχει την επιφάνεια εργασίας σας.</p>
@@ -101,7 +103,7 @@
    <p xml:lang="sr-ijekavian">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
    <p xml:lang="sr-ijekavianlatin">KRFB je serverski program za deljenje površi, kojim možete da podelite svoju tekuću sesiju sa korisnikom na drugoj mašini. Udaljeni korisnik može da upotrebi neki VNC klijent za gledanje površi, pa čak i upravljanje njome.</p>
    <p xml:lang="sv">Krfb-skrivbordsdelning är ett serverprogram som gör det möjligt att dela aktuell session med en användare på en annan dator, som kan använda en VNC-klient för att betrakta eller till och med kontrollera skrivbordet.</p>
-    <p xml:lang="tr">Krfb Masaüstü Paylaşımı, mevcut oturumu masaüstünü görüntülemek veya kontrol etmek için, VNC istemcisi kullanan başka bir makinedeki, kullanıcıyla paylaşmanızı sağlayan bir sunucu uygulamasıdır.</p>
+    <p xml:lang="tr">Krfb Masaüstü Paylaşımı; geçerli oturumunuzu, başka bir makinedeki bir kullanıcıyla paylaşmanıza izin veren bir sunucu uygulamasıdır. Kullanıcılar, bir VNC istemcisi ile masaüstünüzü görüntüleyebilir ve hatta denetleyebilirler.</p>
    <p xml:lang="uk">Програма для спільного використання стільниці Krfb — це серверна програма, яка надає вам змогу розділити ваш поточний сеанс роботи з користувачем, який працює на іншому комп’ютері, так, щоб цей користувач зміг скористатися клієнтом VNC для перегляду або навіть керування вашою стільницею.</p>
    <p xml:lang="x-test">xxKrfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.xx</p>
    <p xml:lang="zh-CN">Krfb 桌面共享是一个可以让您与另一个在其他机器上的用户共享当前会话的服务器程序，他可以使用 VNC 客户端来查看甚至控制桌面。</p>
@@ -141,6 +143,7 @@
      <caption xml:lang="sk">Zdieľanie pracovnej plochy s Krfb</caption>
      <caption xml:lang="sl">Deljenje namizij s Krfb</caption>
      <caption xml:lang="sv">Dela skrivbord med Krfb</caption>
+      <caption xml:lang="tr">Krfb ile masaüstü paylaşımı</caption>
      <caption xml:lang="uk">Спільне використання стільниці за допомогою Krfb</caption>
      <caption xml:lang="x-test">xxSharing desktop with Krfbxx</caption>
      <caption xml:lang="zh-CN">使用 Krfb 共享桌面</caption>
@@ -153,9 +156,9 @@
  </provides>
  <project_group>KDE</project_group>
  <releases>
+    <release version="22.04.3" date="2022-07-07"/>
    <release version="22.04.2" date="2022-06-09"/>
    <release version="22.04.1" date="2022-05-12"/>
    <release version="22.04.0" date="2022-04-21"/>
-    <release version="21.12.3" date="2022-03-03"/>
  </releases>
 </component>
--- a/krfb/org.kde.krfb.desktop
+++ b/krfb/org.kde.krfb.desktop
@@ -96,9 +96,11 @@ GenericName[pl]=Współdzielenie pulpitu (VNC)
 GenericName[pt]=Partilha do Ecrã (VNC)
 GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC)
 GenericName[ro]=Partajare birou (VNC)
+GenericName[ru]=Совместный доступ к рабочему столу (VNC)
 GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
 GenericName[sl]=Souporaba namizja (VNC)
 GenericName[sv]=Skrivbordsdelning (VNC)
+GenericName[tr]=Masaüstü Paylaşımı (VNC)
 GenericName[uk]=Спільні стільниці (VNC)
 GenericName[x-test]=xxDesktop Sharing (VNC)xx
 GenericName[zh_CN]=桌面共享 (VNC)
--- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
+++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake
@@ -21,9 +21,11 @@ Name[pl]=Monitor wirtualny KRFB
 Name[pt]=Monitor Virtual do KRFB
 Name[pt_BR]=Monitor virtual do KRFB
 Name[ro]=Monitor virtual KRFB
+Name[ru]=Виртуальный монитор KRFB
 Name[sk]=Virtuálny monitor KRFB
 Name[sl]=Navidezni monitor KRFB
 Name[sv]=Krfb:s virtuella bildskärm
+Name[tr]=KRFB Sanal Monitörü
 Name[uk]=Віртуальний монітор KRFB
 Name[x-test]=xxKRFBs Virtual Monitorxx
 Name[zh_CN]=KRBs 虚拟监视器
@@ -44,9 +46,11 @@ Comment[pl]=Zdalny monitor wirtualny
 Comment[pt]=Monitor Virtual Remoto
 Comment[pt_BR]=Monitor virtual remoto
 Comment[ro]=Monitor virtual distant
+Comment[ru]=Удалённый виртуальный монитор
 Comment[sk]=Vzdialený virtuálny monitor
 Comment[sl]=Oddaljeni navidezni monitor
 Comment[sv]=Virtuell fjärrbildskärm
+Comment[tr]=Uzak Sanal Monitör
 Comment[uk]=Віддалений віртуальний монітор
 Comment[x-test]=xxRemote Virtual Monitorxx
 Comment[zh_CN]=远程虚拟监视器
--- a/krfb/rfbservermanager.cpp
+++ b/krfb/rfbservermanager.cpp
@@ -20,7 +20,6 @@
 */
 #include "rfbservermanager.h"
 #include "rfbserver.h"
-#include "framebuffer.h"
 #include "framebuffermanager.h"
 #include "sockethelpers.h"
 #include "krfbconfig.h"
Author	SHA1	Message	Date
Nicolas Fella	f8cd48fd5d	Port framebuffers away from deprecated QDesktopWidget Use QPlatformNativeInterface to get the WId instead	2022-08-04 13:22:57 +02:00
Nicolas Fella	04494dfeb0	Fix broken WId refactoring Actually remove the WId member from the abtract framebuffer class and use the member in xcbframebuffer qtframebuffer also uses the WId so add a member there	2022-08-04 11:57:55 +02:00
Nicolas Fella	4169a9f50a	Don't pass unused window ids around The wid is only relevant for the xcb framebuffer We can just query it there, no need to pass it around everywhere	2022-08-03 22:00:16 +02:00
Friedrich W. H. Kossebau	5173e7ff29	Port away from deprecated KMessageBox::about() GIT_SILENT	2022-07-16 01:03:44 +02:00
Friedrich W. H. Kossebau	745a5d53f2	Use ECMDeprecationSettings GIT_SILENT	2022-07-16 01:01:12 +02:00
Friedrich W. H. Kossebau	ce0d6fe648	Adapt min Qt version to one implied by current min KF version GIT_SILENT	2022-07-16 00:59:26 +02:00
Friedrich W. H. Kossebau	42ed3c5707	Remove definitions duplicated from KDE_COMPILERSETTINGS_LEVEL 5.91 GIT_SILENT	2022-07-16 00:58:55 +02:00
Albert Astals Cid	2cd15b6313	GIT_SILENT Upgrade release service version to 22.11.70.	2022-07-13 00:04:53 +02:00
l10n daemon script	d1d085008a	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-07-06 01:45:10 +00:00
l10n daemon script	00725ca11b	GIT_SILENT made messages (after extraction)	2022-07-06 00:45:53 +00:00
Heiko Becker	e3e1571cea	GIT_SILENT Update Appstream for new release (cherry picked from commit `cc61c6a8b3`)	2022-07-01 21:16:16 +02:00
l10n daemon script	b9dd0ac0d6	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-06-30 01:44:45 +00:00
l10n daemon script	9dfca797dd	GIT_SILENT made messages (after extraction)	2022-06-30 00:45:07 +00:00
Laurent Montel	720478a317	Add missing override	2022-06-28 22:30:15 +02:00
l10n daemon script	60161dacf8	GIT_SILENT made messages (after extraction)	2022-06-25 00:48:43 +00:00
Laurent Montel	18591e967c	Remove extra ';'	2022-06-23 06:48:58 +02:00
l10n daemon script	4d65b52b47	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-06-22 01:43:36 +00:00
l10n daemon script	44336093da	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-06-13 02:27:19 +00:00
l10n daemon script	df10a81baa	GIT_SILENT made messages (after extraction)	2022-06-13 01:02:08 +00:00
l10n daemon script	172229294c	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-06-07 02:13:20 +00:00
l10n daemon script	3d614c2bd6	GIT_SILENT made messages (after extraction)	2022-06-07 00:53:24 +00:00
Heiko Becker	58d47d3947	GIT_SILENT Update Appstream for new release (cherry picked from commit `ff6b291d50`)	2022-06-04 10:53:24 +02:00
l10n daemon script	a03b8db322	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-05-28 02:14:23 +00:00
Albert Astals Cid	ea5d2f40bc	Add ki18n_install and kdoctools_install	2022-05-22 00:58:20 +02:00
Nicolas Fella	22420a22af	Raise window when activating running instance	2022-05-15 19:26:42 +02:00
Heiko Becker	6f1d60b3ba	GIT_SILENT Update Appstream for new release (cherry picked from commit `d4d400624c`)	2022-05-07 12:02:15 +02:00
Laurent Montel	8365e97f9a	Remove duplicate header between header cpp file	2022-05-05 07:04:45 +02:00
Antonio Rojas	f1da76277e	Remove %i parameter from Exec line It breaks launching the application on Wayland	2022-05-02 18:11:02 +02:00
l10n daemon script	ba4329d9b7	GIT_SILENT made messages (after extraction)	2022-05-01 00:49:09 +00:00
l10n daemon script	17d3f53561	GIT_SILENT made messages (after extraction)	2022-04-25 00:45:49 +00:00
Alexander Lohnau	fbf4fcbce0	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	2022-04-23 19:18:18 +00:00
Alexander Lohnau	5158d14147	Simplify iterator usage and make it with rest of KDE code consistent	2022-04-23 19:18:18 +00:00
Alexander Lohnau	c7ee6f1e0e	Drop empty deconstructors of plugins We have one defined in the base class, consequently we do not violate the rule of life when removing the empty ones	2022-04-23 19:18:18 +00:00
Alexander Lohnau	0d8cc44ec2	Simplify plugin declaration using K_PLUGIN_CLASS_WITH_JSON This way we do not need to take care of setting the factory name and typing out the registration manually	2022-04-23 19:18:18 +00:00
Alexander Lohnau	d7c559b017	Clean up plugin loading code - We do not need to manually check for duplicates - Improve the error message while at it - Remove the internal utility-method since the code is super small now	2022-04-23 19:18:18 +00:00
l10n daemon script	fcebbfb2d4	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-04-20 01:41:07 +00:00
l10n daemon script	d45679bdbd	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-04-19 01:44:50 +00:00
Alexander Lohnau	a58c787986	Clean up unneeded json/desktop files Converting a servicetype to json does not make sense and we do not use the file anywhere. With us also not using KServiceTypeTrader for the plugin loading, we can get rid of the servicetype desktop files.	2022-04-18 09:28:16 +02:00
Heiko Becker	96f164c67d	GIT_SILENT Update Appstream for new release (cherry picked from commit `b2e736c21a`)	2022-04-12 23:57:07 +02:00
l10n daemon script	9b634ae795	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-04-01 01:58:36 +00:00
l10n daemon script	a80f5f140d	GIT_SILENT made messages (after extraction)	2022-04-01 00:51:17 +00:00
Andreas Sturmlechner	4a6970d684	Make KF5Wayland optional behind existing DISABLE_PIPEWIRE We have an option so let's be consistent. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>	2022-03-24 20:41:36 +03:00
Albert Astals Cid	e2f3910f7a	GIT_SILENT Upgrade release service version to 22.07.70.	2022-03-12 13:18:43 +01:00