GIT_SILENT Upgrade KDE Applications version to 18.12.3.

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"
2026-07-01 15:51:18 -07:00 · 2019-02-28 02:46:23 +01:00 · 2019-02-15 09:18:39 +01:00 · 2019-02-03 05:53:23 +01:00 · 2019-01-26 07:17:35 +01:00 · 2019-01-20 07:41:20 +01:00
48 changed files with 262 additions and 429 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -0,0 +1,3 @@
+{
+  "phabricator.uri" : "https://phabricator.kde.org/"
+}
--- a/.reviewboardrc
+++ b/.reviewboardrc
@@ -1,4 +0,0 @@
-REPOSITORY = "git://anongit.kde.org/krfb"
-REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
-TARGET_PEOPLE = "whiting"
-
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,19 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)

-project(krfb)
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "18")
+set (KDE_APPLICATIONS_VERSION_MINOR "12")
+set (KDE_APPLICATIONS_VERSION_MICRO "3")
+set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")

-include(FeatureSummary)
-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets X11Extras)
+project(krfb VERSION ${KDE_APPLICATIONS_VERSION})

-find_package(ECM 1.7.0 NO_MODULE REQUIRED)
+set(QT_MIN_VERSION 5.6.0)
+set(KF5_MIN_VERSION 5.31.0)
+
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extras)
+
+find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

 include(KDEInstallDirs)
@@ -13,6 +21,12 @@ include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
+include(ECMSetupVersion)
+include(FeatureSummary)
+
+ecm_setup_version(PROJECT
+                  VARIABLE_PREFIX KRFB
+                  VERSION_HEADER "krfb_version.h")

 find_package(KF5 REQUIRED COMPONENTS
    I18n
@@ -47,7 +61,7 @@ if(WIN32)
 endif(WIN32)

 add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )

 set(CMAKE_MODULE_PATH
@@ -72,5 +86,6 @@ endif(Q_WS_X11)
 add_subdirectory(krfb)
 add_subdirectory(framebuffers)
 add_subdirectory(doc)
+add_subdirectory(icons)

 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- a/cmake/modules/FindLibVNCServer.cmake
+++ b/cmake/modules/FindLibVNCServer.cmake
@@ -38,4 +38,4 @@ ELSE (LIBVNCSERVER_FOUND)
  ENDIF (LIBVNCSERVER_FIND_REQUIRED)
 ENDIF (LIBVNCSERVER_FOUND)

-MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
--- a/framebuffers/qt/krfb_framebuffer_qt.desktop
+++ b/framebuffers/qt/krfb_framebuffer_qt.desktop
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=Qt based Framebuffer for KRfb.
-Comment[ast]=Búfer de cuadros basáu en Qt pa KRfb.
-Comment[bg]=Основан на Qt фреймбуфер за KRfb.
-Comment[bs]=Kadrobafer za KRfb na osnovu Qt.
-Comment[ca]=«Framebuffer» basat en les Qt per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en les Qt per al KRfb.
-Comment[cs]=Framebuffer založený na Qt pro KRfb.
-Comment[da]=Qt-baseret framebuffer til KRfb.
-Comment[de]=Qt-basierter Framebuffer für KRfb
-Comment[el]=Μνήμη εξόδου βίντεο καρέ με βάση το Qt για το KRfb.
-Comment[en_GB]=Qt based Framebuffer for KRfb.
-Comment[es]=Memoria intermedia de vídeo basada en Qt para KRfb.
-Comment[et]=KRfb Qt põhine kaadripuhver
-Comment[eu]=Qt-n oinarritutako KRfb-ren irteerako bideoa
-Comment[fi]=QT-perustainen Kehyspuskuri KRfb:lle
-Comment[fr]=Sortie vidéo fondée sur Qt pour Krfb.
-Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar Qt.
-Comment[gl]=Framebuffer baseado en Qt para KRfb.
-Comment[hr]=Međuspremnik okvira baziran na Qt-u za KRfb.
-Comment[hu]=Qt-alapú framebuffer a Krfb-hez.
-Comment[ia]=Framebuffer basate sur Qt per KRfb
-Comment[it]=Framebuffer basato su Qt per KRfb.
-Comment[kk]=Qt негіздеген KRfb-нің кадр буфері.
-Comment[km]=Framebuffer មានមូលដ្ឋានលើ Qt សម្រាប់ KRfb ។
-Comment[ko]=KRfb를 위한 Qt 기반 프레임버퍼.
-Comment[lt]=Qt pagrindu veikiantis Framebuffer skirtas KRfb.
-Comment[lv]=Qt balstīts kadrbuferis priekš KRfb.
-Comment[nb]=Qt-basert rammebuffer for KRfb.
-Comment[nds]=Op Qt opbuut Bildpuffer för KRfb
-Comment[nl]=Op Qt gebaseerd framebuffer voor KRfb.
-Comment[nn]=Qt basert framebuffer for KRfb.
-Comment[pl]=Bufor ramki na podstawie Qt dla KRfb.
-Comment[pt]='Framebuffer' baseado no Qt para o KRfb.
-Comment[pt_BR]=Framebuffer baseado no Qt para o KRfb.
-Comment[ru]=Буфер экрана для KRfb на базе Qt.
-Comment[si]=KRfb සඳහා Qt මත පදනම් වූ රාමු බෆරය
-Comment[sk]=Framebuffer založený na Qt pre KRfb.
-Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na Qt
-Comment[sr]=Кадробафер за КРФБ на основу КуТ‑у
-Comment[sr@ijekavian]=Кадробафер за КРФБ на основу КуТ‑у
-Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu Qt‑u
-Comment[sr@latin]=Kadrobafer za KRFB na osnovu Qt‑u
-Comment[sv]=Qt-baserad rambuffert för Krfb.
-Comment[tr]=KRfb için Qt temelli Çerçeve tamponu.
-Comment[uk]=Заснований на Qt буфер кадрів для KRfb.
-Comment[x-test]=xxQt based Framebuffer for KRfb.xx
-Comment[zh_CN]=基于 Qt 的 KRfb 帧缓冲机制
-Comment[zh_TW]=KRfb 的 Qt-based Framebuffer
-Name=Qt Framebuffer for KRfb
-Name[ast]=Búfer de cuadros Qt pa KRfb
-Name[bg]=Qt фреймбуфер за KRfb
-Name[bs]=Qt-ov kadrobafer za KRFB
-Name[ca]=«Framebuffer» de les Qt per al KRfb.
-Name[ca@valencia]=«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 Framebuffer for KRfb
-Name[en_GB]=Qt Framebuffer for KRfb
-Name[es]=Memoria intermedia de vídeo Qt para KRfb
-Name[et]=KRfb Qt kaadripuhver
-Name[eu]=KRfb-ren Qt-ko irteerako bideoa
-Name[fi]=QT-kehyspuskuri KRfb:lle
-Name[fr]=Sortie vidéo Qt pour Krfb
-Name[ga]=Maolán fráma Qt le haghaidh KRfb
-Name[gl]=Framebuffer de Qt para KRfb
-Name[hr]=Qt Framebuffer za KRfb
-Name[hu]=Qt framebuffer a Krfb-hez
-Name[ia]=Framebuffer Qt per KRfb
-Name[it]=Framebuffer Qt per KRfb
-Name[kk]=Qt KRfb кадр буфері
-Name[km]=Qt Framebuffer សម្រាប់for KRfb
-Name[ko]=KRfb를 위한 Qt 프레임버퍼
-Name[lt]=Qt Framebufferis skirtas KRfb
-Name[lv]=Qt kadrbuferis priekš KRfb.
-Name[nb]=Qt rammebuffer for KRfb
-Name[nds]=Qt-Bildpuffer för KRfb
-Name[nl]=Qt-framebuffer voor KRfb
-Name[nn]=Qt-framebuffer 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[si]=KRfb සඳහා වන Qt රාමුබෆරය
-Name[sk]=Qt Framebuffer pre KRfb
-Name[sl]=Slikovni medpomnilnik Qt za KRFB
-Name[sr]=КуТ‑ов кадробафер за КРФБ
-Name[sr@ijekavian]=КуТ‑ов кадробафер за КРФБ
-Name[sr@ijekavianlatin]=Qt‑ov kadrobafer za KRFB
-Name[sr@latin]=Qt‑ov kadrobafer za KRFB
-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
-Type=Service
-ServiceTypes=krfb/framebuffer
-
-X-KDE-Library=krfb_framebuffer_qt
-X-KDE-PluginInfo-Name=qt
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
--- a/framebuffers/qt/krfb_framebuffer_qt.json
+++ b/framebuffers/qt/krfb_framebuffer_qt.json
@@ -1,20 +1,20 @@
 {
-    "Encoding": "UTF-8",
    "KPlugin": {
        "Description": "Qt based Framebuffer for KRfb.",
-        "Description[ast]": "Búfer de cuadros basáu en Qt pa KRfb.",
        "Description[ca@valencia]": "«Framebuffer» basat en les Qt per al 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[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
        "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.",
@@ -39,19 +39,20 @@
        "Id": "qt",
        "License": "GPL",
        "Name": "Qt Framebuffer for KRfb",
-        "Name[ast]": "Búfer de cuadros Qt pa KRfb",
        "Name[ca@valencia]": "«Framebuffer» de les Qt per al 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[fi]": "QT-kehyspuskuri KRfb:lle",
        "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",
--- a/framebuffers/qt/qtframebuffer.cpp
+++ b/framebuffers/qt/qtframebuffer.cpp
@@ -8,7 +8,6 @@
 */

 #include "qtframebuffer.h"
-#include "qtframebuffer.moc"

 #include <QTimer>
 #include <QRegion>
@@ -29,8 +28,8 @@ QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
        fbImage = screen->grabWindow(win).toImage();
        fb = new char[fbImage.byteCount()];
    } else {
-        fb = Q_NULLPTR;
-        primaryScreen = Q_NULLPTR;
+        fb = nullptr;
+        primaryScreen = nullptr;
    }

    t = new QTimer(this);
@@ -42,7 +41,7 @@ QtFrameBuffer::~QtFrameBuffer()
 {
    if (fb)
        delete [] fb;
-    fb = 0;
+    fb = nullptr;
 }

 int QtFrameBuffer::depth()
--- a/framebuffers/qt/qtframebuffer.h
+++ b/framebuffers/qt/qtframebuffer.h
@@ -22,9 +22,9 @@ class QtFrameBuffer : public FrameBuffer
 {
    Q_OBJECT
 public:
-    explicit QtFrameBuffer(WId id, QObject *parent = 0);
+    explicit QtFrameBuffer(WId id, QObject *parent = nullptr);

-    ~QtFrameBuffer();
+    ~QtFrameBuffer() override;

    int depth() override;
    int height() override;
--- a/framebuffers/qt/qtframebufferplugin.h
+++ b/framebuffers/qt/qtframebufferplugin.h
@@ -33,7 +33,7 @@ class QtFrameBufferPlugin : public FrameBufferPlugin

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

    FrameBuffer *frameBuffer(WId id) override;

--- a/framebuffers/xcb/krfb_framebuffer_xcb.desktop
+++ b/framebuffers/xcb/krfb_framebuffer_xcb.desktop
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[ast]=Búfer de cuadros basáu en XDamage/XShm de X11 pa KRfb.
-Comment[bg]=Основан на X11 XDamage/XShm фреймбуфер за KRfb.
-Comment[bs]=X11 XDamage/XShm baziran framebafer za KRfb.
-Comment[ca]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.
-Comment[cs]=Framebuffer založený na X11 XDamage/XShm pro KRfb.
-Comment[da]=X11 XDamage/XShm-baseret framebuffer til KRfb.
-Comment[de]=X11 XDamage/XShm-basierter Framebuffer für KRfb.
-Comment[el]=Μνήμη εξόδου βίντεο καρέ με βάση το X11 XDamage/XShm για το KRfb.
-Comment[en_GB]=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[es]=Memoria intermedia de vídeo basada en X11 Damage/XShm para KRfb.
-Comment[et]=KRfb X11 XDamage/XShm põhine kaadripuhver
-Comment[eu]=X11 XDamage/XShm  oinarritutako KRfb-ren irteerako bideoa.
-Comment[fi]=X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.
-Comment[fr]=Sortie vidéo fondée sur X11 « XDamage / XShm » pour Krfb.
-Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar X11 XDamage/XShm
-Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb.
-Comment[hr]=Međuspreminik okvira baziran na X11 XDamage/XShm za KRfb.
-Comment[hu]=X11 XDamage/XShm-alapú framebuffer a Krfb-hez.
-Comment[ia]=Framebuffer basate sur X11 XDamage/XShm per KRfb.
-Comment[it]=Framebuffer basato su XDamage/XShm di X11 per KRfb.
-Comment[kk]=X11 XDamage/XShm негіздеген KRfb кадр буфері.
-Comment[km]=X11 XDamage/XShm based Framebuffer សម្រាប់ KRfb ។
-Comment[ko]=KRfb를 위한 X11 XDamage/XShm 기반 프레임버퍼.
-Comment[lt]=X11 XDamage/XShm paremtas Framebuffer skirtas KRfb.
-Comment[lv]=X11 XDamage/XShm balstīts kadrbuferis priekš KRfb.
-Comment[nb]=Rammebuffer for KRfb basert på X11 XDamage/XShm.
-Comment[nds]=Op X11-XDamage/-XShm opbuut Bildpuffer för KRfb
-Comment[nl]=Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb.
-Comment[nn]=X11 XDamage/XShm basert framebuffer for KRfb.
-Comment[pl]=Bufor ramki na podstawie X11 XDamage/XShm dla KRfb.
-Comment[pt]='Framebuffer' baseado no XDamage/XShm do X11 para o KRfb.
-Comment[pt_BR]=Framebuffer baseado no XDamage/XShm do X11 para o KRfb.
-Comment[ru]=Буфер экрана для KRfb на базе X11 XDamage/XShm
-Comment[si]=KRfb සඳහා වන රාමු බෆරය මත පදනම් වූ X11 XDamage/XShm.
-Comment[sk]=Framebuffer založený na X11 XDamage/XShm pre KRfb.
-Comment[sl]=Slikovni medpomnilnik za KRFB, ki temelji na X11 XDamage/XShm
-Comment[sr]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
-Comment[sr@ijekavian]=Кадробафер за КРФБ на основу Икс‑демиџа/Икс‑схма у Иксу11.
-Comment[sr@ijekavianlatin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
-Comment[sr@latin]=Kadrobafer za KRFB na osnovu XDamagea/XShma u X11.
-Comment[sv]=X11 XDamage/XShm-baserad rambuffert för Krfb.
-Comment[tr]=KRfb için X11 XDamage/XShm temelli Çerçeve Tamponu.
-Comment[uk]=Заснований на XDamage/XShm X11 буфер кадрів для KRfb.
-Comment[x-test]=xxX11 XDamage/XShm based Framebuffer for KRfb.xx
-Comment[zh_CN]=基于 X11 XDamage/XShm 扩展的 KRfb 帧缓冲机制。
-Comment[zh_TW]=KRfb 的 X11 XDamage/XShm based Framebuffer
-Name=X11 Framebuffer for KRfb
-Name[ast]=Búfer de cuadros de X11 pa KRfb
-Name[bg]=X11 фреймбуфер за KRfb
-Name[bs]=X11 frame bafer za KRfb
-Name[ca]=«Framebuffer» del X11 per al KRfb.
-Name[ca@valencia]=«Framebuffer» del 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 Framebuffer for KRfb
-Name[en_GB]=X11 Framebuffer for KRfb
-Name[es]=Memoria intermedia de vídeo X11 para KRfb
-Name[et]=KRfb X11 kaadripuhver
-Name[eu]=KRfb-ren X11-ko irteerako bideoa
-Name[fi]=X11-kehyspuskuri KRfb:lle
-Name[fr]=Sortie vidéo X11 pour Krfb
-Name[ga]=Maolán fráma X11 le haghaidh KRfb
-Name[gl]=Framebuffer de X11 para KRfb
-Name[hr]=Međuspremnik okvira X11 za KRfb
-Name[hu]=X11 framebuffer a Krfb-hez
-Name[ia]=Framebuffer X11 per KRfb
-Name[it]=Framebuffer X11 per KRfb
-Name[kk]=X11 KRfb кадр буфері
-Name[km]=X11 Framebuffer សម្រាប់ KRfb
-Name[ko]=KRfb를 위한 X11 프레임버퍼
-Name[lt]=X11 Framebuffer skirtas KRfb
-Name[lv]=X11 kadrbuferis priekš KRfb
-Name[nb]=X11 rammebuffer for KRfb
-Name[nds]=X11-Bildpuffer för KRfb
-Name[nl]=X11 framebuffer voor KRfb
-Name[nn]=X11-framebuffer 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[si]=KRfb සඳහා X11 රාමු බෆරය
-Name[sk]=X11 Framebuffer pre KRfb
-Name[sl]=Slikovni medpomnilnik X11 za KRFB
-Name[sr]=Икс11 кадробафер за КРФБ.
-Name[sr@ijekavian]=Икс11 кадробафер за КРФБ.
-Name[sr@ijekavianlatin]=X11 kadrobafer za KRFB.
-Name[sr@latin]=X11 kadrobafer za KRFB.
-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]=KRfb 的 X11 帧缓冲机制
-Name[zh_TW]=KRfb 的 X11 Framebuffer
-Type=Service
-ServiceTypes=krfb/framebuffer
-
-X-KDE-Library=krfb_framebuffer_xcb
-X-KDE-PluginInfo-Name=xcb
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
--- a/framebuffers/xcb/krfb_framebuffer_xcb.json
+++ b/framebuffers/xcb/krfb_framebuffer_xcb.json
@@ -1,20 +1,20 @@
 {
-    "Encoding": "UTF-8",
    "KPlugin": {
        "Description": "X11 XDamage/XShm based Framebuffer for KRfb.",
-        "Description[ast]": "Búfer de cuadros basáu en XDamage/XShm de X11 pa KRfb.",
        "Description[ca@valencia]": "«Framebuffer» basat en XDamage/XShmQt del X11 per al KRfb.",
        "Description[ca]": "«Framebuffer» basat en XDamage/XShmQt del 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[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
        "Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.",
-        "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.",
+        "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.",
@@ -39,19 +39,20 @@
        "Id": "xcb",
        "License": "GPL",
        "Name": "X11 Framebuffer for KRfb",
-        "Name[ast]": "Búfer de cuadros de X11 pa KRfb",
        "Name[ca@valencia]": "«Framebuffer» del X11 per al KRfb.",
        "Name[ca]": "«Framebuffer» del 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[fi]": "X11-kehyspuskuri KRfb:lle",
        "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",
--- a/framebuffers/xcb/xcb_framebuffer.cpp
+++ b/framebuffers/xcb/xcb_framebuffer.cpp
@@ -8,7 +8,6 @@
 */

 #include "xcb_framebuffer.h"
-#include "xcb_framebuffer.moc"

 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
@@ -33,7 +32,7 @@ public:
    KrfbXCBEventFilter(XCBFrameBuffer *owner);

 public:
-    virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;

 public:
    int xdamageBaseEvent;
@@ -62,7 +61,7 @@ KrfbXCBEventFilter::KrfbXCBEventFilter(XCBFrameBuffer *owner):
                        QX11Info::connection(),
                        XCB_DAMAGE_MAJOR_VERSION,
                        XCB_DAMAGE_MINOR_VERSION),
-                    NULL);
+                    nullptr);
        if (!xdamage_version) {
            qWarning() << "xcb framebuffer: ERROR: Failed to get XDamage extension version!\n";
            return;
@@ -136,7 +135,7 @@ public:


 static xcb_screen_t *get_xcb_screen(xcb_connection_t *conn, int screen_num) {
-    xcb_screen_t *screen = NULL;
+    xcb_screen_t *screen = nullptr;
    xcb_screen_iterator_t screens_iter = xcb_setup_roots_iterator(xcb_get_setup(conn));
    for (; screens_iter.rem; --screen_num, xcb_screen_next(&screens_iter))
        if (screen_num == 0)
@@ -151,16 +150,16 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
 {
    d->running = false;
    d->damage = XCB_NONE;
-    d->framebufferImage = Q_NULLPTR;
-    d->shminfo.shmaddr = Q_NULLPTR;
+    d->framebufferImage = nullptr;
+    d->shminfo.shmaddr = nullptr;
    d->shminfo.shmid = XCB_NONE;
    d->shminfo.shmseg = XCB_NONE;
-    d->updateTile = Q_NULLPTR;
+    d->updateTile = nullptr;
    d->area.setRect(0, 0, 0, 0);
    d->x11EvtFilter = new KrfbXCBEventFilter(this);
    d->rootScreen = get_xcb_screen(QX11Info::connection(), QX11Info::appScreen());

-    this->fb = Q_NULLPTR;
+    this->fb = nullptr;

    QScreen *primaryScreen = QGuiApplication::primaryScreen();
    if (primaryScreen) {
@@ -207,9 +206,9 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                    d->area.height(),           // height
                    XCB_IMAGE_FORMAT_Z_PIXMAP,  // image format
                    d->rootScreen->root_depth,  // depth
-                    NULL,                       // base address = 0
+                    nullptr,                    // base address = 0
                    (uint32_t)~0,               // bytes = 0xffffffff
-                    NULL);                      // data = 0
+                    nullptr);                   // data = 0
        if (d->updateTile) {
 #ifdef _DEBUG
            qDebug() << "xcb framebuffer: Successfully created new empty image in native format";
@@ -228,7 +227,7 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
            // so, we get as many bytes as needed for image (updateTile->size)
            d->shminfo.shmid = shmget(IPC_PRIVATE, d->updateTile->size, IPC_CREAT | 0777);
            // attached shared memory address is stored both in shminfo structure and in xcb_image_t->data
-            d->shminfo.shmaddr = (uint8_t *)shmat(d->shminfo.shmid, NULL, 0);
+            d->shminfo.shmaddr = (uint8_t *)shmat(d->shminfo.shmid, nullptr, 0);
            d->updateTile->data = d->shminfo.shmaddr;
            // we keep updateTile->base == NULL here, so xcb_image_destroy() will not attempt
            // to free this block, just in case.
@@ -256,9 +255,9 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
                // will not use shared mem! detach and cleanup
                xcb_shm_detach(QX11Info::connection(), d->shminfo.shmseg);
                shmdt(d->shminfo.shmaddr);
-                shmctl(d->shminfo.shmid, IPC_RMID, 0); // mark shm segment as removed
+                shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
                d->x11EvtFilter->xshmAvail = false;
-                d->shminfo.shmaddr = Q_NULLPTR;
+                d->shminfo.shmaddr = nullptr;
                d->shminfo.shmid = XCB_NONE;
                d->shminfo.shmseg = XCB_NONE;
                qWarning() << "xcb framebuffer: ERROR: xcb_image_shm_get() result: " << shmget_res;
@@ -267,9 +266,9 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
            // image is freed, and recreated again for every new damage rectangle
            // data was allocated manually and points to shared mem;
            // tell xcb_image_destroy() do not free image data
-            d->updateTile->data = NULL;
+            d->updateTile->data = nullptr;
            xcb_image_destroy(d->updateTile);
-            d->updateTile = NULL;
+            d->updateTile = nullptr;
        }
    }

@@ -290,7 +289,7 @@ XCBFrameBuffer::~XCBFrameBuffer() {
    //
    if (d->framebufferImage) {
        xcb_image_destroy(d->framebufferImage);
-        fb = Q_NULLPTR;  // image data was already destroyed by above call
+        fb = nullptr;  // image data was already destroyed by above call
    }
    if (d->x11EvtFilter->xshmAvail) {
        // detach shared memory
@@ -299,12 +298,12 @@ XCBFrameBuffer::~XCBFrameBuffer() {
        if (d->shminfo.shmaddr)
            shmdt(d->shminfo.shmaddr); // detach addr from our address space
        if (d->shminfo.shmid != XCB_NONE)
-            shmctl(d->shminfo.shmid, IPC_RMID, 0); // mark shm segment as removed
+            shmctl(d->shminfo.shmid, IPC_RMID, nullptr); // mark shm segment as removed
    }
    // and delete image used for shared mem
    if (d->updateTile) {
-        d->updateTile->base = NULL;
-        d->updateTile->data = NULL;
+        d->updateTile->base = nullptr;
+        d->updateTile->data = nullptr;
        xcb_image_destroy(d->updateTile);
    }
    // we don't use d->x11EvtFilter anymore, can delete it now
@@ -350,7 +349,7 @@ void XCBFrameBuffer::getServerFormat(rfbPixelFormat &format) {
    if (!d->framebufferImage) return;

    // get information about XCB visual params
-    xcb_visualtype_t *root_visualtype = NULL;  // visual info
+    xcb_visualtype_t *root_visualtype = nullptr;  // visual info
    if (d->rootScreen) {
        xcb_visualid_t root_visual = d->rootScreen->root_visual;
        xcb_depth_iterator_t depth_iter;
@@ -560,7 +559,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                            0);

                xcb_shm_get_image_reply_t *sgi_reply = xcb_shm_get_image_reply(
-                            QX11Info::connection(), sgi_cookie, NULL);
+                            QX11Info::connection(), sgi_cookie, nullptr);
                if (sgi_reply) {
                    // create temporary image to get update rect contents into
                    d->updateTile = xcb_image_create_native(
@@ -569,9 +568,9 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                                r.height(),
                                XCB_IMAGE_FORMAT_Z_PIXMAP,
                                d->rootScreen->root_depth,
-                                NULL,         // base == 0
+                                nullptr,      // base == 0
                                (uint32_t)~0, // bytes == ~0
-                                NULL);
+                                nullptr);

                    if (d->updateTile) {
                        d->updateTile->data = d->shminfo.shmaddr;
@@ -588,9 +587,9 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
                        }

                        // delete temporary image
-                        d->updateTile->data = NULL;
+                        d->updateTile->data = nullptr;
                        xcb_image_destroy(d->updateTile);
-                        d->updateTile = NULL;
+                        d->updateTile = nullptr;
                    }

                    free(sgi_reply);
--- a/framebuffers/xcb/xcb_framebuffer.h
+++ b/framebuffers/xcb/xcb_framebuffer.h
@@ -22,18 +22,18 @@ class XCBFrameBuffer: public FrameBuffer
 {
    Q_OBJECT
 public:
-    XCBFrameBuffer(WId winid, QObject *parent = 0);
-    ~XCBFrameBuffer();
+    explicit XCBFrameBuffer(WId winid, QObject *parent = nullptr);
+    ~XCBFrameBuffer() override;

 public:
-    QList<QRect> modifiedTiles() Q_DECL_OVERRIDE;
-    int  depth() Q_DECL_OVERRIDE;
-    int  height() Q_DECL_OVERRIDE;
-    int  width() Q_DECL_OVERRIDE;
-    int  paddedWidth() Q_DECL_OVERRIDE;
-    void getServerFormat(rfbPixelFormat &format) Q_DECL_OVERRIDE;
-    void startMonitor() Q_DECL_OVERRIDE;
-    void stopMonitor() Q_DECL_OVERRIDE;
+    QList<QRect> modifiedTiles() override;
+    int  depth() override;
+    int  height() override;
+    int  width() override;
+    int  paddedWidth() override;
+    void getServerFormat(rfbPixelFormat &format) override;
+    void startMonitor() override;
+    void stopMonitor() override;

 public:
    void handleXDamageNotify(xcb_generic_event_t *xevent);
--- a/framebuffers/xcb/xcb_framebufferplugin.cpp
+++ b/framebuffers/xcb/xcb_framebufferplugin.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
- @author Alexey Min <alexey.min@gmail.com>
+ Copyright (C) 2017 Alexey Min <alexey.min@gmail.com>

 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
--- a/framebuffers/xcb/xcb_framebufferplugin.h
+++ b/framebuffers/xcb/xcb_framebufferplugin.h
@@ -33,7 +33,7 @@ class XCBFrameBufferPlugin: public FrameBufferPlugin

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

   FrameBuffer *frameBuffer(WId id) override;

--- a/icons/48-apps-krfb.png
+++ b/icons/48-apps-krfb.png
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,4 @@
+ecm_install_icons(ICONS
+    sc-apps-krfb.svgz
+    48-apps-krfb.png
+DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
--- a/icons/sc-apps-krfb.svgz
+++ b/icons/sc-apps-krfb.svgz
--- a/krfb/connectiondialog.cpp
+++ b/krfb/connectiondialog.cpp
@@ -80,7 +80,3 @@ void InvitationsConnectionDialog::setRemoteHost(const QString &host)
 {
    m_ui.remoteHost->setText(host);
 }
-
-//**********
-
-#include "connectiondialog.moc"
--- a/krfb/connectiondialog.h
+++ b/krfb/connectiondialog.h
@@ -29,8 +29,8 @@ template <typename UI>
 class ConnectionDialog : public QDialog
 {
 public:
-    ConnectionDialog(QWidget *parent);
-    ~ConnectionDialog() {};
+    explicit ConnectionDialog(QWidget *parent);
+    ~ConnectionDialog() override {};

    void setAllowRemoteControl(bool b);
    bool allowRemoteControl();
@@ -59,7 +59,7 @@ class InvitationsConnectionDialog : public ConnectionDialog<Ui::ConnectionWidget
 {
    Q_OBJECT
 public:
-    InvitationsConnectionDialog(QWidget *parent);
+    explicit InvitationsConnectionDialog(QWidget *parent);
    void setRemoteHost(const QString & host);
 };

--- a/krfb/framebuffer.cpp
+++ b/krfb/framebuffer.cpp
@@ -9,7 +9,7 @@

 #include "framebuffer.h"

-#include "config-krfb.h"
+#include <config-krfb.h>

 #include <X11/Xutil.h>

@@ -67,7 +67,3 @@ void FrameBuffer::startMonitor()
 void FrameBuffer::stopMonitor()
 {
 }
-
-
-#include "framebuffer.moc"
-
--- a/krfb/framebuffer.h
+++ b/krfb/framebuffer.h
@@ -14,9 +14,9 @@

 #include "krfbprivate_export.h"

-#include <QtCore/QObject>
-#include <QtCore/QRect>
-#include <QtCore/QList>
+#include <QObject>
+#include <QRect>
+#include <QList>
 #include <QWidget>


@@ -28,9 +28,9 @@ class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
    Q_OBJECT
 public:
-    explicit FrameBuffer(WId id, QObject *parent = 0);
+    explicit FrameBuffer(WId id, QObject *parent = nullptr);

-    virtual ~FrameBuffer();
+    ~FrameBuffer() override;

    char *data();

--- a/krfb/framebuffermanager.cpp
+++ b/krfb/framebuffermanager.cpp
@@ -30,7 +30,7 @@
 #include <KPluginLoader>
 #include <KPluginMetaData>

-#include <QtCore/QSharedPointer>
+#include <QSharedPointer>

 class FrameBufferManagerStatic
 {
@@ -135,7 +135,3 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
    qDebug() << "No valid framebuffer found. returning null.";
    return QSharedPointer<FrameBuffer>();
 }
-
-
-#include "framebuffermanager.moc"
-
--- a/krfb/framebuffermanager.h
+++ b/krfb/framebuffermanager.h
@@ -25,10 +25,10 @@

 #include "krfbprivate_export.h"

-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QWeakPointer>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QWeakPointer>

 #include <QWidget>

@@ -43,7 +43,7 @@ class KRFBPRIVATE_EXPORT FrameBufferManager : public QObject
 public:
    static FrameBufferManager *instance();

-    virtual ~FrameBufferManager();
+    ~FrameBufferManager() override;

    QSharedPointer<FrameBuffer> frameBuffer(WId id);

--- a/krfb/framebufferplugin.cpp
+++ b/krfb/framebufferplugin.cpp
@@ -30,7 +30,3 @@ FrameBufferPlugin::FrameBufferPlugin(QObject *parent, const QVariantList &)
 FrameBufferPlugin::~FrameBufferPlugin()
 {
 }
-
-
-#include "framebufferplugin.moc"
-
--- a/krfb/framebufferplugin.h
+++ b/krfb/framebufferplugin.h
@@ -23,7 +23,7 @@

 #include "krfbprivate_export.h"

-#include <QtCore/QVariantList>
+#include <QVariantList>
 #include <QWidget>


@@ -35,7 +35,7 @@ class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject

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

    virtual FrameBuffer *frameBuffer(WId id) = 0;
 };
--- a/krfb/invitationsrfbclient.cpp
+++ b/krfb/invitationsrfbclient.cpp
@@ -29,7 +29,7 @@
 #include <KLocalizedString>

 #include <QDebug>
-#include <QtCore/QSocketNotifier>
+#include <QSocketNotifier>
 #include <poll.h>
 #include <KConfigGroup>

@@ -65,7 +65,7 @@ PendingInvitationsRfbClient::~PendingInvitationsRfbClient()

 void PendingInvitationsRfbClient::processNewClient()
 {
-    QString host = peerAddress(m_rfbClient->sock) + ":" + QString::number(peerPort(m_rfbClient->sock));
+    QString host = peerAddress(m_rfbClient->sock) + ':' + QString::number(peerPort(m_rfbClient->sock));

    if (d->askOnConnect == false) {

@@ -79,7 +79,7 @@ void PendingInvitationsRfbClient::processNewClient()
                            i18n("Received connection from %1, on hold (waiting for confirmation)",
                                host));

-        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(0);
+        InvitationsConnectionDialog *dialog = new InvitationsConnectionDialog(nullptr);
        dialog->setRemoteHost(host);
        dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());

@@ -126,7 +126,7 @@ void PendingInvitationsRfbClient::onSocketActivated()
 bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
    QByteArray password ;
-    qDebug() << "about to start autentication";
+    qDebug() << "about to start authentication";

    if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
            InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
@@ -149,5 +149,3 @@ void PendingInvitationsRfbClient::dialogAccepted()
    client->setControlEnabled(dialog->allowRemoteControl());
    accept(client);
 }
-
-#include "invitationsrfbclient.moc"
--- a/krfb/invitationsrfbclient.h
+++ b/krfb/invitationsrfbclient.h
@@ -23,7 +23,7 @@
 class InvitationsRfbClient : public RfbClient
 {
 public:
-    InvitationsRfbClient(rfbClientPtr client, QObject* parent = 0)
+    explicit InvitationsRfbClient(rfbClientPtr client, QObject* parent = nullptr)
        : RfbClient(client, parent) {}
 };

@@ -32,8 +32,8 @@ class PendingInvitationsRfbClient : public PendingRfbClient
 {
    Q_OBJECT
 public:
-    PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~PendingInvitationsRfbClient();
+    explicit PendingInvitationsRfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~PendingInvitationsRfbClient() override;

 protected Q_SLOTS:
    void processNewClient() override;
--- a/krfb/invitationsrfbserver.cpp
+++ b/krfb/invitationsrfbserver.cpp
@@ -22,9 +22,9 @@
 #include "invitationsrfbclient.h"
 #include "krfbconfig.h"
 #include "rfbservermanager.h"
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QApplication>
-#include <QtNetwork/QHostInfo>
+#include <QHostInfo>
 #include <QDebug>

 #include <KLocalizedString>
@@ -115,8 +115,8 @@ void InvitationsRfbServer::toggleUnattendedAccess(bool allow)

 InvitationsRfbServer::InvitationsRfbServer()
 {
-    m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
+    m_desktopPassword = readableRandomString(4)+'-'+readableRandomString(3);
+    m_unattendedPassword = readableRandomString(4)+'-'+readableRandomString(3);
    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
    m_allowUnattendedAccess = krfbConfig.readEntry(
            "allowUnattendedAccess", QVariant(false)).toBool();
@@ -223,5 +223,3 @@ QString InvitationsRfbServer::readableRandomString(int length)
    }
    return str;
 }
-
-#include "invitationsrfbserver.moc"
--- a/krfb/invitationsrfbserver.h
+++ b/krfb/invitationsrfbserver.h
@@ -53,7 +53,7 @@ public Q_SLOTS:

 protected:
    InvitationsRfbServer();
-    virtual ~InvitationsRfbServer();
+    ~InvitationsRfbServer() override;
    PendingRfbClient* newClient(rfbClientPtr client) override;

 private Q_SLOTS:
--- a/krfb/krfb-framebuffer.desktop
+++ b/krfb/krfb-framebuffer.desktop
@@ -3,7 +3,6 @@ Type=ServiceType
 X-KDE-ServiceType=krfb/framebuffer

 Comment=Frame Buffer plugins for KRfb
-Comment[ast]=Complementos del búfer de cuadros pa KRfb
 Comment[bg]=Приставки за фреймбуфер за KRfb
 Comment[bs]=Priključci framebafera za KRfb
 Comment[ca]=Connectors de «framebuffer» per al KRfb.
@@ -19,10 +18,11 @@ 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]=Complemento de frame buffer para 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 кадр буфер плагині
@@ -51,5 +51,5 @@ 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_CN]=KRfb 的帧缓冲插件
 Comment[zh_TW]=KRfb 的 Frame Buffer 外掛程式
--- a/krfb/krfb-framebuffer.json
+++ b/krfb/krfb-framebuffer.json
@@ -1,19 +1,20 @@
 {
    "KPlugin": {
        "Description": "Frame Buffer plugins for KRfb",
-        "Description[ast]": "Complementos del búfer de cuadros pa KRfb",
        "Description[ca@valencia]": "Connectors de «framebuffer» per al KRfb.",
        "Description[ca]": "Connectors de «framebuffer» 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[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
        "Description[fr]": "Modules de tampons d'image pour KRfb",
-        "Description[gl]": "Complemento de frame buffer para 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",
--- a/krfb/krfb.kcfg
+++ b/krfb/krfb.kcfg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM
-    "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
-<kcfg>
-  <kcfgfile />
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <kcfgfile name="krfbrc"/>
  <group name="MainWindow">
    <entry name="startMinimized" type="Bool">
    <label>Start minimized</label>
--- a/krfb/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
@@ -3,7 +3,6 @@ IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Compartición d'escritoriu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
@@ -30,6 +29,7 @@ Comment[hne]=डेस्कटाप साझेदारी
 Comment[hr]=Dijeljenje radne površine
 Comment[hu]=Munkaasztal-megosztás
 Comment[ia]=Compartir de scriptorio
+Comment[id]=Desktop Sharing
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione del desktop
 Comment[ja]=デスクトップ共有
@@ -75,7 +75,6 @@ Comment[zh_TW]=桌面分享
 [Event/UserAcceptsConnection]
 Name=User Accepts Connection
 Name[ar]=المستخدم يقبل الاتصال
-Name[ast]=L'usuariu aceuta la conexón
 Name[bg]=Потребителят приема връзката
 Name[bs]=Korisnik prihvata vezu
 Name[ca]=L'usuari accepta la connexió
@@ -98,6 +97,7 @@ Name[hne]=कमइया हर कनेक्सन स्वीकारा
 Name[hr]=Korisnik prihvaća vezu
 Name[hu]=A felhasználó engedélyezi a csatlakozást
 Name[ia]=Usator da acceptation a connexion
+Name[id]=Pengguna Menyetujui Koneksi
 Name[is]=Notandi samþykkir tengingar
 Name[it]=L'utente accetta la connessione
 Name[ja]=ユーザが接続を許可
@@ -136,7 +136,6 @@ Name[zh_TW]=使用者接受連線
 Comment=User accepts connection
 Comment[af]=Gebruiker aanvaar verbinding
 Comment[ar]=المستخدم يقبل الاتصال
-Comment[ast]=L'usuariu aceuta la conexón
 Comment[bg]=Потребителят приема връзката
 Comment[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
 Comment[bs]=Korisnik prihvata vezu
@@ -162,6 +161,7 @@ Comment[hne]=कमइया हर कनेक्सन स्वीकार
 Comment[hr]=Korisnik prihvaća vezu
 Comment[hu]=A felhasználó engedélyezi a csatlakozást
 Comment[ia]=Usator da acceptation a connexion
+Comment[id]=Pengguna menyetujui koneksi
 Comment[is]=Notandi samþykkir tengingu
 Comment[it]=L'utente accetta la connessione
 Comment[ja]=ユーザが接続を許可
@@ -208,7 +208,6 @@ Action=Popup
 [Event/UserRefusesConnection]
 Name=User Refuses Connection
 Name[ar]=المستخدم يرفض الاتصال
-Name[ast]=L'usuariu refuga la conexón
 Name[bg]=Потребителят отказва връзката
 Name[bs]=Korisnik odbija vezu
 Name[ca]=L'usuari refusa la connexió
@@ -231,6 +230,7 @@ Name[hne]=कमइया हर कनेक्सन अस्वीकार
 Name[hr]=Korisnik odbija vezu
 Name[hu]=A felhasználó elutasítja a csatlakozást
 Name[ia]=Usator refuta connexion
+Name[id]=Pengguna Menampik Koneksi
 Name[is]=Notandi hafnar tengingum
 Name[it]=L'utente rifiuta la connessione
 Name[ja]=ユーザが接続を拒否
@@ -269,7 +269,6 @@ Name[zh_TW]=使用者拒絕連線
 Comment=User refuses connection
 Comment[af]=Gebruiker weier verbinding
 Comment[ar]=المستخدم يرفض الاتصال
-Comment[ast]=L'usuariu refuga la conexón
 Comment[bg]=Потребителят отказва връзката
 Comment[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
 Comment[bs]=Korisnik odbija vezu
@@ -295,6 +294,7 @@ Comment[hne]=कमइया हर कनेक्सन अस्वीका
 Comment[hr]=Korisnik odbija vezu
 Comment[hu]=A felhasználó elutasítja a csatlakozást
 Comment[ia]=Usator refuta connexion
+Comment[id]=Pengguna menampik koneksi
 Comment[is]=Notandi hafnar tengingu
 Comment[it]=L'utente rifiuta la connessione
 Comment[ja]=ユーザが接続を拒否
@@ -341,7 +341,6 @@ Action=Popup
 [Event/ConnectionClosed]
 Name=Connection Closed
 Name[ar]=الاتصال أغلق
-Name[ast]=Conexón zarrada
 Name[bg]=Връзката е прекъсната
 Name[bs]=Konekcija zatvorena
 Name[ca]=Connexió tancada
@@ -364,6 +363,7 @@ Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
 Name[hu]=A kapcsolat megszűnt
 Name[ia]=Connexion claudite
+Name[id]=Koneksi Ditutup
 Name[is]=Tengingu lokað
 Name[it]=Connessione chiusa
 Name[ja]=接続切断
@@ -404,7 +404,6 @@ Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=تمّ غلق الاتصال
-Comment[ast]=Zarróse la conexón
 Comment[bg]=Връзката е прекъсната
 Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
@@ -431,6 +430,7 @@ Comment[hne]=कनेक्सन बन्द
 Comment[hr]=Veza prekinuta
 Comment[hu]=A kapcsolat megszűnt
 Comment[ia]=Connexion claudite
+Comment[id]=Koneksi ditutup
 Comment[is]=Tengingu lokað
 Comment[it]=Connessione chiusa
 Comment[ja]=接続が閉じられました
@@ -480,7 +480,6 @@ Action=Popup
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
-Name[ast]=Contraseña non válida
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -497,12 +496,13 @@ Name[eu]=Baliogabeko pasahitza
 Name[fi]=Virheellinen salasana
 Name[fr]=Mot de passe non valable
 Name[ga]=Focal Faire Neamhbhailí
-Name[gl]=O contrasinal non é válido
+Name[gl]=O contrasinal é incorrecto
 Name[hi]=अवैध पासवर्ड
 Name[hne]=अवैध पासवर्ड
 Name[hr]=Nevažeća zaporka
 Name[hu]=Érvénytelen jelszó
 Name[ia]=Contrasigno invalide
+Name[id]=Sandi Tidak Absah
 Name[is]=Ógilt lykilorð
 Name[it]=Password non valida
 Name[ja]=無効なパスワード
@@ -543,7 +543,6 @@ Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة المرور غير صحيحة
-Comment[ast]=La contraseña nun ye válida
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -563,13 +562,14 @@ Comment[eu]=Baliogabeko pasahitza
 Comment[fi]=Virheellinen salasana
 Comment[fr]=Mot de passe non valable
 Comment[ga]=Focal faire neamhbhailí
-Comment[gl]=Este contrasinal non é válido
+Comment[gl]=Este contrasinal é incorrecto
 Comment[he]=הסיסמה שגויה
 Comment[hi]=अवैध पासवर्ड
 Comment[hne]=अवैध पासवर्ड
 Comment[hr]=Nevažeća šifra
 Comment[hu]=Érvénytelen jelszó
 Comment[ia]=Contrasigno invalide
+Comment[id]=Sandi tidak absah
 Comment[is]=Lykilorð ógilt
 Comment[it]=Password non valida
 Comment[ja]=無効なパスワード
@@ -638,12 +638,13 @@ Name[eu]=Gonbitearen pasahitza baliogabea
 Name[fi]=Virheellinen salasana kutsuun
 Name[fr]=Invitations de mots de passe non valables
 Name[ga]=Cuirí Neamhbhailí Focal Faire
-Name[gl]=O contrasinal de convidado non válido
+Name[gl]=O contrasinal de convidado incorrecto
 Name[hi]=अवैध पासवर्ड निमंत्रण
 Name[hne]=अवैध पासवर्ड निमंत्रन
 Name[hr]=Pozivnice s nevažećim zaporkama
 Name[hu]=Érvénytelen jelszavas meghívó
 Name[ia]=Invitationes de contrasigno invalide
+Name[id]=Undangan Sandi Tidak Absah
 Name[is]=Ógild lykilorðsboð
 Name[it]=Password di invito non valida
 Name[ja]=招待に対する無効なパスワード
@@ -682,7 +683,6 @@ Name[zh_TW]=不合法的密碼邀請
 Comment=The invited party sent an invalid password. Connection refused.
 Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
 Comment[ar]=المدعو أرسل كلمة مرور غير صحيحة. رفض الإتصال.
-Comment[ast]=La parte invitada unvió una contraseña non válida. Refugóse la conexón.
 Comment[bg]=Поканената страна изпрати неправилна парола. Връзката е отказана.
 Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
 Comment[bs]=Pozvana strana je poslala pogrešnu šifru. Veza je odbijena.
@@ -701,13 +701,14 @@ Comment[eu]=Gonbidatutako parekoak baliogabeko pasahitza bidali du. Konexioa uka
 Comment[fi]=Kutsuttu taho lähetti virheellisen salasanan. Yhteys hylättiin.
 Comment[fr]=La partie invitée a envoyé un mot de passe non valable. Connexion refusée.
 Comment[ga]=Sheol an duine le cuireadh focal faire neamhbhailí. Diúltaíodh an ceangal.
-Comment[gl]=A parte convidada envioulle un contrasinal non válido. A conexión foi rexeitada.
+Comment[gl]=A parte convidada envioulle un contrasinal incorrecto. Rexeitouse a conexión.
 Comment[he]=הצד המוזמן שלח סיסמה שגויה. החיבור נדחה.
 Comment[hi]=निमंत्रित पार्टी ने अवैध पासवर्ड भेजा. कनेक्शन अस्वीकृत.
 Comment[hne]=निमंत्रित पार्टी हर अवैध पासवर्ड भेजिस. कनेक्सन अस्वीकृत.
 Comment[hr]=Stranka koju ste pozvali je poslala nevažeću šifru. Veza odbijena.
 Comment[hu]=A meghívott fél érvénytelen jelszót küldött. A csatlakozási kérés elutasítva.
 Comment[ia]=Le partita invitate inviava un contrasigno invalide. Connexion refusate.
+Comment[id]=Undangan mengirimkan sebuah sandi tidak absah. Koneksi ditampik.
 Comment[is]=Boðinn aðili sendi ógilt lykilorð. Tengingu hafnað
 Comment[it]=La parte invitata ha inviato una password non valida. Connessione rifiutata.
 Comment[ja]=招待された人が無効なパスワードを送ってきました。接続を拒否しました。
@@ -752,7 +753,6 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ar]=اتصال جديد  على التوقف
-Name[ast]=Conexón nueva n'espera
 Name[bg]=Изчакване на новата връзка
 Name[bs]=Nova veza je na čekanju
 Name[ca]=Connexió nova en espera
@@ -775,6 +775,7 @@ Name[hne]=नवा कनेक्सन होल्ड मं रखा
 Name[hr]=Nova veza na čekanju
 Name[hu]=Új kapcsolat tartva
 Name[ia]=Nove connexion in pausa
+Name[id]=Koneksi Baru sedang Tertahan
 Name[is]=Ný tenging á bið
 Name[it]=Nuova connessione in attesa
 Name[ja]=保留中の新しい接続
@@ -812,7 +813,6 @@ Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=الاتصال طلب، يجب موافقة المستخدم
-Comment[ast]=Solicitóse la conexón, l'usuariu ha aceutar
 Comment[bg]=Поискана е връзка, следва потребителят да приеме
 Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
 Comment[bs]=Veza je zahtijevana, korinik mora da je prihvati
@@ -838,6 +838,7 @@ Comment[hne]=कनेक्सन निवेदित. कमइया ल
 Comment[hr]=Veza je zatražena, korisnik mora prihvatiti
 Comment[hu]=Csatlakozási kérés, a felhasználónak el kell fogadnia
 Comment[ia]=Connexion requirite, usator debe dar acceptation
+Comment[id]=Koneksi diminta, pengguna harus menyetujui
 Comment[is]=Beiðni um tengingu, notandi verður að samþykkja
 Comment[it]=Connessione richiesta, l'utente deve accettare
 Comment[ja]=接続が要求されています。ユーザが許可しなければなりません。
@@ -883,7 +884,6 @@ Action=Popup
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ar]=اتصال جديد مقبول تلقائيا
-Name[ast]=Conexón nueva auto-aceutada
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
 Name[ca]=Connexió nova acceptada automàticament
@@ -906,6 +906,7 @@ Name[hne]=नय कनेक्सन अपने अपन स्वीका
 Name[hr]=Nova veza automatski prihvaćena
 Name[hu]=Új kapcsolat automatikusan engedélyezve
 Name[ia]=Nove connexion con acceptation automatic
+Name[id]=Koneksi Baru Tersetujui Otomatis
 Name[is]=Ný tenging sjálfvirkt samþykkt
 Name[it]=Nuova connessione accettata automaticamente
 Name[ja]=新しい接続の自動受け入れ
@@ -943,7 +944,6 @@ Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصال جديد مفعل تلقائيا 
-Comment[ast]=Afitóse automáticamente la conexón nueva
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
@@ -969,6 +969,7 @@ Comment[hne]=नवा कनेक्सन अपने अपन स्था
 Comment[hr]=Nova veza automatski prihvaćena
 Comment[hu]=Automatikusan létrejött egy új kapcsolat
 Comment[ia]=Nove connexion establite automaticamente
+Comment[id]=Koneksi baru secara otomatis terpancang
 Comment[is]=Nýjar tengingar sjálfkrafa samþykktar
 Comment[it]=Nuova connessione stabilita automaticamente
 Comment[ja]=新しい接続を自動的に確立しました
@@ -1014,7 +1015,6 @@ Action=Popup
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ar]=اتصالات عديدة
-Name[ast]=Milenta conexones
 Name[bg]=Твърде много връзки
 Name[bs]=Previše veza
 Name[ca]=Massa connexions
@@ -1037,6 +1037,7 @@ Name[hne]=बहुत अकन कनेक्सन
 Name[hr]=Previše veza
 Name[hu]=Túl sok kapcsolat
 Name[ia]=Nimie connexiones
+Name[id]=Terlalu Banyak Koneksi
 Name[is]=Of margar tengingar
 Name[it]=Troppe connessioni
 Name[ja]=多すぎる接続
@@ -1074,7 +1075,6 @@ Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول، الإتصال رفض
-Comment[ast]=Ocupáu, refugóse la conexón
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1094,13 +1094,14 @@ Comment[eu]=Lanpetuta, konexioa ukatu da
 Comment[fi]=Varattu, yhteys hylättiin
 Comment[fr]=Occupé. Connexion refusée
 Comment[ga]=Gnóthach; ceangal diúltaithe
-Comment[gl]=Ocupado; a conexión foi rexeitada
+Comment[gl]=Ocupado, rexeitouse a conexión.
 Comment[he]=תפוס, החיבור נדחה
 Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत
 Comment[hne]=व्यस्त, कनेक्सन अस्वीकृत
 Comment[hr]=Zauzeto, veza odbijena
 Comment[hu]=A csatlakozási kérés elutasítva túlterhelés miatt
 Comment[ia]=Occupate, connexion refusate
+Comment[id]=Sibuk, koneksi ditampik
 Comment[is]=Uptekinn, tengingu hafnað
 Comment[it]=Occupato, connessione rifiutata
 Comment[ja]=ビジーです、接続を拒否しました
@@ -1148,7 +1149,6 @@ Action=Popup
 [Event/UnexpectedConnection]
 Name=Unexpected Connection
 Name[ar]=الاتصال غير متوقّع
-Name[ast]=Conexón inesperada
 Name[bg]=Неочаквана връзка
 Name[bs]=Neočekivana veza
 Name[ca]=Connexió inesperada
@@ -1171,6 +1171,7 @@ Name[hne]=अप्रत्यासित कनेक्सन
 Name[hr]=Neočekivana veza
 Name[hu]=Nem várt kapcsolat
 Name[ia]=Connexion impreviste
+Name[id]=Koneksi Tak Terduga
 Name[is]=Óvænt Tenging
 Name[it]=Connessione inattesa
 Name[ja]=予期しない接続
@@ -1209,7 +1210,6 @@ Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=استقبال اتصال غير متوقع، إنهاء
-Comment[ast]=Recibióse una conexón inesperada, albortando
 Comment[bg]=Получена е неочаквана връзка. Прекъсване.
 Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primljena je neočekivana veza, prekini
@@ -1228,13 +1228,14 @@ Comment[eu]=Ustekabeko konexioa jaso da, abortatzen
 Comment[fi]=Vastaanotettiin odottamaton yhteys, lopeta
 Comment[fr]=Connexion inattendue reçue. Annulation
 Comment[ga]=Fuarthas ceangal gan choinne, á thobscor
-Comment[gl]=Recibiuse unha conexión non agardada; cancélase
+Comment[gl]=Recibiuse unha conexión non agardada; interrómpese
 Comment[he]=נתקבל חיבור בלתי צפוי, בוטל
 Comment[hi]=अप्रत्याशित कनेक्शन प्राप्त. छोड़ा
 Comment[hne]=अप्रत्यासित कनेक्सन प्राप्त. छोड़ा
 Comment[hr]=Primio sam neočekivanu vezu, prekid
 Comment[hu]=Nem várt csatlakozási kérés érkezett, megszakítás
 Comment[ia]=On recipeva connexion impreviste, aborta
+Comment[id]=Diperoleh koneksi tak terduga, gugurkan
 Comment[is]=Tók á móti óvæntri tengingu, hætti
 Comment[it]=Ricevuta connessione inattesa, terminata
 Comment[ja]=予期しない接続を受信しました。廃棄します。
--- a/krfb/main.cpp
+++ b/krfb/main.cpp
@@ -19,6 +19,7 @@
 #include "trayicon.h"
 #include "invitationsrfbserver.h"
 #include "krfbconfig.h"
+#include "krfb_version.h"

 #include <KAboutData>
 #include <KDBusService>
@@ -35,7 +36,7 @@
 #include <QCommandLineParser>
 #include <QCommandLineOption>

-static const char KRFB_VERSION[] = "5.0";
+
 static const char description[] = I18N_NOOP("VNC-compatible server to share "
                                  "desktops");

@@ -46,7 +47,7 @@ static bool checkX11Capabilities()
                                 &majorv, &minorv);

    if ((!r) || (((majorv * 1000) + minorv) < 2002)) {
-        KMessageBox::error(0,
+        KMessageBox::error(nullptr,
                           i18n("Your X11 Server does not support the required XTest extension "
                                "version 2.2. Sharing your desktop is not possible."),
                           i18n("Desktop Sharing Error"));
@@ -78,10 +79,10 @@ int main(int argc, char *argv[])
    KLocalizedString::setApplicationDomain("krfb");

    KAboutData aboutData("krfb",
-			 i18n("Desktop Sharing"),
-			 KRFB_VERSION,
+                         i18n("Desktop Sharing"),
+                         QStringLiteral(KRFB_VERSION_STRING),
                         i18n(description),
-			 KAboutLicense::GPL,
+                         KAboutLicense::GPL,
                         i18n("(c) 2009-2010, Collabora Ltd.\n"
                               "(c) 2007, Alessandro Praduroux\n"
                               "(c) 2001-2003, Tim Jansen\n"
@@ -145,7 +146,7 @@ int main(int argc, char *argv[])
    sigset_t sigs;
    sigemptyset(&sigs);
    sigaddset(&sigs, SIGPIPE);
-    sigprocmask(SIG_BLOCK, &sigs, 0);
+    sigprocmask(SIG_BLOCK, &sigs, nullptr);

    return app.exec();
 }
--- a/krfb/mainwindow.cpp
+++ b/krfb/mainwindow.cpp
@@ -32,13 +32,13 @@
 #include <QSizePolicy>
 #include <QVector>
 #include <QSet>
-#include <QtNetwork/QNetworkInterface>
+#include <QNetworkInterface>


 class TCP: public QWidget, public Ui::TCP
 {
 public:
-    TCP(QWidget *parent = 0) : QWidget(parent) {
+    TCP(QWidget *parent = nullptr) : QWidget(parent) {
        setupUi(this);
    }
 };
@@ -46,7 +46,7 @@ public:
 class Security: public QWidget, public Ui::Security
 {
 public:
-    Security(QWidget *parent = 0) : QWidget(parent) {
+    Security(QWidget *parent = nullptr) : QWidget(parent) {
        setupUi(this);
    }
 };
@@ -54,7 +54,7 @@ public:
 class ConfigFramebuffer: public QWidget, public Ui::Framebuffer
 {
 public:
-    ConfigFramebuffer(QWidget *parent = 0) : QWidget(parent) {
+    ConfigFramebuffer(QWidget *parent = nullptr) : QWidget(parent) {
        setupUi(this);
        // hide the line edit with framebuffer string
        kcfg_preferredFrameBufferPlugin->hide();
@@ -262,5 +262,3 @@ void MainWindow::saveProperties(KConfigGroup& group)
    group.writeEntry("Visible", isVisible());
    KMainWindow::saveProperties(group);
 }
-
-#include "mainwindow.moc"
--- a/krfb/mainwindow.h
+++ b/krfb/mainwindow.h
@@ -8,8 +8,8 @@
   version 2 of the License, or (at your option) any later version.
 */

-#ifndef MANAGEINVITATIONSDIALOG_H
-#define MANAGEINVITATIONSDIALOG_H
+#ifndef KRFB_MAINWINDOW_H
+#define KRFB_MAINWINDOW_H

 #include "ui_mainwidget.h"

@@ -22,8 +22,8 @@ class MainWindow : public KXmlGuiWindow
    Q_OBJECT

    public:
-        MainWindow(QWidget *parent = 0);
-        ~MainWindow();
+        explicit MainWindow(QWidget *parent = nullptr);
+        ~MainWindow() override;

    public Q_SLOTS:
        void showConfiguration();
--- a/krfb/org.kde.krfb.appdata.xml
+++ b/krfb/org.kde.krfb.appdata.xml
@@ -4,19 +4,26 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>Krfb</name>
-  <name xml:lang="ast">Krfb</name>
  <name xml:lang="ca">Krfb</name>
  <name xml:lang="ca-valencia">Krfb</name>
  <name xml:lang="cs">Krfb</name>
+  <name xml:lang="da">Krfb</name>
  <name xml:lang="de">Krfb</name>
  <name xml:lang="el">Krfb</name>
  <name xml:lang="en-GB">Krfb</name>
  <name xml:lang="es">Krfb</name>
+  <name xml:lang="fi">Krfb</name>
+  <name xml:lang="fr">Krfb</name>
  <name xml:lang="gl">Krfb</name>
+  <name xml:lang="ia">Krfb</name>
+  <name xml:lang="id">Krfb</name>
  <name xml:lang="it">Krfb</name>
+  <name xml:lang="ko">Krfb</name>
  <name xml:lang="nl">Krfb</name>
  <name xml:lang="pl">Krfb</name>
  <name xml:lang="pt">Krfb</name>
+  <name xml:lang="pt-BR">Krfb</name>
+  <name xml:lang="ru">Krfb</name>
  <name xml:lang="sk">Krfb</name>
  <name xml:lang="sl">Krfb</name>
  <name xml:lang="sr">КРФБ</name>
@@ -28,20 +35,28 @@
  <name xml:lang="uk">Krfb</name>
  <name xml:lang="x-test">xxKrfbxx</name>
  <name xml:lang="zh-CN">Krfb</name>
+  <name xml:lang="zh-TW">Krfb</name>
  <summary>Desktop sharing</summary>
-  <summary xml:lang="ast">Compartición d'escritoriu</summary>
  <summary xml:lang="ca">Compartició de l'escriptori</summary>
  <summary xml:lang="ca-valencia">Compartició de l'escriptori</summary>
  <summary xml:lang="cs">Sdílení pracovní plochy</summary>
+  <summary xml:lang="da">Skrivebordsdeling</summary>
  <summary xml:lang="de">Freigabe der Arbeitsfläche</summary>
  <summary xml:lang="el">Κοινή χρήση επιφάνειας εργασίας</summary>
  <summary xml:lang="en-GB">Desktop sharing</summary>
  <summary xml:lang="es">Compartir el escritorio</summary>
+  <summary xml:lang="fi">Työpöydän jako</summary>
+  <summary xml:lang="fr">Partage de bureau</summary>
  <summary xml:lang="gl">Compartición do escritorio</summary>
+  <summary xml:lang="ia">Compartir de scriptorio</summary>
+  <summary xml:lang="id">Desktop sharing</summary>
  <summary xml:lang="it">Condivisione del desktop</summary>
+  <summary xml:lang="ko">데스크톱 공유</summary>
  <summary xml:lang="nl">Bureaublad delen</summary>
  <summary xml:lang="pl">Współdzielenie pulpitu</summary>
  <summary xml:lang="pt">Partilha do ecrã</summary>
+  <summary xml:lang="pt-BR">Compartilhamento de tela</summary>
+  <summary xml:lang="ru">Общий рабочий стол</summary>
  <summary xml:lang="sk">Zdieľanie pracovnej plochy</summary>
  <summary xml:lang="sl">Souporaba namizja</summary>
  <summary xml:lang="sr">Дељење површи</summary>
@@ -53,19 +68,27 @@
  <summary xml:lang="uk">Спільне користування стільницею</summary>
  <summary xml:lang="x-test">xxDesktop sharingxx</summary>
  <summary xml:lang="zh-CN">桌面共享</summary>
+  <summary xml:lang="zh-TW">桌面分享</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 veure o controlar l'escriptori.</p>
    <p xml:lang="ca-valencia">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 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>
    <p xml:lang="en-GB">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="es">Krfb para compartir el escritorio es una aplicación de servidor que le permite compartir su sesión actual con un usuario de otra máquina, que puede usar un cliente VNC para ver e incluso controlar su escritorio.</p>
-    <p xml:lang="gl">Krfb é un servizo que permite compartir a sesión actual cun usuario que está noutro equipo, que pode usar un cliente VNC para ver ou mesmo controlar o escritorio.</p>
+    <p xml:lang="fi">Krfb-työpöytäjako on palvelinsovellus, jolla voit jakaa nykyisen istuntosi toisen koneen käyttäjälle, joka voi VNC-asiakkaalla nähdä tai jopa hallita työpöytääsi.</p>
+    <p xml:lang="fr">Le partage de bureau Krfb est une application de serveur qui vous permet de partager votre session courante avec un utilisateur sur une autre machine, qui peut utiliser un client VNC pour afficher et même contrôler le bureau.</p>
+    <p xml:lang="gl">Krfb é un aplicativo de servidor que permite compartir a sesión actual cun usuario que está noutro equipo, que pode usar un cliente VNC para ver ou mesmo controlar o escritorio.</p>
+    <p xml:lang="id">Krfb Desktop Sharing adalah aplikasi server yang memungkinkan kamu untuk berbagi sesimu saat ini dengan pengguna di mesin lain, yang bisa menggunakan klien VNC untuk menampilkan atau bahkan mengendalikan desktop.</p>
    <p xml:lang="it">Condivisione del desktop Krfb è un'applicazione server che permette di condividere la sessione attuale con un utente su un'altra macchina, che potrà usare un client VNC per visualizzare ed anche controllare il desktop.</p>
+    <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 프로그램입니다.</p>
    <p xml:lang="nl">Bureaublad delen is een server-applicatie die u in staat stelt uw huidige sessie te delen met een gebruiker op een andere machine, die een VNC-client kan gebruiken om uw bureaublad te bekijken of zelfs te besturen.</p>
    <p xml:lang="pl">Współdzielenie pulpitu Krfb jest aplikacją serwerową, która umożliwia współdzielenie twojej bieżącej sesji z użytkownikiem na innym komputerze, który może użyć klienta VNC do oglądania,a a nawet sterowania twoim pulpitem.</p>
    <p xml:lang="pt">A Partilha de Ecrã Krfb é uma aplicação de servidor que lhe permite partilhar a sua sessão actual com um utilizador noutra máquina, o qual poderá usar um cliente de VNC para ver ou mesmo controlar o ambiente de trabalho.</p>
+    <p xml:lang="pt-BR">Krfb Desktop Sharing é um aplicativo de servidor que lhe permite compartilhar a sua sessão atual com um usuário em outra máquina, que poderá usar um cliente de VNC para ver ou mesmo controlar a máquina.</p>
+    <p xml:lang="ru">Krfb является сервером, который позволяет вам предоставлять доступ к своему текущему сеансу пользователю на другом компьютере, который использует клиент VNC для просмотра или управления вашим рабочим столом.</p>
    <p xml:lang="sk">Krfb je serverová aplikácia, ktorá vám umožní zdieľať vaše aktuálne sedenie s používateľom na inom stroji, ktorý môže používať VNC klienta na pripojenie alebo ovládanie stanice.</p>
    <p xml:lang="sl">Souporaba namizja Krfb je strežniški program, ki vam dovoli, da delite vašo trenutno sejo z uporabnikom na drugem računalniku, ki ima odjemalec VNC. Uporabnik lahko gleda ali celo nadzira namizje.</p>
    <p xml:lang="sr">КРФБ је серверски програм за дељење површи, којим можете да поделите своју текућу сесију са корисником на другој машини. Удаљени корисник може да употреби неки ВНЦ клијент за гледање површи, па чак и управљање њоме.</p>
@@ -77,15 +100,37 @@
    <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>
+    <p xml:lang="zh-TW">Krfb 桌面分享是款伺服器應用程式，它可以將您目前的桌面階段分享給一位於其他主機上的使用者，以讓他能使用 VNC 客戶端檢視、甚至控制您的桌面。</p>
  </description>
-  <url type="homepage">https://www.kde.org</url>
-  <url type="bugtracker">https://bugs.kde.org</url>
+  <url type="homepage">https://userbase.kde.org/Krfb</url>
+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=krfb</url>
  <url type="donation">https://www.kde.org/community/donations</url>
+  <url type="help">https://docs.kde.org/?application=krfb</url>
  <screenshots>
    <screenshot type="default">
-      <image>
-        https://cdn.kde.org/screenshots/krfb/krfb.png
-      </image>
+      <caption>Sharing desktop with Krfb</caption>
+      <caption xml:lang="ca">Compartint l'escriptori amb el Krfb</caption>
+      <caption xml:lang="ca-valencia">Compartint l'escriptori amb el Krfb</caption>
+      <caption xml:lang="cs">Sdílím pracovní plochu pomocí Krfb</caption>
+      <caption xml:lang="de">Freigabe der Arbeitsfläche mit Krfb</caption>
+      <caption xml:lang="en-GB">Sharing desktop with Krfb</caption>
+      <caption xml:lang="es">Compartiendo el escritorio con Krfb</caption>
+      <caption xml:lang="fi">Työpöydän jakaminen Krfb:llä</caption>
+      <caption xml:lang="fr">Partage de bureau grâce à Krfb</caption>
+      <caption xml:lang="gl">Compartindo o escritorio con Krfb</caption>
+      <caption xml:lang="id">Berbagi desktop dengan Krfb</caption>
+      <caption xml:lang="it">Condivisone del desktop con Krfb</caption>
+      <caption xml:lang="nl">Bureaublad delen met Krfb</caption>
+      <caption xml:lang="pl">Udostępnienie pulpitu przy użyciu Krfb</caption>
+      <caption xml:lang="pt">Partilha do ecrã com o Krfb</caption>
+      <caption xml:lang="pt-BR">Compartilhando a área de trabalho com o Krfb</caption>
+      <caption xml:lang="ru">Общий доступ к рабочему столу с использованием Krfb</caption>
+      <caption xml:lang="sv">Dela skrivbord med Krfb</caption>
+      <caption xml:lang="uk">Спільне використання стільниці за допомогою Krfb</caption>
+      <caption xml:lang="x-test">xxSharing desktop with Krfbxx</caption>
+      <caption xml:lang="zh-CN">使用 Krfb 共享桌面</caption>
+      <caption xml:lang="zh-TW">使用 Krfb 分享桌面</caption>
+      <image>https://cdn.kde.org/screenshots/krfb/krfb.png</image>
    </screenshot>
  </screenshots>
  <provides>
--- a/krfb/org.kde.krfb.desktop
+++ b/krfb/org.kde.krfb.desktop
@@ -8,7 +8,6 @@ X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
 Name[ar]=Krfb
-Name[ast]=Krfb
 Name[bg]=Krfb
 Name[bn]=কে-আর-এফ-বি
 Name[br]=Krfb
@@ -34,6 +33,7 @@ Name[hne]=केआरएफबी
 Name[hr]=Krfb
 Name[hu]=Krfb
 Name[ia]=Krfb
+Name[id]=Krfb
 Name[is]=Krfb
 Name[it]=Krfb
 Name[ja]=Krfb
@@ -76,7 +76,6 @@ Name[zh_HK]=Krfb
 Name[zh_TW]=桌面分享_Krfb
 GenericName=Desktop Sharing
 GenericName[ar]=مشاركة سطح المكتب
-GenericName[ast]=Compartición d'escritoriu
 GenericName[bg]=Споделяне на работния плот
 GenericName[bn]=ডেস্কটপ ভাগাভাগি
 GenericName[br]=Rannañ ar vurev
@@ -104,6 +103,7 @@ GenericName[hne]=डेस्कटाप साझेदारी
 GenericName[hr]=Dijeljenje radne površine
 GenericName[hu]=Munkaasztal-megosztás
 GenericName[ia]=Compartir de scriptorio
+GenericName[id]=Desktop Sharing
 GenericName[is]=Skjáborðsmiðlun
 GenericName[it]=Condivisione del desktop
 GenericName[ja]=デスクトップ共有
@@ -147,7 +147,6 @@ GenericName[zh_TW]=桌面分享
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Compartición d'escritoriu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
@@ -174,6 +173,7 @@ Comment[hne]=डेस्कटाप साझेदारी
 Comment[hr]=Dijeljenje radne površine
 Comment[hu]=Munkaasztal-megosztás
 Comment[ia]=Compartir de scriptorio
+Comment[id]=Desktop Sharing
 Comment[is]=Skjáborðamiðlun
 Comment[it]=Condivisione del desktop
 Comment[ja]=デスクトップ共有
--- a/krfb/rfbclient.cpp
+++ b/krfb/rfbclient.cpp
@@ -22,7 +22,7 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "events.h"
-#include <QtCore/QSocketNotifier>
+#include <QSocketNotifier>
 #include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()
@@ -43,7 +43,7 @@ struct RfbClient::Private
 RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
    : QObject(parent), d(new Private(client))
 {
-    d->remoteAddressString = peerAddress(d->client->sock) + ":" +
+    d->remoteAddressString = peerAddress(d->client->sock) + ':' +
                             QString::number(peerPort(d->client->sock));

    d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
@@ -197,7 +197,7 @@ void PendingRfbClient::reject()
    rfbCloseClient(m_rfbClient);
    rfbClientConnectionGone(m_rfbClient);

-    Q_EMIT finished(NULL);
+    Q_EMIT finished(nullptr);
    deleteLater();
 }

@@ -205,7 +205,7 @@ bool PendingRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
    Q_UNUSED(encryptedPassword);

-    return m_rfbClient->screen->authPasswdData == (void*)0;
+    return m_rfbClient->screen->authPasswdData == (void*)nullptr;
 }

 bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QByteArray& encryptedPassword) const
@@ -228,5 +228,3 @@ bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QB
    rfbEncryptBytes(challenge, passwd);
    return memcmp(challenge, encryptedPassword, encryptedPassword.size()) == 0;
 }
-
-#include "rfbclient.moc"
--- a/krfb/rfbclient.h
+++ b/krfb/rfbclient.h
@@ -21,7 +21,7 @@
 #define RFBCLIENT_H

 #include "rfb.h"
-#include <QtCore/QObject>
+#include <QObject>

 class RfbClient : public QObject
 {
@@ -29,8 +29,8 @@ class RfbClient : public QObject
    Q_PROPERTY(bool controlEnabled READ controlEnabled WRITE setControlEnabled NOTIFY controlEnabledChanged)
    Q_PROPERTY(bool onHold READ isOnHold WRITE setOnHold NOTIFY holdStatusChanged)
 public:
-    RfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~RfbClient();
+    explicit RfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~RfbClient() override;

    /** Returns a name for the client, to be shown to the user */
    virtual QString name() const;
@@ -73,8 +73,8 @@ class PendingRfbClient : public QObject
 {
    Q_OBJECT
 public:
-    PendingRfbClient(rfbClientPtr client, QObject *parent = 0);
-    virtual ~PendingRfbClient();
+    explicit PendingRfbClient(rfbClientPtr client, QObject *parent = nullptr);
+    ~PendingRfbClient() override;

 Q_SIGNALS:
    void finished(RfbClient *client);
@@ -97,7 +97,7 @@ protected:
    virtual bool checkPassword(const QByteArray & encryptedPassword);

    /** This method checks if the \a encryptedPassword that was sent from the remote
-     * user matches the \a password that you have specified localy to be the password
+     * user matches the \a password that you have specified locally to be the password
     * for this connection. This assumes that the standard VNC authentication mechanism
     * is used. Returns true if the password matches or false otherwise.
     */
--- a/krfb/rfbserver.cpp
+++ b/krfb/rfbserver.cpp
@@ -19,9 +19,10 @@
 */
 #include "rfbserver.h"
 #include "rfbservermanager.h"
-#include <QtCore/QSocketNotifier>
+#include <QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
+#include <QPointer>
 #include <QDebug>

 struct RfbServer::Private
@@ -30,7 +31,8 @@ struct RfbServer::Private
    int listeningPort;
    bool passwordRequired;
    rfbScreenInfoPtr screen;
-    QSocketNotifier *notifier;
+    QPointer<QSocketNotifier> ipv4notifier;
+    QPointer<QSocketNotifier> ipv6notifier;
 };

 RfbServer::RfbServer(QObject *parent)
@@ -39,8 +41,7 @@ RfbServer::RfbServer(QObject *parent)
    d->listeningAddress = "0.0.0.0";
    d->listeningPort = 0;
    d->passwordRequired = true;
-    d->screen = NULL;
-    d->notifier = NULL;
+    d->screen = nullptr;

    RfbServerManager::instance()->registerServer(this);
 }
@@ -120,7 +121,7 @@ bool RfbServer::start()
    if (passwordRequired()) {
        d->screen->authPasswdData = (void *)1;
    } else {
-        d->screen->authPasswdData = (void *)0;
+        d->screen->authPasswdData = (void *)nullptr;
    }

    qDebug() << "Starting server. Listen port:" << listeningPort()
@@ -135,9 +136,13 @@ bool RfbServer::start()
        return false;
    };

-    d->notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
-    d->notifier->setEnabled(true);
-    connect(d->notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    d->ipv4notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
+    connect(d->ipv4notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    if (d->screen->listen6Sock > 0) {
+        // we're also listening on additional IPv6 socket, get events from there
+        d->ipv6notifier = new QSocketNotifier(d->screen->listen6Sock, QSocketNotifier::Read, this);
+        connect(d->ipv6notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    }
    connect(QApplication::clipboard(), &QClipboard::dataChanged,
            this, &RfbServer::krfbSendServerCutText);

@@ -148,10 +153,11 @@ void RfbServer::stop()
 {
    if (d->screen) {
        rfbShutdownServer(d->screen, true);
-        if (d->notifier) {
-            d->notifier->setEnabled(false);
-            d->notifier->deleteLater();
-            d->notifier = NULL;
+        for (auto notifier : {d->ipv4notifier, d->ipv6notifier}) {
+            if (notifier) {
+                notifier->setEnabled(false);
+                notifier->deleteLater();
+            }
        }
    }
 }
@@ -187,7 +193,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int

    /* Inform all clients about this cursor movement. */
    iterator = rfbGetClientIterator(screen);
-    while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
+    while ((cl = rfbClientIteratorNext(iterator)) != nullptr) {
        cl->cursorWasMoved = true;
    }
    rfbReleaseClientIterator(iterator);
@@ -201,7 +207,7 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
 void RfbServer::updateCursorPosition(const QPoint & position)
 {
    if (d->screen) {
-        krfb_rfbSetCursorPosition(d->screen, NULL, position.x(), position.y());
+        krfb_rfbSetCursorPosition(d->screen, nullptr, position.x(), position.y());
    }
 }

@@ -278,5 +284,3 @@ void RfbServer::clipboardHook(char *str, int len, rfbClientPtr /*cl*/)
 {
    QApplication::clipboard()->setText(QString::fromLocal8Bit(str,len));
 }
-
-#include "rfbserver.moc"
--- a/krfb/rfbserver.h
+++ b/krfb/rfbserver.h
@@ -22,14 +22,14 @@

 #include "rfb.h"
 #include "rfbclient.h"
-#include <QtCore/QRect>
+#include <QRect>

 class RfbServer : public QObject
 {
    Q_OBJECT
 public:
-    RfbServer(QObject *parent = 0);
-    virtual ~RfbServer();
+    explicit RfbServer(QObject *parent = nullptr);
+    ~RfbServer() override;

    QByteArray listeningAddress() const;
    int listeningPort() const;
--- a/krfb/rfbservermanager.cpp
+++ b/krfb/rfbservermanager.cpp
@@ -24,11 +24,11 @@
 #include "framebuffermanager.h"
 #include "sockethelpers.h"
 #include "krfbconfig.h"
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QGlobalStatic>
-#include <QtNetwork/QHostInfo>
+#include <QHostInfo>
 #include <QDebug>

 #include <KLocalizedString>
@@ -176,7 +176,7 @@ void RfbServerManager::unregisterServer(RfbServer* server)

 rfbScreenInfoPtr RfbServerManager::newScreen()
 {
-    rfbScreenInfoPtr screen = NULL;
+    rfbScreenInfoPtr screen = nullptr;

    if (!d->fb.isNull()) {
        int w = d->fb->width();
@@ -192,7 +192,7 @@ rfbScreenInfoPtr RfbServerManager::newScreen()

        rfbLogEnable(0);

-        screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp);
+        screen = rfbGetScreen(nullptr, nullptr, w, h, 8, 3, bpp);
        screen->paddedWidthInBytes = d->fb->paddedWidth();
        d->fb->getServerFormat(screen->serverFormat);
        screen->frameBuffer = d->fb->data();
@@ -232,5 +232,3 @@ void RfbServerManager::removeClient(RfbClient* cc)

    Q_EMIT clientDisconnected(cc);
 }
-
-#include "rfbservermanager.moc"
--- a/krfb/rfbservermanager.h
+++ b/krfb/rfbservermanager.h
@@ -21,7 +21,7 @@
 #define RFBSERVERMANAGER_H

 #include "rfb.h"
-#include <QtCore/QObject>
+#include <QObject>

 class RfbClient;
 struct RfbServerManagerStatic;
@@ -52,7 +52,7 @@ private:
    void removeClient(RfbClient *cc);

    RfbServerManager();
-    virtual ~RfbServerManager();
+    ~RfbServerManager() override;
    Q_DISABLE_COPY(RfbServerManager)

    friend class RfbServer;
--- a/krfb/sockethelpers.h
+++ b/krfb/sockethelpers.h
@@ -20,7 +20,10 @@
   Boston, MA 02110-1301, USA.
 */

-#include <QtCore/QString>
+#ifndef SOCKETHELPERS_H
+#define SOCKETHELPERS_H
+
+#include <QString>

 QString peerAddress(int sock);
 unsigned short peerPort(int sock);
@@ -28,3 +31,4 @@ unsigned short peerPort(int sock);
 QString localAddress(int sock);
 unsigned short localPort(int sock);

+#endif
--- a/krfb/trayicon.cpp
+++ b/krfb/trayicon.cpp
@@ -68,7 +68,7 @@ ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)
        QObject::connect(client, &RfbClient::controlEnabledChanged,
                         m_enableControlAction, &KToggleAction::setChecked);
    } else {
-        m_enableControlAction = NULL;
+        m_enableControlAction = nullptr;
    }

    m_separator = m_menu->insertSeparator(before);
@@ -143,5 +143,3 @@ void TrayIcon::showAbout()
    KHelpMenu menu;
    menu.aboutApplication();
 }
-
-#include "trayicon.moc"
--- a/krfb/trayicon.h
+++ b/krfb/trayicon.h
@@ -32,7 +32,7 @@ class TrayIcon : public KStatusNotifierItem
 {
    Q_OBJECT
 public:
-    TrayIcon(QWidget *mainWindow);
+    explicit TrayIcon(QWidget *mainWindow);

 public Q_SLOTS:
    void onClientConnected(RfbClient *client);
Author	SHA1	Message	Date
Christoph Feck	fc2642b380	GIT_SILENT Upgrade KDE Applications version to 18.12.3.	2019-02-28 02:46:23 +01:00
l10n daemon script	7191a8df2c	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"	2019-02-15 09:18:39 +01:00
Christoph Feck	4510583d00	GIT_SILENT Upgrade KDE Applications version to 18.12.2.	2019-02-03 05:53:23 +01:00
l10n daemon script	3e293ec140	GIT_SILENT made messages (after extraction)	2019-01-26 07:17:35 +01:00
l10n daemon script	22cc09f25c	GIT_SILENT made messages (after extraction)	2019-01-20 07:41:20 +01:00
l10n daemon script	0039860a54	GIT_SILENT made messages (after extraction)	2019-01-19 07:23:30 +01:00
l10n daemon script	a283ab43e7	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"	2019-01-06 08:42:16 +01:00
l10n daemon script	5df8bc9b61	GIT_SILENT made messages (after extraction)	2019-01-05 07:22:22 +01:00
Christoph Feck	2b58344ef2	GIT_SILENT Upgrade KDE Applications version to 18.12.1.	2019-01-03 23:38:54 +01:00
l10n daemon script	72d8c5255c	GIT_SILENT made messages (after extraction)	2018-12-21 07:18:00 +01:00
l10n daemon script	133d4785a2	GIT_SILENT made messages (after extraction)	2018-12-16 07:18:04 +01:00
l10n daemon script	1b24e066b8	GIT_SILENT made messages (after extraction)	2018-12-12 07:56:04 +01:00
Christoph Feck	3494d1490f	GIT_SILENT Upgrade KDE Applications version to 18.12.0.	2018-12-05 00:38:29 +01:00
l10n daemon script	26c7d36c9a	GIT_SILENT made messages (after extraction)	2018-12-03 07:17:03 +01:00
l10n daemon script	a9ad73c475	GIT_SILENT made messages (after extraction)	2018-11-29 07:14:27 +01:00
Christoph Feck	b313ecfc9d	GIT_SILENT Upgrade KDE Applications version to 18.11.90.	2018-11-26 14:43:27 +01:00
l10n daemon script	2b1a4d592d	GIT_SILENT made messages (after extraction)	2018-11-21 07:24:45 +01:00
l10n daemon script	1ae0f9caf0	GIT_SILENT made messages (after extraction)	2018-11-18 06:49:58 +01:00
l10n daemon script	c6ac49554c	GIT_SILENT made messages (after extraction)	2018-11-16 06:57:52 +01:00
l10n daemon script	3e6c7bfc35	GIT_SILENT made messages (after extraction)	2018-11-14 06:58:46 +01:00
l10n daemon script	30fd99be9c	GIT_SILENT made messages (after extraction)	2018-11-12 06:54:43 +01:00
Albert Astals Cid	0b3cb3c3bb	GIT_SILENT Upgrade KDE Applications version to 18.11.80.	2018-11-09 23:26:38 +01:00
l10n daemon script	91c62af9bd	GIT_SILENT made messages (after extraction)	2018-11-09 03:59:25 +01:00
Yuri Chornoivan	bb9bf0bfc7	Improve AppData file a bit	2018-11-07 22:22:02 +02:00
l10n daemon script	258e8bd22b	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"	2018-10-24 06:00:33 +02:00
Yuri Chornoivan	c5fc5fc68e	Fix minor EBN issues and typos	2018-10-14 20:54:39 +03:00
l10n daemon script	54fd606e82	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"	2018-10-10 06:40:00 +02:00
l10n daemon script	9d44beac84	GIT_SILENT made messages (after extraction)	2018-10-10 04:10:36 +02:00
l10n daemon script	438bddcb27	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"	2018-10-05 05:55:56 +02:00
l10n daemon script	68dafe3f24	GIT_SILENT made messages (after extraction)	2018-07-29 03:36:33 +02:00
Friedrich W. H. Kossebau	d1273a8f56	Remove unused plugin metadata desktop files Plugins had been converted to direct JSON metadata in `10176b9e01`	2018-07-17 16:52:20 +02:00
Friedrich W. H. Kossebau	6373c44b8d	Remove unneeded "Encoding" entry from plugin metadata	2018-07-17 16:49:37 +02:00
Friedrich W. H. Kossebau	6368bdf25b	Remove module prefixes from Qt includes	2018-07-17 14:48:28 +02:00
Friedrich W. H. Kossebau	b72e478df0	Use more explicit	2018-07-17 14:45:09 +02:00
Friedrich W. H. Kossebau	b1df09d2bf	Consistently use override	2018-07-17 14:40:23 +02:00
Friedrich W. H. Kossebau	da36f0a7fb	Consistently use nullptr	2018-07-17 14:38:06 +02:00
Friedrich W. H. Kossebau	be70800a74	Actually use the set QT_MIN_VERSION	2018-07-17 14:30:06 +02:00
Friedrich W. H. Kossebau	798fc5c2e6	Remove unneeded moc includes	2018-07-17 14:27:20 +02:00
Friedrich W. H. Kossebau	26a70c411a	Remove usage of dead QT_USE_FAST_CONCATENATION Dropped pre-Qt5	2018-07-17 14:21:22 +02:00
Albert Astals Cid	0945680770	GIT_SILENT Upgrade KDE Applications version to 18.11.70.	2018-07-16 20:07:13 +02:00
l10n daemon script	39a99107ce	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"	2018-06-03 05:24:30 +02:00
Oleg Chernovskiy	fc3e3951a4	Fix IPv6 connectivity Summary: IPv6 is supported by LibVNCServer but for compatibility reasons its socket is backed by another file descriptor. This commit adds tracking IPv6 listen socket in the same way we now track IPv4 one. Test Plan: Tested by connecting through ::1 and fe80:: addresses Reviewers: #plasma, #kde_applications, alexeymin Reviewed By: alexeymin Subscribers: ltoscano, alexeymin, apol, aacid Differential Revision: https://phabricator.kde.org/D13209	2018-05-30 20:59:21 +03:00
l10n daemon script	6fc934b0ef	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"	2018-04-29 05:24:29 +02:00
l10n daemon script	788d64927d	GIT_SILENT made messages (after extraction)	2018-04-19 03:34:43 +02:00
Albert Astals Cid	d0b0740066	GIT_SILENT Upgrade KDE Applications version to 18.07.70.	2018-03-19 23:57:11 +01:00
l10n daemon script	438fc15a64	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"	2018-03-11 05:23:56 +01:00
l10n daemon script	8167a114da	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"	2018-03-03 05:29:30 +01:00
l10n daemon script	736c598c43	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"	2018-01-29 05:04:43 +01:00
Laurent Montel	822b8c41b9	Remove obsolete reviewboardrc file	2018-01-05 13:55:37 +01:00
l10n daemon script	2fee3471f5	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"	2017-12-20 07:05:07 +01:00
l10n daemon script	4ff990b6ea	GIT_SILENT made messages (after extraction)	2017-12-20 05:22:26 +01:00
l10n daemon script	9c65f423b5	GIT_SILENT made messages (after extraction)	2017-12-13 05:12:50 +01:00
l10n daemon script	bd26204f96	GIT_SILENT made messages (after extraction)	2017-12-09 03:01:49 +01:00
l10n daemon script	0b9f16cfc7	GIT_SILENT made messages (after extraction)	2017-11-23 02:59:37 +01:00
l10n daemon script	8397b41027	GIT_SILENT made messages (after extraction)	2017-11-20 03:02:38 +01:00
Albert Astals Cid	709c207af8	GIT_SILENT Upgrade KDE Applications version to 18.03.70.	2017-11-13 09:11:59 +01:00
Aleix Pol	2f34058010	Include a png of the icon for compatibility	2017-11-03 00:49:35 +01:00
Aleix Pol	9b2cbaec6f	Include the icon in krfb together with the application	2017-11-03 00:39:40 +01:00
l10n daemon script	25a0e089ef	GIT_SILENT made messages (after extraction)	2017-10-27 03:11:47 +02:00
l10n daemon script	004c84a849	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"	2017-10-12 04:56:47 +02:00
l10n daemon script	4473e12434	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"	2017-10-11 08:47:07 +02:00
Alexey Min	bcec53db13	Merge branch 'arcpatch-D7658'	2017-09-10 13:55:31 +05:00
Alexey Min	dab8b421eb	Change version to match KDE Applications (17.11.70) Summary: Previously krfb had version set to 5.0. This is misleading. Now, do the same as other standard KDE apps, like ark or dolphin: use KDE_APPLICATIONS_VERSION_MAJOR, KDE_APPLICATIONS_VERSION_MINOR, etc. This page: https://www.kde.org/applications/system/krfb has a link to report a bug: https://bugs.kde.org/enter_bug.cgi?format=guided&product=krfb Versions in bugzilla have 17.xx.xx, so "About..." window should match. cmake: Set version in project(); use ecm_setup_version() call Inspired by commit in Ark: cffecfbfffd22bc0bbe451ed8d74f3b6da113c6f Test Plan: Compile, run. Make sure that Help -> About Desktop Sharing displays the correct version. Reviewers: aacid, ltoscano Tags: #kde_applications Differential Revision: https://phabricator.kde.org/D7658	2017-09-10 13:51:39 +05:00
l10n daemon script	69d278caa8	GIT_SILENT made messages (after extraction)	2017-09-05 03:04:44 +02:00
l10n daemon script	0ac20f797c	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"	2017-09-04 04:42:31 +02:00
l10n daemon script	a66fc2d2b8	GIT_SILENT made messages (after extraction)	2017-09-04 03:05:52 +02:00
l10n daemon script	011ac5633f	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"	2017-08-14 04:58:49 +02:00
l10n daemon script	90c332ddcf	GIT_SILENT made messages (after extraction)	2017-08-10 03:28:32 +02:00
Alexey Min	52fb6655a1	Merge branch 'Applications/17.08'	2017-08-08 06:50:48 +05:00
Alexey Min	44ae70244d	Add .arcconfig	2017-08-08 06:49:42 +05:00