GIT_SILENT made messages (after extraction)

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 · 2017-07-04 05:16:00 +02:00 · 2017-06-20 05:48:45 +02:00 · 2017-04-09 05:12:08 +02:00 · 2017-04-03 04:24:46 +02:00 · 2017-03-24 00:20:12 +01:00
64 changed files with 934 additions and 1581 deletions
--- a/.reviewboardrc
+++ b/.reviewboardrc
@@ -0,0 +1,4 @@
+REPOSITORY = "git://anongit.kde.org/krfb"
+REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
+TARGET_PEOPLE = "whiting"
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,32 +1,44 @@
+cmake_minimum_required(VERSION 2.8.12)
+
 project(krfb)

-if(NOT INSIDE_KDENETWORK)
-    message("Not building inside KDENetwork, loading KDE CMake Macros.")
+include(FeatureSummary)
+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets X11Extras)

-    find_package(KDE4 REQUIRED)
+find_package(ECM 1.7.0 NO_MODULE REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

-    include(KDE4Defaults)
-    include(MacroLibrary)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+include(ECMInstallIcons)
+include(ECMAddAppIcon)

-    include(CheckIncludeFile)
-    include(CheckIncludeFiles)
-    include(CheckSymbolExists)
-    include(CheckFunctionExists)
-    include(CheckLibraryExists)
-    include(CheckPrototypeExists)
-    include(CheckTypeSize)
+find_package(KF5 REQUIRED COMPONENTS
+    I18n
+    Completion
+    Config
+    CoreAddons
+    Crash
+    DBusAddons
+    DNSSD
+    DocTools
+    Notifications
+    Wallet
+    WidgetsAddons
+    XmlGui
+)

-    set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
-    if(WIN32)
-       set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
-       set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
-    endif(WIN32)
-    add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
-    add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-    include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-endif(NOT INSIDE_KDENETWORK)
+find_package(X11 REQUIRED)
+
+if(WIN32)
+    set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
+    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN32_INCLUDES})
+endif(WIN32)
+add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )

-set(IS_KTP_INTERNAL_MODULE TRUE)
 set(CMAKE_MODULE_PATH
    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
    ${CMAKE_MODULE_PATH}
@@ -34,14 +46,16 @@ set(CMAKE_MODULE_PATH

 find_package(LibVNCServer REQUIRED)

-macro_optional_find_package(TelepathyQt4)
-macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.")
-
-macro_optional_find_package(KTp)
-macro_log_feature(KTP_FOUND "KTP" "KDE Telepathy" "https://projects.kde.org/projects/extragear/network/telepathy" FALSE "" "Needed to build KDE IM Contacts Display in KRFB.")
-
-macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE)
-macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
+if (HAVE_XDAMAGE)
+set(X11_Xdamage_FOUND 1)
+else()
+set(X11_Xdamage_FOUND 0)
+endif()
+if (HAVE_XSHM)
+set(X11_XShm_FOUND 1)
+else()
+set(X11_XShm_FOUND 0)
+endif()

 include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
                     "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
@@ -58,6 +72,4 @@ add_subdirectory(krfb)
 add_subdirectory(framebuffers)
 add_subdirectory(doc)

-if (NOT INSIDE_KDENETWORK)
-    macro_display_feature_log()
-endif ()
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- a/cmake/modules/FindKTp.cmake
+++ b/cmake/modules/FindKTp.cmake
@@ -1,38 +0,0 @@
-# Try to find the KTp library
-# KTP_FOUND
-# KTP_INCLUDE_DIR
-# KTP_LIBRARIES
-# KTP_MODELS_LIBRARIES
-# KTP_WIDGETS_LIBRARIES
-
-# Copyright (c) 2011, Dario Freddi <drf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IS_KTP_INTERNAL_MODULE)
-   message (FATAL_ERROR "KTp can be used just from internal components at this time")
-endif (NOT IS_KTP_INTERNAL_MODULE)
-
-SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
-if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-  # Already in cache, be silent
-  set(KTP_FIND_QUIETLY TRUE)
-endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-
-find_path(KTP_INCLUDE_DIR
-  NAMES KTp/presence.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
-find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
-find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
-                                  KTP_LIBRARIES
-                                  KTP_MODELS_LIBRARIES
-                                  KTP_INCLUDE_DIR)
-
-mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)
--- a/cmake/modules/FindLibVNCServer.cmake
+++ b/cmake/modules/FindLibVNCServer.cmake
@@ -6,7 +6,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

-INCLUDE(CheckPointerMember)
+INCLUDE(CheckStructHasMember)

 IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
    # Already in cache, be silent
@@ -25,7 +25,7 @@ FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)

 IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
   SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
-   CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
+   CHECK_STRUCT_HAS_MEMBER("struct _rfbClient" GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
 ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)

 IF (LIBVNCSERVER_FOUND)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,2 +1,2 @@
 ########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krfb)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krfb)
--- a/doc/configuration_network.png
+++ b/doc/configuration_network.png
--- a/doc/configuration_security.png
+++ b/doc/configuration_security.png
--- a/doc/connection.png
+++ b/doc/connection.png
--- a/doc/email_invitation.png
+++ b/doc/email_invitation.png
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1,22 +1,11 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&krfb;">
-  <!ENTITY package "kdenetwork">
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English 
-                                     original documentation, change 
-                                     the language here -->
-    
-  <!-- Do not define any other entities; instead, use the entities
-       from entities/general.entities and $LANG/user.entities. -->
+  <!ENTITY % English "INCLUDE">
 ]>
-<!-- Based on kdoctemplate v0.9 January 10 2003 -->

 <book id="krfb" lang="&language;">

-<!-- This header contains all of the meta-information for the document such
-as Authors, publish date, the abstract, and Keywords -->
-
 <bookinfo>
 <title>The &krfb; Handbook</title>

@@ -32,21 +21,11 @@ as Authors, publish date, the abstract, and Keywords -->
 <year>2003</year>
 <holder>&Brad.Hards;</holder>
 </copyright>
-<!-- Translators: put here the copyright notice of the translation -->

 <legalnotice>&FDLNotice;</legalnotice>

-<!-- Date and version information of the documentation
-Don't forget to include this last date and this last revision number, we
-need them for translation coordination !
-Please respect the format of the date (YYYY-MM-DD) and of the version
-(V.MM.LL), it could be used by automation scripts.
-Do NOT change these in the translation. -->
-
-<date>2013-06-19</date>
-<releaseinfo>&kde; 4.11</releaseinfo>
-
-<!-- Abstract about this handbook -->
+<date>2016-07-25</date>
+<releaseinfo>5.0 (Applications 16.08)</releaseinfo>

 <abstract>
 <para>
@@ -56,10 +35,6 @@ view or even control the desktop.
 </para>
 </abstract>

-<!-- This is a set of Keywords for indexing by search engines.
-Please at least include KDE, the KDE package it is in, the name
- of your application, and a few relevant keywords. -->
-
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdenetwork</keyword>
@@ -75,23 +50,9 @@ Please at least include KDE, the KDE package it is in, the name

 </bookinfo>

-<!-- The contents of the documentation begin here.  Label
-each chapter so with the id attribute. This is necessary for two reasons: it
-allows you to easily reference the chapter from other chapters of your
-document, and if there is no ID, the name of the generated HTML files will vary
-from time to time making it hard to manage for maintainers and for the CVS
-system. Any chapter labelled (OPTIONAL) may be left out at the author's
-discretion. Other chapters should not be left out in order to maintain a
-consistent documentation style across all KDE apps. -->
-
 <chapter id="introduction">
 <title>Introduction</title>

-<!-- The introduction chapter contains a brief introduction for the
-application that explains what it does and where to report
-problems. Basically a long version of the abstract.  Don't include a
-revision history. (see installation appendix comment) -->
-
 <para>
 &krfb; is a server application that allows you to share your current
 session with a user on another machine, who can use a <acronym>VNC</acronym> client to
@@ -165,10 +126,8 @@ use &krfb; over other links, but performance is unlikely to be as good.
 <chapter id="using-krfb">
 <title>Using &krfb;</title>

-<!-- This chapter should tell the user how to use your app. You should use as
-many sections (Chapter, Sect1, Sect3, etc...) as is necessary to fully document
-your application. -->
-
+<sect1 id="main-windw">
+<title>&krfb; Main Window</title>
 <para>
 It is very easy to use &krfb; - it has a simple interface, as shown in
 the screenshot below.
@@ -189,64 +148,69 @@ the screenshot below.
 </para>

 <para>
-When you want to allow someone to access your desktop, you can create
-an personal invitation using the <guibutton>New Personal
-Invitation...</guibutton> button, which will bring up a window
-containing the information needed to access your desktop. An example
-is shown below.
+When you want to allow someone to access your desktop, you have to
+enable the checkbox <guilabel>Enable Desktop Sharing</guilabel>,
+which will start the server.
+</para>
+
+<sect2 id="connection-details">
+<title>Connection Details</title>
+
+<para>
+The <guilabel>Address</guilabel> contains the address of your
+computer and the port number, separated by a colon.
+The address is just a hint - you can use any address that can
+reach your computer. &krfb; tries to guess your address from your
+network configuration, but does not always succeed in doing so.
+If your computer is behind a firewall it may have a different
+address or be unreachable for other computers.
+</para>
+<para>
+You can change the port on the <guilabel>Network</guilabel>
+page in the configuration dialog.
+</para>
+<para>
+The next field is prefilled with an automatically generated password.
+Click in the icon at the right of the field to change the password.
+</para>
+</sect2>
+
+<sect2 id="unattended-access">
+<title>Unattended Access</title>
+
+<para>
+Any remote user with the desktop sharing password will have to be authenticated.
+If unattended access is activated, and the remote user provides the password
+for unattended mode, desktop sharing access will be granted without explicit
+confirmation.
+</para>
+<para>
+By default the password for this mode is empty, to change that click on
+the button and enter a password.
+</para>
+<para>
+If unattended access is allowed, then you should probably specify a
+password.
 </para>

 <para>
-<screenshot>
-<screeninfo>Example &krfb; personal invitation</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="personal_invitation.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Example &krfb; personal invitation</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
+If the machine is a server and you are using &krfb; for remote
+administration, you probably want to use unattended access.
 </para>

-<para>
-To increase security, the invitation is only valid for an
-hour after it is created, and of course the person connecting has to
-have the correct password. 
-</para>
+</sect2>
+
+<sect2 id="transfer-login-information">
+<title>Transfer Login Information</title>

 <para>
-Since you may want to invite someone to access your desktop by email,
-&krfb; can create invitations as email messages. You can create such
-an invitation using the <guibutton>New Email Invitation...</guibutton>
-button on the &krfb; main window. This will usually bring up an email
-message that looks like the following, ready for you to type in the
-email address of the person you are sending the invitation to.
-</para>
-
-<para>
-<screenshot>
-<screeninfo>Example &krfb; email invitation</screeninfo>
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="email_invitation.png" format="PNG"/>
-	  </imageobject>
-	  <textobject>
-	    <phrase>Example &krfb; email invitation</phrase>
-	  </textobject>
-	</mediaobject>
-</screenshot>
-</para>
-
-<warning>
-<para>
-&krfb; will warn you about the security implications of sending this
-information across an insecure link. You must heed those warnings.
+&krfb; has no invitation feature any more as in previous versions.
+So you have to transfer the login information yourself using email
+or a personal invitation.
 </para>
 <para>
 If you cannot encrypt the email (or otherwise secure the link),
-sending invitations by email is a very serious security risk, since
+sending a password by email is a very serious security risk, since
 anyone can read the password and address from the email as it passes
 over the network. This means that they can potentially take control of
 your machine.
@@ -255,33 +219,32 @@ your machine.
 If you cannot encrypt the email message, it may be better to use a
 personal invitation, telephone the person you are giving access to,
 verify the identity of that person, and provide the required
-invitation information that way.
+information that way.
 </para>
-</warning>
-
-<sect1 id="krfb-managing-invitations">
-<title>Managing &krfb; invitations</title>

+<note>
 <para>
-Having created an invitation (either a personal invitation or one that
-was sent by email), &krfb; main window allows you to delete existing
-invitations. To just delete one of the invitations, select it with the
-mouse (it should become highlighted), and then select
-the <guibutton>Delete</guibutton>. To delete all invitations, just
-select the <guibutton>Delete All</guibutton> button.
+&krfb; uses the normal <acronym>RFB</acronym> password system, which does not transfer
+your password in the clear across the network. Instead, it uses a
+challenge-response system. This is reasonably secure, as long as the
+password is securely guarded.
 </para>
+</note>

-</sect1>
+</sect2>

-<sect1 id="krfb-qit">
+<sect2 id="krfb-qqit">
 <title>Quit &krfb;</title>

 <para>
-If you close the &krfb; main window the server keeps running, which is
-indicated by an icon in the system tray.
-To stop &krfb; right click on the  icon in the systems tray and select
+If you close the &krfb; main window by clicking on the window close icon or using the
+shortcut <keycombo action="simul">&Alt;<keycap>F4</keycap></keycombo> the server
+keeps running, which is indicated by an icon in the system tray.
+To stop &krfb; either use <menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>
+in the main window or right click on the icon in the system tray and select
 <guimenuitem>Quit</guimenuitem>.
 </para>
+</sect2>

 </sect1>

@@ -290,7 +253,7 @@ To stop &krfb; right click on the  icon in the systems tray and select
 <para>
 In addition to the main &krfb; interface shown and described above, 
 you can also control &krfb;  using the
-<guibutton>Configure...</guibutton> on the &krfb; main window. The &krfb;
+<guimenuitem>Configure...</guimenuitem> on the &krfb; main window. The &krfb;
 configuration has two pages, as shown in the screenshot below: 
 </para>

@@ -314,8 +277,8 @@ The <guilabel>Network</guilabel> page allows control over the port that
 </para>

 <para>
-The <guilabel>Announce service on the network</guilabel> checkbox
-controls whether &krfb; announces invitations over the network using
+The <guilabel>Announce service on the local network</guilabel> checkbox
+controls whether &krfb; announces the service over the local network using
 Service Location Protocol. This is normally a good idea, but only
 works really well with a Service Location Protocol aware client, such
 as &krdc;.
@@ -323,8 +286,8 @@ as &krdc;.

 <para>
 If you select the <guilabel>Use default port</guilabel> checkbox, 
-then &krfb; will locate a suitable port, and invitations will match 
-this port. If you deselect this checkbox, you can specify a particular
+then &krfb; will locate a suitable port.
+If you deselect this checkbox, you can specify a particular
 port. Specifying a particular port may be useful if you are using
 port-forwarding on the firewall. Note that if Service Location
 Protocol is turned on, this will automatically deal with identifying
@@ -332,8 +295,8 @@ the correct port.
 </para>

 <para>
-The <guilabel>Security</guilabel> page allows you configure settings
-related to access to the &krfb; server.
+The <guilabel>Security</guilabel> page allows you to configure whether the
+person connecting to the &krfb; server can control the desktop, or only view.
 </para>

 <para>
@@ -350,41 +313,15 @@ related to access to the &krfb; server.
 </screenshot>
 </para>

-<para>
-The <guilabel>Allow uninvited connections</guilabel> check box controls
-whether &krfb; allows connection without an invitation. If uninvited
-connections are allowed, then you should probably specify a
-password. You can also use the check boxes here to choose whether you
-have to confirm the connection before it proceeds, and whether the
-person connecting can control the desktop, or only view.
-</para>
-
-<para>
-If the machine is a workstation, and you choose to allow uninvited
-connections, you probably want to select the <guilabel>Ask 
-before accepting connections </guilabel>. Conversely, if the
-machine is a server and you are using &krfb; for remote
-administration, you probably want to deselect this option.
-</para>
-
-<note>
-<para>
-&krfb; uses the normal <acronym>RFB</acronym> password system, which does not transfer
-your password in the clear across the network. Instead, it uses a
-challenge-response system. This is reasonably secure, as long as the
-password is securely guarded.
-</para>
-</note>
-
 </sect1>

 <sect1 id="krfb-connection">
-<title>What happens when someone connects to &krfb;</title>
+<title>Connecting to &krfb;</title>

 <para>
 When someone connects to &krfb; on your machine, you will get a pop-up
 notification that looks like the following screenshot, unless you are
-accepting uninvited connections without warning.
+accepting unattended access without confirmation.
 </para>
 <para>
 <screenshot>
@@ -402,8 +339,8 @@ accepting uninvited connections without warning.

 <para>
 If you <guibutton>Accept Connection</guibutton>, the client can
-proceed to authenticate (which requires the correct password for a
-personal invitation or email invitation). If you <guibutton>Refuse
+proceed to authenticate, which requires the correct password for a
+login. If you <guibutton>Refuse
 Connection</guibutton>, then the attempt to connect will be terminated.
 </para>

@@ -413,23 +350,11 @@ mouse</guilabel> check box determines whether this client can only
 observe, or can take control of your machine. 
 </para>

-<para>
-If the client connection is successful, and used the password from a
-personal invitation or email invitation, then that invitation is
-deleted and cannot be used again. You will also get a small pop-up
-window in the dock, that shows that the connection has been made.
-</para>
-
 </sect1>
 </chapter>

 <chapter id="credits">

-<!-- Include credits for the programmers, documentation writers, and
-contributors here. The license for your software should then be included below
-the credits with a reference to the appropriate license file included in the KDE
-distribution. -->
-
 <title>Credits and License</title>

 <para>
@@ -458,33 +383,6 @@ Documentation Copyright &copy; 2003 &Brad.Hards; &Brad.Hards.mail;

 </chapter>

-<appendix id="installation">
-<title>Installation</title>
-
-<sect1 id="getting-krfb">
-<title>How to obtain &krfb;</title>
-
-<!-- This first entity contains boiler plate for applications that are
-part of KDE CVS.  You should remove it if you are releasing your
-application --> 
-
-&install.intro.documentation;
-
-</sect1>
-
-<sect1 id="compilation">
-<title>Compilation and Installation</title>
-
-<!-- This entity contains the boilerplate text for standard -->
-<!-- compilation instructions.  If your application requires any -->
-<!-- special handling, remove it, and replace with your own text. -->
-
-&install.compile.documentation;
-
-</sect1>
-
-</appendix>
-
 &documentation.index;
 </book>

--- a/doc/personal_invitation.png
+++ b/doc/personal_invitation.png
--- a/doc/screenshot.png
+++ b/doc/screenshot.png
--- a/framebuffers/qt/CMakeLists.txt
+++ b/framebuffers/qt/CMakeLists.txt
@@ -7,22 +7,18 @@ set (krfb_framebuffer_qt_SRCS
     qtframebufferplugin.cpp
 )

-kde4_add_plugin (krfb_framebuffer_qt
+add_library(krfb_framebuffer_qt
+ MODULE 
                 ${krfb_framebuffer_qt_SRCS}
 )

 target_link_libraries (krfb_framebuffer_qt
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${KDE4_KDEUI_LIBS}
+                       Qt5::Core
+                       Qt5::Gui
+                       KF5::CoreAddons
                       krfbprivate
 )

 install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${PLUGIN_INSTALL_DIR}
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
 )
-
-install (FILES krfb_framebuffer_qt.desktop
-         DESTINATION ${SERVICES_INSTALL_DIR}
-)
-
--- a/framebuffers/qt/krfb_framebuffer_qt.desktop
+++ b/framebuffers/qt/krfb_framebuffer_qt.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Qt based Framebuffer for KRfb.
-Comment[ast]=Esquema Qt de buffer pa 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 Qt per al KRfb.
-Comment[ca@valencia]=«Framebuffer» basat en Qt per al KRfb.
+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
@@ -49,11 +49,11 @@ 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]=Esquema Qt de buffer pa KRfb
+Name[ast]=Búfer de cuadros Qt pa KRfb
 Name[bg]=Qt фреймбуфер за KRfb
 Name[bs]=Qt-ov kadrobafer za KRFB
-Name[ca]=«Framebuffer» Qt per al KRfb.
-Name[ca@valencia]=«Framebuffer» Qt per al 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
--- a/framebuffers/qt/krfb_framebuffer_qt.json
+++ b/framebuffers/qt/krfb_framebuffer_qt.json
@@ -0,0 +1,79 @@
+{
+    "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[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[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 na podstawie 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, ki temelji na 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[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[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[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 Qt za KRfb",
+        "Name[sr@ijekavian]": "КуТ‑ов кадробафер за КРФБ",
+        "Name[sr@ijekavianlatin]": "Qt‑ov kadrobafer za KRFB",
+        "Name[sr@latin]": "Qt‑ov kadrobafer za KRFB",
+        "Name[sr]": "КуТ‑ов кадробафер за КРФБ",
+        "Name[sv]": "X11-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",
+        "ServiceTypes": [
+            "krfb/framebuffer"
+        ],
+        "Version": "0.1",
+        "Website": "http://www.kde.org"
+    }
+}
--- a/framebuffers/qt/qtframebuffer.cpp
+++ b/framebuffers/qt/qtframebuffer.cpp
@@ -14,6 +14,8 @@
 #include <QRegion>
 #include <QPixmap>
 #include <QBitmap>
+#include <QGuiApplication>
+#include <QScreen>


 const int UPDATE_TIME = 500;
@@ -21,16 +23,25 @@ const int UPDATE_TIME = 500;
 QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
    : FrameBuffer(id, parent)
 {
-    fbImage = QPixmap::grabWindow(win).toImage();
-    fb = new char[fbImage.numBytes()];
+    QScreen *screen = QGuiApplication::primaryScreen();
+    if (screen) {
+        primaryScreen = screen;
+        fbImage = screen->grabWindow(win).toImage();
+        fb = new char[fbImage.byteCount()];
+    } else {
+        fb = Q_NULLPTR;
+        primaryScreen = Q_NULLPTR;
+    }
+
    t = new QTimer(this);
-    connect(t, SIGNAL(timeout()), SLOT(updateFrameBuffer()));
+    connect(t, &QTimer::timeout, this, &QtFrameBuffer::updateFrameBuffer);
 }


 QtFrameBuffer::~QtFrameBuffer()
 {
-    delete [] fb;
+    if (fb)
+        delete [] fb;
    fb = 0;
 }

@@ -66,7 +77,9 @@ void QtFrameBuffer::getServerFormat(rfbPixelFormat &format)

 void QtFrameBuffer::updateFrameBuffer()
 {
-    QImage img = QPixmap::grabWindow(win).toImage();
+    if (!fb || !primaryScreen) return;
+    QImage img = primaryScreen->grabWindow(win).toImage();
+#if 0 // This is actually slower than updating the whole desktop...
    QSize imgSize = img.size();


@@ -74,8 +87,6 @@ void QtFrameBuffer::updateFrameBuffer()
    // fbImage is the previous version of the image,
    // img is the current one

-#if 0 // This is actually slower than updating the whole desktop...
-
    QImage map(imgSize, QImage::Format_Mono);
    map.fill(0);

@@ -94,7 +105,7 @@ void QtFrameBuffer::updateFrameBuffer()
    tiles.append(img.rect());
 #endif

-    memcpy(fb, (const char *)img.bits(), img.numBytes());
+    memcpy(fb, (const char *)img.bits(), img.byteCount());
    fbImage = img;

 }
--- a/framebuffers/qt/qtframebuffer.h
+++ b/framebuffers/qt/qtframebuffer.h
@@ -14,6 +14,7 @@
 #include "framebuffer.h"

 class QTimer;
+class QScreen;
 /**
    @author Alessandro Praduroux <pradu@pradu.it>
 */
@@ -25,13 +26,13 @@ public:

    ~QtFrameBuffer();

-    virtual int depth();
-    virtual int height();
-    virtual int width();
-    virtual int paddedWidth();
-    virtual void getServerFormat(rfbPixelFormat &format);
-    virtual void startMonitor();
-    virtual void stopMonitor();
+    int depth() override;
+    int height() override;
+    int width() override;
+    int paddedWidth() override;
+    void getServerFormat(rfbPixelFormat &format) override;
+    void startMonitor() override;
+    void stopMonitor() override;

 public Q_SLOTS:
    void updateFrameBuffer();
@@ -39,6 +40,7 @@ public Q_SLOTS:
 private:
    QImage fbImage;
    QTimer *t;
+    QScreen *primaryScreen;
 };

 #endif
--- a/framebuffers/qt/qtframebufferplugin.cpp
+++ b/framebuffers/qt/qtframebufferplugin.cpp
@@ -22,8 +22,10 @@

 #include "qtframebuffer.h"

-#include <KGenericFactory>
+#include <KPluginFactory>

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

 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
    : FrameBufferPlugin(parent, args)
@@ -39,9 +41,5 @@ FrameBuffer *QtFrameBufferPlugin::frameBuffer(WId id)
    return new QtFrameBuffer(id);
 }

-K_PLUGIN_FACTORY(factory, registerPlugin<QtFrameBufferPlugin>();) \
-K_EXPORT_PLUGIN(factory("krfb_framebuffer_qt"))
-
-
 #include "qtframebufferplugin.moc"

--- a/framebuffers/qt/qtframebufferplugin.h
+++ b/framebuffers/qt/qtframebufferplugin.h
@@ -23,9 +23,7 @@

 #include "framebufferplugin.h"

-#include <kdemacros.h>
-
-#include <QtGui/QWidget>
+#include <QWidget>

 class FrameBuffer;

@@ -37,7 +35,7 @@ public:
    QtFrameBufferPlugin(QObject *parent, const QVariantList &args);
    virtual ~QtFrameBufferPlugin();

-    virtual FrameBuffer *frameBuffer(WId id);
+    FrameBuffer *frameBuffer(WId id) override;

 private:
    Q_DISABLE_COPY(QtFrameBufferPlugin)
--- a/framebuffers/x11/CMakeLists.txt
+++ b/framebuffers/x11/CMakeLists.txt
@@ -7,25 +7,21 @@ set (krfb_framebuffer_x11_SRCS
     x11framebufferplugin.cpp
 )

-kde4_add_plugin (krfb_framebuffer_x11
+add_library(krfb_framebuffer_x11
+ MODULE 
                 ${krfb_framebuffer_x11_SRCS}
 )

 target_link_libraries (krfb_framebuffer_x11
-                       ${KDE4_KDEUI_LIBS}
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
+                       Qt5::Core
+                       Qt5::Gui
                       ${X11_X11_LIB}
                       ${X11_Xdamage_LIB}
                       ${X11_Xext_LIB}
+                       KF5::CoreAddons
                       krfbprivate
 )

 install (TARGETS krfb_framebuffer_x11
-         DESTINATION ${PLUGIN_INSTALL_DIR}
+         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
 )
-
-install (FILES krfb_framebuffer_x11.desktop
-         DESTINATION ${SERVICES_INSTALL_DIR}
-)
-
--- a/framebuffers/x11/krfb_framebuffer_x11.desktop
+++ b/framebuffers/x11/krfb_framebuffer_x11.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=X11 XDamage/XShm based Framebuffer for KRfb.
-Comment[ast]=Esquema de buffer pa KRfb basáu en XDamage/XShm
+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.
@@ -49,7 +49,7 @@ 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]=Buffer de X11 pa 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.
--- a/framebuffers/x11/krfb_framebuffer_x11.json
+++ b/framebuffers/x11/krfb_framebuffer_x11.json
@@ -0,0 +1,79 @@
+{
+    "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[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[ia]": "Framebuffer basate sur X11 XDamage/XShm per 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, ki temelji na 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": "x11",
+        "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[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[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 X11 za KRfb",
+        "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",
+        "ServiceTypes": [
+            "krfb/framebuffer"
+        ],
+        "Version": "0.1",
+        "Website": "http://www.kde.org"
+    }
+}
--- a/framebuffers/x11/x11framebuffer.cpp
+++ b/framebuffers/x11/x11framebuffer.cpp
@@ -16,8 +16,7 @@
 #include <QApplication>
 #include <QDesktopWidget>

-#include <KApplication>
-#include <KDebug>
+#include <QDebug>

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -56,7 +55,7 @@ X11FrameBuffer::X11FrameBuffer(WId id, QObject *parent)
 {
 #ifdef HAVE_XSHM
    d->useShm = XShmQueryExtension(QX11Info::display());
-    kDebug() << "shm: " << d->useShm;
+    //qDebug() << "shm: " << d->useShm;
 #else
    d->useShm = false;
 #endif
@@ -94,7 +93,7 @@ X11FrameBuffer::X11FrameBuffer(WId id, QObject *parent)
        ;
    }

-    kDebug() << "Got image. bpp: " << d->framebufferImage->bits_per_pixel
+    qDebug() << "Got image. bpp: " << d->framebufferImage->bits_per_pixel
             << ", depth: " << d->framebufferImage->depth
             << ", padded width: " << d->framebufferImage->bytes_per_line
             << " (sent: " << d->framebufferImage->width * 4 << ")"
@@ -103,7 +102,7 @@ X11FrameBuffer::X11FrameBuffer(WId id, QObject *parent)
    fb = d->framebufferImage->data;
 #ifdef HAVE_XDAMAGE
    d->ev = new EvWidget(this);
-    kapp->installX11EventFilter(d->ev);
+    qApp->installX11EventFilter(d->ev);
 #endif
 }

@@ -112,7 +111,7 @@ X11FrameBuffer::~X11FrameBuffer()
 {
    XDestroyImage(d->framebufferImage);
 #ifdef HAVE_XDAMAGE
-    kapp->removeX11EventFilter(d->ev);
+    qApp->removeX11EventFilter(d->ev);
 #endif
 #ifdef HAVE_XSHM
    XShmDetach(QX11Info::display(), &d->shminfo);
@@ -207,25 +206,25 @@ void X11FrameBuffer::cleanupRects()
    QList<QRect> cpy = tiles;
    bool inserted = false;
    tiles.clear();
-//     kDebug() << "before cleanup: " << cpy.size();
+//     //qDebug() << "before cleanup: " << cpy.size();
    foreach(const QRect & r, cpy) {
        if (tiles.size() > 0) {
            for (int i = 0; i < tiles.size(); i++) {
-                //             kDebug() << r << tiles[i];
+                //             //qDebug() << r << tiles[i];
                if (r.intersects(tiles[i])) {
                    tiles[i] |= r;
                    inserted = true;
                    break;
-                    //                 kDebug() << "merged into " << tiles[i];
+                    //                 //qDebug() << "merged into " << tiles[i];
                }
            }

            if (!inserted) {
                tiles.append(r);
-                //             kDebug() << "appended " << r;
+                //             //qDebug() << "appended " << r;
            }
        } else {
-            //         kDebug() << "appended " << r;
+            //         //qDebug() << "appended " << r;
            tiles.append(r);
        }
    }
@@ -250,7 +249,7 @@ void X11FrameBuffer::cleanupRects()
        }
    }

-//     kDebug() << "after cleanup: " << tiles.size();
+//     //qDebug() << "after cleanup: " << tiles.size();
 }

 void X11FrameBuffer::acquireEvents()
@@ -258,11 +257,13 @@ void X11FrameBuffer::acquireEvents()

    XEvent ev;

+#ifdef HAVE_XDAMAGE
    while (XCheckTypedEvent(QX11Info::display(), d->xdamageBaseEvent + XDamageNotify, &ev)) {
        handleXDamage(&ev);
    }

    XDamageSubtract(QX11Info::display(), d->damage, None, None);
+#endif
 }

 QList< QRect > X11FrameBuffer::modifiedTiles()
@@ -273,7 +274,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
        return ret;
    }

-    kapp->processEvents(); // try to make sure every damage event goes trough;
+    qApp->processEvents(); // try to make sure every damage event goes trough;
    cleanupRects();
    QRect gl;

@@ -283,7 +284,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
 #ifdef HAVE_XSHM

            foreach(const QRect & r, tiles) {
-//                 kDebug() << r;
+//                 //qDebug() << r;
                gl |= r;
                int y = r.y();
                int x = r.x();
@@ -298,7 +299,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
                            x = d->framebufferImage->width - d->updateTile->width;
                        }

-//                         kDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r;
+//                         //qDebug() << "x: " << x << " (" << r.x() << ") y: " << y << " (" << r.y() << ") " << r;
                        XShmGetImage(QX11Info::display(), win, d->updateTile, x, y, AllPlanes);
                        int pxsize =  d->framebufferImage->bits_per_pixel / 8;
                        char *dest = fb + ((d->framebufferImage->bytes_per_line * y) + (x * pxsize));
@@ -336,8 +337,8 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
        }
    }

-//     kDebug() << "tot: " << gl;
-//     kDebug() << tiles.size();
+//     //qDebug() << "tot: " << gl;
+//     //qDebug() << tiles.size();
    ret = tiles;
    tiles.clear();
    return ret;
--- a/framebuffers/x11/x11framebuffer.h
+++ b/framebuffers/x11/x11framebuffer.h
@@ -13,6 +13,7 @@
 #include <QWidget>

 class X11FrameBuffer;
+typedef union _XEvent XEvent;

 class EvWidget: public QWidget
 {
@@ -40,14 +41,14 @@ public:

    ~X11FrameBuffer();

-    virtual QList<QRect> modifiedTiles();
-    virtual int depth();
-    virtual int height();
-    virtual int width();
-    virtual int paddedWidth();
-    virtual void getServerFormat(rfbPixelFormat &format);
-    virtual void startMonitor();
-    virtual void stopMonitor();
+    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;


    void handleXDamage(XEvent *event);
--- a/framebuffers/x11/x11framebufferplugin.cpp
+++ b/framebuffers/x11/x11framebufferplugin.cpp
@@ -22,8 +22,10 @@

 #include "x11framebuffer.h"

-#include <KGenericFactory>
+#include <KPluginFactory>

+K_PLUGIN_FACTORY_WITH_JSON(X11FrameBufferPluginFactory, "krfb_framebuffer_x11.json",
+			   registerPlugin<X11FrameBufferPlugin>();)

 X11FrameBufferPlugin::X11FrameBufferPlugin(QObject *parent, const QVariantList &args)
    : FrameBufferPlugin(parent, args)
@@ -39,9 +41,5 @@ FrameBuffer *X11FrameBufferPlugin::frameBuffer(WId id)
    return new X11FrameBuffer(id);
 }

-K_PLUGIN_FACTORY(factory, registerPlugin<X11FrameBufferPlugin>();) \
-K_EXPORT_PLUGIN(factory("krfb_framebuffer_x11"))
-
-
 #include "x11framebufferplugin.moc"

--- a/framebuffers/x11/x11framebufferplugin.h
+++ b/framebuffers/x11/x11framebufferplugin.h
@@ -23,9 +23,7 @@

 #include "framebufferplugin.h"

-#include <kdemacros.h>
-
-#include <QtGui/QWidget>
+#include <QWidget>

 class FrameBuffer;

@@ -37,7 +35,7 @@ public:
    X11FrameBufferPlugin(QObject *parent, const QVariantList &args);
    virtual ~X11FrameBufferPlugin();

-    virtual FrameBuffer *frameBuffer(WId id);
+    FrameBuffer *frameBuffer(WId id) override;

 private:
    Q_DISABLE_COPY(X11FrameBufferPlugin)
--- a/krfb.kdev4
+++ b/krfb.kdev4
@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=krfb
--- a/krfb/CMakeLists.txt
+++ b/krfb/CMakeLists.txt
@@ -2,6 +2,8 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h
 )

+include(GenerateExportHeader)
+
 #####################################
 # First target: libkrfbprivate - a library
 # for linking plugins against.
@@ -11,21 +13,23 @@ set (krfbprivate_SRCS
     framebufferplugin.cpp
 )

-kde4_add_library (krfbprivate
+add_library (krfbprivate
                  SHARED
                  ${krfbprivate_SRCS}
 )
+generate_export_header(krfbprivate BASE_NAME krfbprivate)

 target_link_libraries (krfbprivate
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
+                       Qt5::Core
+                       Qt5::Widgets
+                       Qt5::X11Extras
                       ${X11_X11_LIB}
                       ${LIBVNCSERVER_LIBRARIES}
 )

 set_target_properties (krfbprivate PROPERTIES
-                       VERSION ${GENERIC_LIB_VERSION}
-                       SOVERSION ${GENERIC_LIB_VERSION}
+                       VERSION 5
+                       SOVERSION 5.0
 )

 install (TARGETS krfbprivate
@@ -42,16 +46,6 @@ install (FILES
 # Second target: krfb - the app
 # itself.

-if(TelepathyQt4_FOUND)
-    add_definitions(-DKRFB_WITH_TELEPATHY_TUBES)
-    include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
-endif()
-
-if(KTP_FOUND)
-    add_definitions(-DKRFB_WITH_KDE_TELEPATHY)
-    include_directories(${KTP_INCLUDE_DIR})
-endif()
-
 set (krfb_SRCS
     connectiondialog.cpp
     events.cpp
@@ -67,60 +61,40 @@ set (krfb_SRCS
     invitationsrfbclient.cpp
 )

-if(TelepathyQt4_FOUND)
-    set (krfb_SRCS
-         ${krfb_SRCS}
-         tubesrfbserver.cpp
-         tubesrfbclient.cpp
-    )
-endif()
-
-kde4_add_kcfg_files (krfb_SRCS
+kconfig_add_kcfg_files (krfb_SRCS
                     krfbconfig.kcfgc
 )

-kde4_add_ui_files (krfb_SRCS
+ki18n_wrap_ui (krfb_SRCS
                   ui/configtcp.ui
                   ui/configsecurity.ui
                   ui/connectionwidget.ui
                   ui/mainwidget.ui
 )

-if(TelepathyQt4_FOUND)
-    kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui)
-endif()
-
-kde4_add_executable (krfb
+add_executable (krfb
                     ${krfb_SRCS}
 )

 target_link_libraries (krfb
                       krfbprivate
-                       vncserver
                       ${JPEG_LIBRARIES}
                       ${X11_Xext_LIB}
                       ${X11_X11_LIB}
                       ${X11_Xdamage_LIB}
-                       ${QT_QTNETWORK_LIBRARY}
-                       ${KDE4_KDNSSD_LIBS}
-                       ${KDE4_KDEUI_LIBS}
+                       Qt5::Network
+                       KF5::Completion
+                       KF5::CoreAddons
+                       KF5::DBusAddons
+                       KF5::DNSSD
+                       KF5::I18n
+                       KF5::Notifications
+                       KF5::Wallet
+                       KF5::WidgetsAddons
+                       KF5::XmlGui
                       ${LIBVNCSERVER_LIBRARIES}
 )

-if(TelepathyQt4_FOUND)
-    target_link_libraries(krfb
-                          ${TELEPATHY_QT4_LIBRARIES}
-    )
-endif()
-
-if(KTP_FOUND)
-    target_link_libraries(krfb
-                          ${KTP_LIBRARIES}
-                          ${KTP_MODELS_LIBRARIES}
-                          ${KTP_WIDGETS_LIBRARIES}
-    )
-endif()
-
 if (X11_XTest_FOUND)
    target_link_libraries (krfb
                           ${X11_XTest_LIB}
@@ -131,21 +105,16 @@ install (TARGETS krfb
         ${INSTALL_TARGETS_DEFAULT_ARGS}
 )

-if(TelepathyQt4_FOUND)
-    configure_file(org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
-                   org.freedesktop.Telepathy.Client.krfb_rfb_handler.service)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service
-            DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-
-    install(FILES krfb_rfb_handler.client DESTINATION ${CMAKE_INSTALL_PREFIX}/share/telepathy/clients/)
-endif()
-
 ########### install files ###############

-install (PROGRAMS krfb.desktop
+install (PROGRAMS org.kde.krfb.desktop
         DESTINATION ${XDG_APPS_INSTALL_DIR}
 )

+install(FILES org.kde.krfb.appdata.xml
+        DESTINATION ${KDE_INSTALL_METAINFODIR}
+)
+
 install (FILES krfb.notifyrc
         DESTINATION ${DATA_INSTALL_DIR}/krfb
 )
--- a/krfb/connectiondialog.cpp
+++ b/krfb/connectiondialog.cpp
@@ -21,20 +21,33 @@

 #include "connectiondialog.h"

-#include <KIconLoader>
-#include <KLocale>
-#include <KStandardGuiItem>
+#include <QCheckBox>
+#include <QIcon>

-#include <QtGui/QCheckBox>
-#include <QtGui/QLabel>
+#include <KLocalizedString>
+#include <KStandardGuiItem>
+#include <KConfigGroup>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <KGuiItem>
+#include <QVBoxLayout>

 template <typename UI>
 ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
-    : KDialog(parent)
+    : QDialog(parent)
 {
-    setCaption(i18n("New Connection"));
-    setButtons(Ok | Cancel);
-    setDefaultButton(Cancel);
+    setWindowTitle(i18n("New Connection"));
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QWidget *mainWidget = new QWidget(this);
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
+    mainLayout->addWidget(mainWidget);
+    QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+    okButton->setDefault(true);
+    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &ConnectionDialog<UI>::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &ConnectionDialog<UI>::reject);
+    buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true);
    setModal(true);

    setMinimumSize(500, 200);
@@ -42,17 +55,18 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
    m_connectWidget = new QWidget(this);
    m_ui.setupUi(m_connectWidget);

-    m_ui.pixmapLabel->setPixmap(KIcon("krfb").pixmap(128));
+    m_ui.pixmapLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));

    KGuiItem accept = KStandardGuiItem::ok();
    accept.setText(i18n("Accept Connection"));
-    setButtonGuiItem(Ok, accept);
+    KGuiItem::assign(okButton, accept);

    KGuiItem refuse = KStandardGuiItem::cancel();
    refuse.setText(i18n("Refuse Connection"));
-    setButtonGuiItem(Cancel, refuse);
+    KGuiItem::assign(buttonBox->button(QDialogButtonBox::Cancel), refuse);

-    setMainWidget(m_connectWidget);
+    mainLayout->addWidget(m_connectWidget);
+    mainLayout->addWidget(buttonBox);
 }

 //**********
@@ -69,20 +83,4 @@ void InvitationsConnectionDialog::setRemoteHost(const QString &host)

 //**********

-#ifdef KRFB_WITH_TELEPATHY_TUBES
-
-TubesConnectionDialog::TubesConnectionDialog(QWidget *parent)
-    : ConnectionDialog<Ui::TubesConnectionWidget>(parent)
-{
-}
-
-void TubesConnectionDialog::setContactName(const QString & name)
-{
-    QString txt = i18n("You have requested to share your desktop with %1. If you proceed, "
-                       "you will allow the remote user to watch your desktop.", name);
-    m_ui.mainTextLabel->setText(txt);
-}
-
-#endif // KRFB_WITH_TELEPATHY_TUBES
-
 #include "connectiondialog.moc"
--- a/krfb/connectiondialog.h
+++ b/krfb/connectiondialog.h
@@ -23,10 +23,10 @@
 #define CONNECTIONDIALOG_H

 #include "ui_connectionwidget.h"
-#include <KDialog>
+#include <QDialog>

 template <typename UI>
-class ConnectionDialog : public KDialog
+class ConnectionDialog : public QDialog
 {
 public:
    ConnectionDialog(QWidget *parent);
@@ -65,18 +65,5 @@ public:

 //*********

-#ifdef KRFB_WITH_TELEPATHY_TUBES
-# include "ui_tubesconnectionwidget.h"
-
-class TubesConnectionDialog : public ConnectionDialog<Ui::TubesConnectionWidget>
-{
-    Q_OBJECT
-public:
-    TubesConnectionDialog(QWidget *parent);
-    void setContactName(const QString & name);
-};
-
-#endif // KRFB_WITH_TELEPATHY_TUBES
-
 #endif // CONNECTIONDIALOG_H

--- a/krfb/events.cpp
+++ b/krfb/events.cpp
@@ -24,10 +24,10 @@

 #include "events.h"

-#include <QtGui/QApplication>
-#include <QtGui/QX11Info>
-#include <QtGui/QDesktopWidget>
-#include <KGlobal>
+#include <QApplication>
+#include <QX11Info>
+#include <QDesktopWidget>
+#include <QGlobalStatic>

 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -60,7 +60,7 @@ private:
    void init();
 };

-K_GLOBAL_STATIC(EventData, data)
+Q_GLOBAL_STATIC(EventData, data)

 EventData::EventData()
 {
--- a/krfb/framebuffer.h
+++ b/krfb/framebuffer.h
@@ -12,19 +12,19 @@

 #include "rfb.h"

-#include <kdemacros.h>
+#include "krfbprivate_export.h"

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

-#include <QtGui/QWidget>

 class FrameBuffer;
 /**
    @author Alessandro Praduroux <pradu@pradu.it>
 */
-class KDE_EXPORT FrameBuffer : public QObject
+class KRFBPRIVATE_EXPORT FrameBuffer : public QObject
 {
    Q_OBJECT
 public:
--- a/krfb/framebuffermanager.cpp
+++ b/krfb/framebuffermanager.cpp
@@ -23,9 +23,12 @@
 #include "framebufferplugin.h"
 #include "krfbconfig.h"

-#include <KDebug>
-#include <KGlobal>
-#include <KServiceTypeTrader>
+#include <QDebug>
+#include <QGlobalStatic>
+
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KPluginMetaData>

 #include <QtCore/QSharedPointer>

@@ -35,71 +38,75 @@ public:
    FrameBufferManager instance;
 };

-K_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
+Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)

 FrameBufferManager::FrameBufferManager()
 {
-    kDebug();
+    //qDebug();

    loadPlugins();
 }

 FrameBufferManager::~FrameBufferManager()
 {
-    kDebug();
+    //qDebug();
 }

 FrameBufferManager *FrameBufferManager::instance()
 {
-    kDebug();
+    //qDebug();

    return &frameBufferManagerStatic->instance;
 }

 void FrameBufferManager::loadPlugins()
 {
-    kDebug();
+    //qDebug();

-    // Load the all the plugin factories here, for use later.
-    KService::List offers = KServiceTypeTrader::self()->query("krfb/framebuffer");
+    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("krfb"), [](const KPluginMetaData & md) {
+            return md.serviceTypes().contains(QStringLiteral("krfb/framebuffer"));
+        });

-    KService::List::const_iterator iter;
-
-    for (iter = offers.constBegin(); iter < offers.constEnd(); ++iter) {
-        QString error;
-        KService::Ptr service = *iter;
-
-        KPluginFactory *factory = KPluginLoader(service->library()).factory();
-
-        if (!factory) {
-            kWarning() << "KPluginFactory could not load the plugin:" << service->library();
+    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;
-        }
-
-        FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
-
-        if (plugin) {
-            kDebug() << "Loaded plugin:" << service->name();
-            m_plugins.insert(service->library(), plugin);
-        } else {
-            kDebug() << error;
-        }
+	KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
+	
+	if (!factory) {
+		qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
+	} else {
+		qDebug() << "found plugin at " << data.fileName();
+	}
+	
+	FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
+	if (plugin) {
+		m_plugins.insert(data.pluginId(), plugin);
+		qDebug() << "Loaded plugin with name " << data.pluginId();
+	} else {
+		qDebug() << "unable to load pluign for " << data.fileName();
+	}
+        unique.insert (data.name());
    }
 }

 QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
 {
-    kDebug();
+    //qDebug();

    // See if there is still an existing framebuffer to this WId.
    if (m_frameBuffers.contains(id)) {
        QWeakPointer<FrameBuffer> weakFrameBuffer = m_frameBuffers.value(id);

        if (weakFrameBuffer) {
-            kDebug() << "Found cached frame buffer.";
+            //qDebug() << "Found cached frame buffer.";
            return weakFrameBuffer.toStrongRef();
        } else {
-            kDebug() << "Found deleted cached frame buffer. Don't use.";
+            //qDebug() << "Found deleted cached frame buffer. Don't use.";
            m_frameBuffers.remove(id);
        }
    }
@@ -110,7 +117,7 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
    while (iter != m_plugins.constEnd()) {

        if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
-            kDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+            qDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();

            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));

@@ -125,7 +132,7 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
    }

    // No valid framebuffer plugin found.
-    kDebug() << "No valid framebuffer found. returning null.";
+    qDebug() << "No valid framebuffer found. returning null.";
    return QSharedPointer<FrameBuffer>();
 }

--- a/krfb/framebuffermanager.h
+++ b/krfb/framebuffermanager.h
@@ -23,19 +23,19 @@

 #include "framebuffer.h"

-#include <kdemacros.h>
+#include "krfbprivate_export.h"

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

-#include <QtGui/QWidget>
+#include <QWidget>

 class FrameBufferPlugin;
 class KPluginFactory;

-class KDE_EXPORT FrameBufferManager : public QObject
+class KRFBPRIVATE_EXPORT FrameBufferManager : public QObject
 {
    Q_OBJECT
    friend class FrameBufferManagerStatic;
--- a/krfb/framebufferplugin.h
+++ b/krfb/framebufferplugin.h
@@ -21,15 +21,15 @@
 #ifndef LIB_KRFB_FRAMEBUFFERPLUGIN_H
 #define LIB_KRFB_FRAMEBUFFERPLUGIN_H

-#include <kdemacros.h>
+#include "krfbprivate_export.h"

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

-#include <QtGui/QWidget>

 class FrameBuffer;

-class KDE_EXPORT FrameBufferPlugin : public QObject
+class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
 {
    Q_OBJECT

@@ -40,6 +40,5 @@ public:
    virtual FrameBuffer *frameBuffer(WId id) = 0;
 };

-
 #endif  // Header guard

--- a/krfb/invitationsrfbclient.cpp
+++ b/krfb/invitationsrfbclient.cpp
@@ -24,10 +24,14 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "connectiondialog.h"
+
 #include <KNotification>
-#include <KLocale>
+#include <KLocalizedString>
+
+#include <QDebug>
 #include <QtCore/QSocketNotifier>
 #include <poll.h>
+#include <KConfigGroup>

 struct PendingInvitationsRfbClient::Private
 {
@@ -50,8 +54,8 @@ PendingInvitationsRfbClient::PendingInvitationsRfbClient(rfbClientPtr client, QO
    d->client->clientGoneHook = clientGoneHookNoop;
    d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
    d->notifier->setEnabled(true);
-    connect(d->notifier, SIGNAL(activated(int)),
-            this, SLOT(onSocketActivated()));
+    connect(d->notifier, &QSocketNotifier::activated,
+            this, &PendingInvitationsRfbClient::onSocketActivated);
 }

 PendingInvitationsRfbClient::~PendingInvitationsRfbClient()
@@ -79,8 +83,8 @@ void PendingInvitationsRfbClient::processNewClient()
        dialog->setRemoteHost(host);
        dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());

-        connect(dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
-        connect(dialog, SIGNAL(cancelClicked()), SLOT(reject()));
+        connect(dialog, &InvitationsConnectionDialog::accepted, this, &PendingInvitationsRfbClient::dialogAccepted);
+        connect(dialog, &InvitationsConnectionDialog::rejected, this, &PendingInvitationsRfbClient::reject);

        dialog->show();
    }
@@ -111,7 +115,7 @@ void PendingInvitationsRfbClient::onSocketActivated()
        //the clientGoneHook which in turn will remove this RfbClient instance
        //from the server manager and will call deleteLater() to delete it
        if (d->client->sock == -1) {
-            kDebug() << "disconnected from socket signal";
+            qDebug() << "disconnected from socket signal";
            d->notifier->setEnabled(false);
            rfbClientConnectionGone(d->client);
            break;
@@ -122,7 +126,7 @@ void PendingInvitationsRfbClient::onSocketActivated()
 bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
    QByteArray password ;
-    kDebug() << "about to start autentication";
+    qDebug() << "about to start autentication";

    if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
            InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
--- a/krfb/invitationsrfbclient.h
+++ b/krfb/invitationsrfbclient.h
@@ -36,9 +36,9 @@ public:
    virtual ~PendingInvitationsRfbClient();

 protected Q_SLOTS:
-    virtual void processNewClient();
+    void processNewClient() override;
    virtual void onSocketActivated();
-    virtual bool checkPassword(const QByteArray & encryptedPassword);
+    bool checkPassword(const QByteArray & encryptedPassword) override;

 private Q_SLOTS:
    void dialogAccepted();
--- a/krfb/invitationsrfbserver.cpp
+++ b/krfb/invitationsrfbserver.cpp
@@ -23,16 +23,17 @@
 #include "krfbconfig.h"
 #include "rfbservermanager.h"
 #include <QtCore/QTimer>
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtNetwork/QHostInfo>
-#include <KNotification>
-#include <KLocale>
-#include <KMessageBox>
+#include <QDebug>
+
+#include <KLocalizedString>
 #include <KUser>
 #include <KRandom>
 #include <KStringHandler>
-#include <KWallet/Wallet>
-#include <DNSSD/PublicService>
+#include <KWallet/KWallet>
+
+#include <dnssd/publicservice.h>
 using KWallet::Wallet;

 //static
@@ -42,7 +43,7 @@ InvitationsRfbServer *InvitationsRfbServer::instance;
 void InvitationsRfbServer::init()
 {
    instance = new InvitationsRfbServer;
-    instance->m_publicService = new DNSSD::PublicService(
+    instance->m_publicService = new KDNSSD::PublicService(
            i18n("%1@%2 (shared desktop)",
                KUser().loginName(),
                QHostInfo::localHostName()),
@@ -52,11 +53,16 @@ void InvitationsRfbServer::init()
    instance->setListeningPort(KrfbConfig::port());
    instance->setPasswordRequired(true);

-    instance->m_wallet = Wallet::openWallet(
-            Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
-    if(instance->m_wallet) {
-        connect(instance->m_wallet, SIGNAL(walletOpened(bool)),
-                instance, SLOT(walletOpened(bool)));
+    if (KrfbConfig::noWallet()) {
+      instance->walletOpened(false);
+    }
+    else {
+      instance->m_wallet = Wallet::openWallet(
+              Wallet::NetworkWallet(), 0, Wallet::Asynchronous);
+      if(instance->m_wallet) {
+          connect(instance->m_wallet, &KWallet::Wallet::walletOpened,
+                  instance, &InvitationsRfbServer::walletOpened);
+      }
    }
 }

@@ -95,11 +101,11 @@ bool InvitationsRfbServer::start()
    return false;
 }

-void InvitationsRfbServer::stop(bool disconnectClients)
+void InvitationsRfbServer::stop()
 {
    if(m_publicService->isPublished())
        m_publicService->stop();
-    RfbServer::stop(disconnectClients);
+    RfbServer::stop();
 }

 void InvitationsRfbServer::toggleUnattendedAccess(bool allow)
@@ -111,8 +117,7 @@ InvitationsRfbServer::InvitationsRfbServer()
 {
    m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
    m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup krfbConfig(config,"Security");
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
    m_allowUnattendedAccess = krfbConfig.readEntry(
            "allowUnattendedAccess", QVariant(false)).toBool();
 }
@@ -120,11 +125,10 @@ InvitationsRfbServer::InvitationsRfbServer()
 InvitationsRfbServer::~InvitationsRfbServer()
 {
    stop();
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup krfbConfig(config,"Security");
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
    krfbConfig.writeEntry("allowUnattendedAccess",m_allowUnattendedAccess);
-    if(m_wallet && m_wallet->isOpen()) {
-
+    if(!KrfbConfig::noWallet()) {
+      if (m_wallet && m_wallet->isOpen()) {
         if( (m_wallet->currentFolder()=="krfb") ||
                 ((m_wallet->hasFolder("krfb") || m_wallet->createFolder("krfb")) &&
                    m_wallet->setFolder("krfb")) ) {
@@ -132,6 +136,7 @@ InvitationsRfbServer::~InvitationsRfbServer()
             m_wallet->writePassword("desktopSharingPassword",m_desktopPassword);
             m_wallet->writePassword("unattendedAccessPassword",m_unattendedPassword);
         }
+       }

    } else {
        krfbConfig.writeEntry("desktopPassword",
@@ -170,9 +175,8 @@ void InvitationsRfbServer::walletOpened(bool opened)

    } else {

-        kDebug() << "Could not open KWallet, Falling back to config file";
-        KSharedConfigPtr config = KGlobal::config();
-        KConfigGroup krfbConfig(config,"Security");
+        qDebug() << "Could not open KWallet, Falling back to config file";
+        KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");

        desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
                "desktopPassword", QString()));
--- a/krfb/invitationsrfbserver.h
+++ b/krfb/invitationsrfbserver.h
@@ -26,7 +26,7 @@ namespace KWallet {
    class Wallet;
 }

-namespace DNSSD {
+namespace KDNSSD {
    class PublicService;
 }

@@ -47,20 +47,20 @@ Q_SIGNALS:
    void passwordChanged(const QString&);

 public Q_SLOTS:
-    bool start();
-    void stop(bool disconnectClients=true);
-    void toggleUnattendedAccess(bool allow=true);
+    bool start() override;
+    void stop() override;
+    void toggleUnattendedAccess(bool allow);

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

 private Q_SLOTS:
    void walletOpened(bool);

 private:
-    DNSSD::PublicService *m_publicService;
+    KDNSSD::PublicService *m_publicService;
    bool m_allowUnattendedAccess;
    QString m_desktopPassword;
    QString m_unattendedPassword;
--- a/krfb/krfb-framebuffer.desktop
+++ b/krfb/krfb-framebuffer.desktop
@@ -3,7 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=krfb/framebuffer

 Comment=Frame Buffer plugins for KRfb
-Comment[ast]=Complementu de buffer pa 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.
@@ -28,7 +28,7 @@ Comment[ja]=KRfb の フレームバッファプラグイン
 Comment[kk]=KRfb кадр буфер плагині
 Comment[km]=កម្មវិធីជំនួយ Frame Buffer សម្រាប់ KRfb
 Comment[ko]=KRfb 프레임버퍼 플러그인
-Comment[lt]=Frame Buffer priedai skirti 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
--- a/krfb/krfb-framebuffer.json
+++ b/krfb/krfb-framebuffer.json
@@ -0,0 +1,38 @@
+{
+    "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[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]": "Engadido de frame buffer para KRfb",
+        "Description[ia]": "Plug-ins de Frame Buffer per 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]": "Vstavki slikovnih medpomnilnikov 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.kcfg
+++ b/krfb/krfb.kcfg
@@ -3,6 +3,12 @@
    "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
 <kcfg>
  <kcfgfile />
+  <group name="MainWindow">
+    <entry name="startMinimized" type="Bool">
+    <label>Start minimized</label>
+    <default>false</default>
+    </entry>
+  </group>
  <group name="TCP">
    <entry name="useDefaultPort" type="Bool">
      <label>Use the default port for VNC (5900)</label>
@@ -18,6 +24,10 @@
    </entry>
  </group>
  <group name="Security">
+   <entry name="noWallet" type="Bool">
+      <label>Do not store passwords in KWallet</label>
+      <default>false</default>
+    </entry>
    <entry name="allowDesktopControl" type="Bool">
      <label>Allow remote connections to manage the desktop.</label>
      <default>true</default>
@@ -36,7 +46,7 @@
  <group name="FrameBuffer">
    <entry name="preferredFrameBufferPlugin" type="String">
      <label>Preferred Frame Buffer Plugin</label>
-      <default>krfb_framebuffer_x11</default>
+      <default>qt</default>
    </entry>
  </group>
 </kcfg>
--- a/krfb/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
@@ -3,13 +3,13 @@ IconName=krfb
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب
-Comment[ast]=Escritoriu compartíu
+Comment[ast]=Compartición d'escritoriu
 Comment[bg]=Споделяне на работния плот
 Comment[bn]=ডেস্কটপ ভাগাভাগি
 Comment[br]=Rannañ ar vurev
 Comment[bs]=Dijeljenje radne površine
-Comment[ca]=Compartició de l'escriptori
-Comment[ca@valencia]=Compartició de l'escriptori
+Comment[ca]=Compartir l'escriptori
+Comment[ca@valencia]=Compartir l'escriptori
 Comment[cs]=Sdílení pracovní plochy
 Comment[cy]=Rhannu Penbwrdd
 Comment[da]=Skrivebordsdeling
@@ -36,7 +36,7 @@ Comment[ja]=デスクトップ共有
 Comment[kk]=Үстелді ортақтастыру
 Comment[km]=ការចែករំលែកផ្ទែតុ
 Comment[ko]=데스크톱 공유
-Comment[lt]=Dalinimasis darbastaliu
+Comment[lt]=Dalinimasis darbalaukiu
 Comment[lv]=Darbvirsmas koplietošana
 Comment[mk]=Делење на работната површина
 Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
@@ -358,7 +358,7 @@ Name[eu]=Konexioa itxi da
 Name[fi]=Yhteys suljettu
 Name[fr]=Connexion fermée
 Name[ga]=Ceangal Dúnta
-Name[gl]=Conexión fechada
+Name[gl]=Conexión pechada
 Name[hi]=कनेक्शन बन्द
 Name[hne]=कनेक्सन बन्द
 Name[hr]=Veza prekinuta
@@ -404,7 +404,7 @@ Name[zh_TW]=連線已關閉
 Comment=Connection closed
 Comment[af]=Verbinding gesluit
 Comment[ar]=تمّ غلق الاتصال
-Comment[ast]=Conexón zarrada
+Comment[ast]=Zarróse la conexón
 Comment[bg]=Връзката е прекъсната
 Comment[bn]=সংযোগ বন্ধ করা হল
 Comment[br]=Serret eo ar gevreadenn
@@ -424,7 +424,7 @@ Comment[eu]=Konexioa itxi da
 Comment[fi]=Yhteys suljettu
 Comment[fr]=Connexion fermée
 Comment[ga]=Ceangal dúnta
-Comment[gl]=A conexión está fechada
+Comment[gl]=A conexión está pechada
 Comment[he]=החיבור נסגר
 Comment[hi]=कनेक्शन बन्द
 Comment[hne]=कनेक्सन बन्द
@@ -480,7 +480,7 @@ Action=Popup
 [Event/InvalidPassword]
 Name=Invalid Password
 Name[ar]=كلمة المرور غير صحيحة
-Name[ast]=Contraseña incorreuta
+Name[ast]=Contraseña non válida
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -543,7 +543,7 @@ Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
 Comment[ar]=كلمة المرور غير صحيحة
-Comment[ast]=Contraseña incorreuta
+Comment[ast]=La contraseña nun ye válida
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -622,7 +622,6 @@ Action=Popup
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
 Name[ar]=كلمة المرور الدعوات غير صحيحة
-Name[ast]=Contraseñas d'invitaciones incorreutes
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
 Name[ca]=Contrasenya de les invitacions no vàlides
@@ -683,7 +682,7 @@ 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]=L'invitáu unvió una contraseña incorreuta. Conexón refugada.
+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.
@@ -753,11 +752,11 @@ Action=Popup
 [Event/NewConnectionOnHold]
 Name=New Connection on Hold
 Name[ar]=اتصال جديد  على التوقف
-Name[ast]=Conexón nueva a la espera
+Name[ast]=Conexón nueva n'espera
 Name[bg]=Изчакване на новата връзка
 Name[bs]=Nova veza je na čekanju
-Name[ca]=Nova connexió en espera
-Name[ca@valencia]=Nova connexió en espera
+Name[ca]=Connexió nova en espera
+Name[ca@valencia]=Connexió nova en espera
 Name[cs]=Nové spojení pozdrženo
 Name[da]=Ny forbindelse sat til at vente
 Name[de]=Neue Verbindung wartet
@@ -813,12 +812,12 @@ Name[zh_TW]=新連線等待處理
 Comment=Connection requested, user must accept
 Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
 Comment[ar]=الاتصال طلب، يجب موافقة المستخدم
-Comment[ast]=Conexón solicitada, l'usuario tien d'aceutala
+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
-Comment[ca]=Connexió sol·licitada, l'usuari ha d'acceptar-la
-Comment[ca@valencia]=Connexió sol·licitada, l'usuari ha d'acceptar-la
+Comment[ca]=Connexió sol·licitada, 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
@@ -884,11 +883,11 @@ Action=Popup
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
 Name[ar]=اتصال جديد مقبول تلقائيا
-Name[ast]=Conexón nueva aceutada automáticamente
+Name[ast]=Conexón nueva auto-aceutada
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
-Name[ca]=Nova connexió acceptada automàticament
-Name[ca@valencia]=Nova connexió acceptada automàticament
+Name[ca]=Connexió nova acceptada automàticament
+Name[ca@valencia]=Connexió nova acceptada automàticament
 Name[cs]=Nové spojení automaticky přijato
 Name[da]=Ny forbindelse automatisk accepteret
 Name[de]=Neue Verbindung automatisch angenommen
@@ -944,12 +943,12 @@ Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
 Comment[ar]=اتصال جديد مفعل تلقائيا 
-Comment[ast]=Conexón nueva afitada automáticamente
+Comment[ast]=Afitóse automáticamente la conexón nueva
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena
-Comment[ca]=Nova connexió establerta automàticament
-Comment[ca@valencia]=Nova connexió establerta automàticament
+Comment[ca]=Connexió nova establerta automàticament
+Comment[ca@valencia]=Connexió nova establida automàticament
 Comment[cs]=Automaticky navázáno nové spojení
 Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig
 Comment[da]=Ny forbindelse automatisk etableret
@@ -1015,7 +1014,7 @@ Action=Popup
 [Event/TooManyConnections]
 Name=Too Many Connections
 Name[ar]=اتصالات عديدة
-Name[ast]=Abondes conexones
+Name[ast]=Milenta conexones
 Name[bg]=Твърде много връзки
 Name[bs]=Previše veza
 Name[ca]=Massa connexions
@@ -1075,7 +1074,7 @@ Name[zh_TW]=太多連線
 Comment=Busy, connection refused
 Comment[af]=Besig, verbinding geweier
 Comment[ar]=مشغول، الإتصال رفض
-Comment[ast]=Ocupáu, conexón refugada
+Comment[ast]=Ocupáu, refugóse la conexón
 Comment[bg]=Заето. Връзката е отказана.
 Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
 Comment[br]=Dalc'het, kevreadenn disteuleret
@@ -1210,12 +1209,12 @@ Name[zh_TW]=未知的連線
 Comment=Received unexpected connection, abort
 Comment[af]=Ontvang onverwagte verbinding, staak
 Comment[ar]=استقبال اتصال غير متوقع، إنهاء
-Comment[ast]=Recibióse conexón inesperada, albortando
+Comment[ast]=Recibióse una conexón inesperada, albortando
 Comment[bg]=Получена е неочаквана връзка. Прекъсване.
 Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
 Comment[bs]=Primljena je neočekivana veza, prekini
-Comment[ca]=Rebuda una connexió inesperada, avortant
-Comment[ca@valencia]=Rebuda una connexió inesperada, avortant
+Comment[ca]=S'ha rebut una connexió inesperada, avortant
+Comment[ca@valencia]=S'ha rebut una connexió inesperada, avortant
 Comment[cs]=Obdrženo neočekávané spojení, přerušeno
 Comment[cy]=Derbynwyd cysylltiad annisgwyl,terfynu
 Comment[da]=Modtog uventet forbindelse, afbrød
--- a/krfb/main.cpp
+++ b/krfb/main.cpp
@@ -18,29 +18,26 @@
 #include "mainwindow.h"
 #include "trayicon.h"
 #include "invitationsrfbserver.h"
+#include "krfbconfig.h"

-#include <KAboutApplicationDialog>
 #include <KAboutData>
-#include <KAction>
-#include <KUniqueApplication>
-#include <KCmdLineArgs>
-#include <KDebug>
-#include <KLocale>
+#include <KDBusService>
+#include <KLocalizedString>
 #include <KMessageBox>
-#include <KNotification>

-#include <QtGui/QPixmap>
-#include <QtGui/qwindowdefs.h>
-
-#ifdef KRFB_WITH_TELEPATHY_TUBES
-# include "tubesrfbserver.h"
-#endif
+#include <QDebug>
+#include <QPixmap>
+#include <qwindowdefs.h>
+#include <QX11Info>

 #include <signal.h>
 #include <X11/extensions/XTest.h>
+#include <QCommandLineParser>
+#include <QCommandLineOption>

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

 static bool checkX11Capabilities()
 {
@@ -61,39 +58,51 @@ static bool checkX11Capabilities()

 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("krfb", 0, ki18n("Desktop Sharing"), KDE_VERSION_STRING,
-                         ki18n(description), KAboutData::License_GPL,
-                         ki18n("(c) 2009-2010, Collabora Ltd.\n"
+    QApplication app(argc, argv);
+
+    KLocalizedString::setApplicationDomain("krfb");
+
+    KAboutData aboutData("krfb",
+			 i18n("Desktop Sharing"),
+			 KRFB_VERSION,
+                         i18n(description),
+			 KAboutLicense::GPL,
+                         i18n("(c) 2009-2010, Collabora Ltd.\n"
                               "(c) 2007, Alessandro Praduroux\n"
                               "(c) 2001-2003, Tim Jansen\n"
                               "(c) 2001, Johannes E. Schindelin\n"
                               "(c) 2000-2001, Const Kaplinsky\n"
                               "(c) 2000, Tridia Corporation\n"
                               "(c) 1999, AT&T Laboratories Boston\n"));
-    aboutData.addAuthor(ki18n("George Goldberg"),
-                        ki18n("Telepathy tubes support"),
+    aboutData.addAuthor(i18n("George Goldberg"),
+                        i18n("Telepathy tubes support"),
                        "george.goldberg@collabora.co.uk");
-    aboutData.addAuthor(ki18n("George Kiagiadakis"),
-                        KLocalizedString(),
+    aboutData.addAuthor(i18n("George Kiagiadakis"),
+                        QString(),
                        "george.kiagiadakis@collabora.co.uk");
-    aboutData.addAuthor(ki18n("Alessandro Praduroux"), ki18n("KDE4 porting"), "pradu@pradu.it");
-    aboutData.addAuthor(ki18n("Tim Jansen"), ki18n("Original author"), "tim@tjansen.de");
-    aboutData.addCredit(ki18n("Johannes E. Schindelin"),
-                        ki18n("libvncserver"));
-    aboutData.addCredit(ki18n("Const Kaplinsky"),
-                        ki18n("TightVNC encoder"));
-    aboutData.addCredit(ki18n("Tridia Corporation"),
-                        ki18n("ZLib encoder"));
-    aboutData.addCredit(ki18n("AT&T Laboratories Boston"),
-                        ki18n("original VNC encoders and "
+    aboutData.addAuthor(i18n("Alessandro Praduroux"), i18n("KDE4 porting"), "pradu@pradu.it");
+    aboutData.addAuthor(i18n("Tim Jansen"), i18n("Original author"), "tim@tjansen.de");
+    aboutData.addCredit(i18n("Johannes E. Schindelin"),
+                        i18n("libvncserver"));
+    aboutData.addCredit(i18n("Const Kaplinsky"),
+                        i18n("TightVNC encoder"));
+    aboutData.addCredit(i18n("Tridia Corporation"),
+                        i18n("ZLib encoder"));
+    aboutData.addCredit(i18n("AT&T Laboratories Boston"),
+                        i18n("original VNC encoders and "
                              "protocol design"));
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    QCommandLineParser parser;
+    KAboutData::setApplicationData(aboutData);
+    parser.addVersionOption();
+    parser.addHelpOption();
+    aboutData.setupCommandLine(&parser);
+    parser.process(app);
+    aboutData.processCommandLine(&parser);

-    KCmdLineOptions options;
-    options.add("nodialog", ki18n("Do not show the invitations management dialog at startup"));
-    KCmdLineArgs::addCmdLineOptions(options);
+    KDBusService service(KDBusService::Unique, &app);
+
+    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("nodialog"), i18n("Do not show the invitations management dialog at startup")));

-    KUniqueApplication app;
    app.setQuitOnLastWindowClosed(false);

    if (!checkX11Capabilities()) {
@@ -103,17 +112,15 @@ int main(int argc, char *argv[])
    //init the core
    InvitationsRfbServer::init();

-#ifdef KRFB_WITH_TELEPATHY_TUBES
-    TubesRfbServer::init();
-#endif
-
    //init the GUI
    MainWindow mainWindow;
    TrayIcon trayicon(&mainWindow);

-    if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {
+    if (KrfbConfig::startMinimized()) {
+      mainWindow.hide();
+    } else if (app.isSessionRestored() && KMainWindow::canBeRestored(1)) {
        mainWindow.restore(1, false);
-    } else if (KCmdLineArgs::parsedArgs()->isSet("dialog")) {
+    } else if (!parser.isSet("nodialog")) {
        mainWindow.show();
    }

@@ -124,4 +131,3 @@ int main(int argc, char *argv[])

    return app.exec();
 }
-
--- a/krfb/mainwindow.cpp
+++ b/krfb/mainwindow.cpp
@@ -15,31 +15,18 @@
 #include "ui_configsecurity.h"

 #include <KConfigDialog>
-#include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
-#include <KStandardGuiItem>
-#include <KSystemTimeZone>
-#include <KToolInvocation>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KLineEdit>
 #include <KNewPasswordDialog>

-#include <QtGui/QWidget>
-#include <QtGui/QSizePolicy>
+#include <QIcon>
+#include <QWidget>
+#include <QSizePolicy>
 #include <QtNetwork/QNetworkInterface>

-#ifdef KRFB_WITH_KDE_TELEPATHY
-#include "tubesrfbserver.h"
-#include <TelepathyQt/PendingReady>
-#include <TelepathyQt/PendingChannelRequest>
-#include <KTp/actions.h>
-#include <KTp/Widgets/contact-view-widget.h>
-#include <KTp/Models/contacts-list-model.h>
-#include <KTp/Models/contacts-filter-model.h>
-#endif
-
 class TCP: public QWidget, public Ui::TCP
 {
 public:
@@ -69,26 +56,26 @@ MainWindow::MainWindow(QWidget *parent)

    QWidget *mainWidget = new QWidget;
    m_ui.setupUi(mainWidget);
-    m_ui.krfbIconLabel->setPixmap(KIcon("krfb").pixmap(128));
+    m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));
    m_ui.enableUnattendedCheckBox->setChecked(
            InvitationsRfbServer::instance->allowUnattendedAccess());

    setCentralWidget(mainWidget);

-    connect(m_ui.passwordEditButton,SIGNAL(clicked()),
-            this,SLOT(editPassword()));
-    connect(m_ui.enableSharingCheckBox,SIGNAL(toggled(bool)),
-            this, SLOT(toggleDesktopSharing(bool)));
-    connect(m_ui.enableUnattendedCheckBox, SIGNAL(toggled(bool)),
-            InvitationsRfbServer::instance, SLOT(toggleUnattendedAccess(bool)));
-    connect(m_ui.unattendedPasswordButton, SIGNAL(clicked()),
-            this, SLOT(editUnattendedPassword()));
-    connect(m_ui.addressAboutButton, SIGNAL(clicked()),
-            this, SLOT(aboutConnectionAddress()));
-    connect(m_ui.unattendedAboutButton, SIGNAL(clicked()),
-            this, SLOT(aboutUnattendedMode()));
-    connect(InvitationsRfbServer::instance, SIGNAL(passwordChanged(const QString&)),
-            this, SLOT(passwordChanged(const QString&)));
+    connect(m_ui.passwordEditButton, &QToolButton::clicked,
+            this, &MainWindow::editPassword);
+    connect(m_ui.enableSharingCheckBox, &QCheckBox::toggled,
+            this, &MainWindow::toggleDesktopSharing);
+    connect(m_ui.enableUnattendedCheckBox, &QCheckBox::toggled,
+            InvitationsRfbServer::instance, &InvitationsRfbServer::toggleUnattendedAccess);
+    connect(m_ui.unattendedPasswordButton, &QPushButton::clicked,
+            this, &MainWindow::editUnattendedPassword);
+    connect(m_ui.addressAboutButton, &QToolButton::clicked,
+            this, &MainWindow::aboutConnectionAddress);
+    connect(m_ui.unattendedAboutButton, &QToolButton::clicked,
+            this, &MainWindow::aboutUnattendedMode);
+    connect(InvitationsRfbServer::instance, &InvitationsRfbServer::passwordChanged,
+            this, &MainWindow::passwordChanged);

    // Figure out the address
    int port = KrfbConfig::port();
@@ -108,36 +95,15 @@ MainWindow::MainWindow(QWidget *parent)
    m_ui.passwordDisplayLabel->setText(
            InvitationsRfbServer::instance->desktopPassword());

-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-
-    m_contactViewWidget = new KTp::ContactViewWidget(
-            TubesRfbServer::instance->contactsListModel(), this);
-
-    m_contactViewWidget->setEnabled(false);
-    connect(m_ui.enableSharingCheckBox, SIGNAL(toggled(bool)),
-            m_contactViewWidget, SLOT(setEnabled(bool)));
-    m_contactViewWidget->setIconSize(QSize(32,32));
-    m_contactViewWidget->setMinimumWidth(120);
-    m_contactViewWidget->setMaximumWidth(360);
-    m_contactViewWidget->setMinimumHeight(300);
-    m_contactViewWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
-    m_contactViewWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
-    m_contactViewWidget->filter()->setTubesFilterStrings(QStringList("rfb"));
-    m_contactViewWidget->filter()->setCapabilityFilterFlags(KTp::ContactsFilterModel::FilterByTubes);
-
-    m_contactViewWidget->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-    m_ui.tpContactsLayout->addWidget(m_contactViewWidget);
-    connect(m_contactViewWidget, SIGNAL(contactDoubleClicked(const Tp::AccountPtr &, const KTp::ContactPtr &)),
-        this, SLOT(onContactDoubleClicked(const Tp::AccountPtr &, const KTp::ContactPtr &)));
-#endif
-
-
    KStandardAction::quit(QCoreApplication::instance(), SLOT(quit()), actionCollection());
    KStandardAction::preferences(this, SLOT(showConfiguration()), actionCollection());

    setupGUI();

+    if (KrfbConfig::allowDesktopControl()) {
+      m_ui.enableSharingCheckBox->setChecked(true);
+    }
+
    setAutoSaveSettings();
 }

@@ -149,7 +115,7 @@ void MainWindow::editPassword()
 {
    if(m_passwordEditable) {
        m_passwordEditable = false;
-        m_ui.passwordEditButton->setIcon(KIcon("document-properties"));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
        m_ui.passwordGridLayout->removeWidget(m_passwordLineEdit);
        InvitationsRfbServer::instance->setDesktopPassword(
                m_passwordLineEdit->text());
@@ -158,7 +124,7 @@ void MainWindow::editPassword()
        m_passwordLineEdit->setVisible(false);
    } else {
        m_passwordEditable = true;
-        m_ui.passwordEditButton->setIcon(KIcon("document-save"));
+        m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-save"));
        m_ui.passwordGridLayout->addWidget(m_passwordLineEdit,0,0);
        m_passwordLineEdit->setText(
                InvitationsRfbServer::instance->desktopPassword());
@@ -190,7 +156,7 @@ void MainWindow::toggleDesktopSharing(bool enable)
        if(m_passwordEditable) {
            m_passwordEditable = false;
            m_passwordLineEdit->setVisible(false);
-            m_ui.passwordEditButton->setIcon(KIcon("document-properties"));
+            m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
        }
    }
 }
@@ -215,25 +181,6 @@ void MainWindow::aboutUnattendedMode()
            i18n("KDE Desktop Sharing"));
 }

-#ifdef KRFB_WITH_KDE_TELEPATHY
-
-void MainWindow::onContactDoubleClicked(const Tp::AccountPtr &account, const KTp::ContactPtr &contact)
-{
-    Tp::PendingOperation *op = KTp::Actions::startDesktopSharing(account, contact);
-    connect(op, SIGNAL(finished(Tp::PendingOperation*)),
-            this, SLOT(pendingDesktopShareFinished(Tp::PendingOperation*)));
-}
-
-void MainWindow::pendingDesktopShareFinished(Tp::PendingOperation *operation)
-{
-    if(operation->isError()) {
-        KMessageBox::error(this,
-                operation->errorName() + ": " + operation->errorMessage());
-    }
-}
-
-#endif
-
 void MainWindow::showConfiguration()
 {
    if (KConfigDialog::showDialog("settings")) {
@@ -243,7 +190,6 @@ void MainWindow::showConfiguration()
    KConfigDialog *dialog = new KConfigDialog(this, "settings", KrfbConfig::self());
    dialog->addPage(new TCP, i18n("Network"), "network-workgroup");
    dialog->addPage(new Security, i18n("Security"), "security-high");
-    dialog->setHelp(QString(), "krfb");
    dialog->show();
 }

--- a/krfb/mainwindow.h
+++ b/krfb/mainwindow.h
@@ -15,17 +15,6 @@

 #include <KXmlGuiWindow>

-#ifdef KRFB_WITH_KDE_TELEPATHY
-#include <KTp/contact.h>
-#include <TelepathyQt/PendingReady>
-namespace KTp {
-    class ContactViewWidget;
-}
-namespace Tp {
-    class PendingOperation;
-}
-#endif
-
 class KLineEdit;

 class MainWindow : public KXmlGuiWindow
@@ -40,8 +29,8 @@ class MainWindow : public KXmlGuiWindow
        void showConfiguration();

    protected:
-        virtual void readProperties(const KConfigGroup & group);
-        virtual void saveProperties(KConfigGroup & group);
+        void readProperties(const KConfigGroup & group) override;
+        void saveProperties(KConfigGroup & group) override;

    private Q_SLOTS:
        void editPassword();
@@ -50,19 +39,11 @@ class MainWindow : public KXmlGuiWindow
        void passwordChanged(const QString&);
        void aboutConnectionAddress();
        void aboutUnattendedMode();
-#ifdef KRFB_WITH_KDE_TELEPATHY
-        void onContactDoubleClicked(const Tp::AccountPtr &, const KTp::ContactPtr &);
-        void pendingDesktopShareFinished(Tp::PendingOperation*);
-#endif

    private:
        Ui::MainWidget m_ui;
        bool m_passwordEditable;
        KLineEdit *m_passwordLineEdit;
-#ifdef KRFB_WITH_KDE_TELEPATHY
-        KTp::ContactViewWidget *m_contactViewWidget;
-#endif
-
 };

 #endif
--- a/krfb/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
+++ b/krfb/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.krfb_rfb_handler
-Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb --nodialog
--- a/krfb/org.kde.krfb.appdata.xml
+++ b/krfb/org.kde.krfb.appdata.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>org.kde.krfb.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2+</project_license>
+  <name>Krfb</name>
+  <name xml:lang="ca">Krfb</name>
+  <name xml:lang="ca-valencia">Krfb</name>
+  <name xml:lang="cs">Krfb</name>
+  <name xml:lang="de">Krfb</name>
+  <name xml:lang="en-GB">Krfb</name>
+  <name xml:lang="es">Krfb</name>
+  <name xml:lang="it">Krfb</name>
+  <name xml:lang="nl">Krfb</name>
+  <name xml:lang="pl">Krfb</name>
+  <name xml:lang="pt">Krfb</name>
+  <name xml:lang="sk">Krfb</name>
+  <name xml:lang="sl">Krfb</name>
+  <name xml:lang="sr">КРФБ</name>
+  <name xml:lang="sr-Latn">KRFB</name>
+  <name xml:lang="sr-ijekavian">КРФБ</name>
+  <name xml:lang="sr-ijekavianlatin">KRFB</name>
+  <name xml:lang="sv">Krfb</name>
+  <name xml:lang="tr">Krfb</name>
+  <name xml:lang="uk">Krfb</name>
+  <name xml:lang="x-test">xxKrfbxx</name>
+  <name xml:lang="zh-CN">Krfb</name>
+  <summary>Desktop sharing</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="de">Freigabe der Arbeitsfläche</summary>
+  <summary xml:lang="en-GB">Desktop sharing</summary>
+  <summary xml:lang="es">Compartir el escritorio</summary>
+  <summary xml:lang="it">Condivisione del desktop</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="sk">Zdieľanie pracovnej plochy</summary>
+  <summary xml:lang="sl">Souporaba namizja</summary>
+  <summary xml:lang="sr">Дељење површи</summary>
+  <summary xml:lang="sr-Latn">Deljenje površi</summary>
+  <summary xml:lang="sr-ijekavian">Дељење површи</summary>
+  <summary xml:lang="sr-ijekavianlatin">Deljenje površi</summary>
+  <summary xml:lang="sv">Skrivbordsdelning</summary>
+  <summary xml:lang="tr">Masaüstü paylaşımı</summary>
+  <summary xml:lang="uk">Спільне користування стільницею</summary>
+  <summary xml:lang="x-test">xxDesktop sharingxx</summary>
+  <summary xml:lang="zh-CN">桌面共享</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="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="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="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="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="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>
+    <p xml:lang="sr-Latn">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="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="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>
+  </description>
+  <url type="homepage">https://www.kde.org</url>
+  <url type="bugtracker">https://bugs.kde.org</url>
+  <url type="donation">https://www.kde.org/community/donations</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>
+        https://cdn.kde.org/screenshots/krfb/krfb.png
+      </image>
+    </screenshot>
+  </screenshots>
+  <provides>
+    <binary>krfb</binary>
+  </provides>
+  <project_group>KDE</project_group>
+</component>
--- a/krfb/org.kde.krfb.desktop
+++ b/krfb/org.kde.krfb.desktop
@@ -1,7 +1,7 @@
 # KDE Config File
 [Desktop Entry]
 Type=Application
-Exec=krfb -caption %c %i
+Exec=krfb -qwindowtitle %c %i
 Icon=krfb
 X-DBUS-StartupType=Unique
 X-DocPath=krfb/index.html
@@ -76,13 +76,13 @@ Name[zh_HK]=Krfb
 Name[zh_TW]=桌面分享_Krfb
 GenericName=Desktop Sharing
 GenericName[ar]=مشاركة سطح المكتب
-GenericName[ast]=Escritoriu compartíu
+GenericName[ast]=Compartición d'escritoriu
 GenericName[bg]=Споделяне на работния плот
 GenericName[bn]=ডেস্কটপ ভাগাভাগি
 GenericName[br]=Rannañ ar vurev
 GenericName[bs]=Dijeljenje radne površine
-GenericName[ca]=Compartició de l'escriptori
-GenericName[ca@valencia]=Compartició de l'escriptori
+GenericName[ca]=Compartir l'escriptori
+GenericName[ca@valencia]=Compartir l'escriptori
 GenericName[cs]=Sdílení pracovní plochy
 GenericName[cy]=Rhannu Penbwrdd
 GenericName[da]=Skrivebordsdeling
@@ -110,7 +110,7 @@ GenericName[ja]=デスクトップ共有
 GenericName[kk]=Үстелді ортақтастыру
 GenericName[km]=ការចែករំលែកផ្ទៃតុ
 GenericName[ko]=데스크톱 공유
-GenericName[lt]=Dalinimasis darbastaliu
+GenericName[lt]=Dalinimasis darbalaukiu
 GenericName[lv]=Darbvirsmas koplietošana
 GenericName[ml]=പണിയിടം പങ്കുവെക്കല്‍
 GenericName[mr]=डेस्कटॉप शेअरींग
@@ -144,4 +144,76 @@ GenericName[x-test]=xxDesktop Sharingxx
 GenericName[zh_CN]=桌面共享
 GenericName[zh_HK]=桌面分享
 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
+Comment[bs]=Dijeljenje radne površine
+Comment[ca]=Compartir l'escriptori
+Comment[ca@valencia]=Compartir l'escriptori
+Comment[cs]=Sdílení pracovní plochy
+Comment[cy]=Rhannu Penbwrdd
+Comment[da]=Skrivebordsdeling
+Comment[de]=Arbeitsflächen-Freigabe
+Comment[el]=Κοινή χρήση επιφάνειας εργασίας
+Comment[en_GB]=Desktop Sharing
+Comment[eo]=Tabula komunigado
+Comment[es]=Escritorio compartido
+Comment[et]=Töölaua jagamine
+Comment[eu]=Mahaigaina partekatzea
+Comment[fi]=Työpöydän jakaminen
+Comment[fr]=Partage de bureaux
+Comment[ga]=Roinnt Deisce
+Comment[gl]=Compartición do escritorio
+Comment[he]=שיתוף שולחנות עבודה
+Comment[hi]=डेस्कटॉप साझेदारी
+Comment[hne]=डेस्कटाप साझेदारी
+Comment[hr]=Dijeljenje radne površine
+Comment[hu]=Munkaasztal-megosztás
+Comment[ia]=Compartir de scriptorio
+Comment[is]=Skjáborðamiðlun
+Comment[it]=Condivisione del desktop
+Comment[ja]=デスクトップ共有
+Comment[kk]=Үстелді ортақтастыру
+Comment[km]=ការចែករំលែកផ្ទែតុ
+Comment[ko]=데스크톱 공유
+Comment[lt]=Dalinimasis darbalaukiu
+Comment[lv]=Darbvirsmas koplietošana
+Comment[mk]=Делење на работната површина
+Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍
+Comment[mr]=डेस्कटॉप शेअरींग
+Comment[ms]=Perkongsian Ruang Kerja
+Comment[nb]=Delte skrivebord
+Comment[nds]=Schriefdisch-Freegaav
+Comment[nl]=Bureaublad delen
+Comment[nn]=Skrivebordsdeling
+Comment[pa]=ਡੈਸਕਟਾਪ ਸ਼ੇਅਰਿੰਗ
+Comment[pl]=Współdzielenie pulpitu
+Comment[pt]=Partilha do Ecrã
+Comment[pt_BR]=Compartilhamento do ambiente de trabalho
+Comment[ro]=Partajare birou
+Comment[ru]=Параметры общего рабочего стола
+Comment[si]=වැඩතල හවුල්
+Comment[sk]=Zdieľanie pracovnej plochy
+Comment[sl]=Souporaba namizja
+Comment[sr]=Дељење површи
+Comment[sr@ijekavian]=Дијељење површи
+Comment[sr@ijekavianlatin]=Dijeljenje površi
+Comment[sr@latin]=Deljenje površi
+Comment[sv]=Dela ut skrivbordet
+Comment[ta]=பணிமேடை பகிர்வு
+Comment[tg]=Истифодаи Муштараки Мизи Корӣ
+Comment[th]=ใช้งานพื้นที่ทำงานร่วมกัน
+Comment[tr]=Masaüstü Paylaşımı
+Comment[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
+Comment[uk]=Спільні стільниці
+Comment[xh]=Ulwahlulelano lwe Desktop
+Comment[x-test]=xxDesktop Sharingxx
+Comment[zh_CN]=桌面共享
+Comment[zh_HK]=桌面分享
+Comment[zh_TW]=桌面分享
 Categories=Qt;KDE;System;Network;RemoteAccess;
+X-DBUS-ServiceName=org.kde.krfb
--- a/krfb/rfb.h
+++ b/krfb/rfb.h
@@ -8,6 +8,10 @@

 #include "rfb/rfb.h"

+#ifdef max
+#undef max
+#endif
+
 #undef TRUE
 #undef FALSE

--- a/krfb/rfbclient.cpp
+++ b/krfb/rfbclient.cpp
@@ -23,8 +23,7 @@
 #include "sockethelpers.h"
 #include "events.h"
 #include <QtCore/QSocketNotifier>
-#include <KDebug>
-#include <KNotification>
+#include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()

@@ -49,12 +48,12 @@ RfbClient::RfbClient(rfbClientPtr client, QObject* parent)

    d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
    d->notifier->setEnabled(false);
-    connect(d->notifier, SIGNAL(activated(int)), this, SLOT(onSocketActivated()));
+    connect(d->notifier, &QSocketNotifier::activated, this, &RfbClient::onSocketActivated);
 }

 RfbClient::~RfbClient()
 {
-    kDebug();
+    //qDebug();
    delete d;
 }

@@ -140,7 +139,7 @@ void RfbClient::onSocketActivated()
        //the clientGoneHook which in turn will remove this RfbClient instance
        //from the server manager and will call deleteLater() to delete it
        if (d->client->sock == -1) {
-            kDebug() << "disconnected from socket signal";
+            //qDebug() << "disconnected from socket signal";
            d->notifier->setEnabled(false);
            rfbClientConnectionGone(d->client);
            break;
@@ -159,7 +158,7 @@ void RfbClient::update()
    //the clientGoneHook which in turn will remove this RfbClient instance
    //from the server manager and will call deleteLater() to delete it
    if (d->client->sock == -1) {
-        kDebug() << "disconnected during update";
+        //qDebug() << "disconnected during update";
        d->notifier->setEnabled(false);
        rfbClientConnectionGone(d->client);
    }
@@ -178,7 +177,7 @@ PendingRfbClient::~PendingRfbClient()

 void PendingRfbClient::accept(RfbClient *newClient)
 {
-    kDebug() << "accepted connection";
+    //qDebug() << "accepted connection";

    m_rfbClient->clientData = newClient;
    newClient->setOnHold(false);
@@ -191,7 +190,7 @@ static void clientGoneHookNoop(rfbClientPtr cl) { Q_UNUSED(cl); }

 void PendingRfbClient::reject()
 {
-    kDebug() << "refused connection";
+    //qDebug() << "refused connection";

    //override the clientGoneHook that was previously set by RfbServer
    m_rfbClient->clientGoneHook = clientGoneHookNoop;
--- a/krfb/rfbserver.cpp
+++ b/krfb/rfbserver.cpp
@@ -22,7 +22,7 @@
 #include <QtCore/QSocketNotifier>
 #include <QApplication>
 #include <QClipboard>
-#include <KDebug>
+#include <QDebug>

 struct RfbServer::Private
 {
@@ -90,6 +90,7 @@ bool RfbServer::start()
    if (!d->screen) {
        d->screen = RfbServerManager::instance()->newScreen();
        if (!d->screen) {
+            qDebug() << "Unable to get rbfserver screen";
            return false;
        }

@@ -122,31 +123,31 @@ bool RfbServer::start()
        d->screen->authPasswdData = (void *)0;
    }

-    kDebug() << "Starting server. Listen port:" << listeningPort()
+    qDebug() << "Starting server. Listen port:" << listeningPort()
             << "Listen Address:" << listeningAddress()
             << "Password enabled:" << passwordRequired();

    rfbInitServer(d->screen);

    if (!rfbIsActive(d->screen)) {
-        kDebug() << "Failed to start server";
+        qDebug() << "Failed to start server";
        rfbShutdownServer(d->screen, false);
        return false;
    };

    d->notifier = new QSocketNotifier(d->screen->listenSock, QSocketNotifier::Read, this);
    d->notifier->setEnabled(true);
-    connect(d->notifier, SIGNAL(activated(int)), this, SLOT(onListenSocketActivated()));
-    connect(QApplication::clipboard(), SIGNAL(dataChanged()),
-            this, SLOT(krfbSendServerCutText()));
+    connect(d->notifier, &QSocketNotifier::activated, this, &RfbServer::onListenSocketActivated);
+    connect(QApplication::clipboard(), &QClipboard::dataChanged,
+            this, &RfbServer::krfbSendServerCutText);

    return true;
 }

-void RfbServer::stop(bool disconnectClients)
+void RfbServer::stop()
 {
    if (d->screen) {
-        rfbShutdownServer(d->screen, disconnectClients);
+        rfbShutdownServer(d->screen, true);
        if (d->notifier) {
            d->notifier->setEnabled(false);
            d->notifier->deleteLater();
@@ -187,13 +188,13 @@ void krfb_rfbSetCursorPosition(rfbScreenInfoPtr screen, rfbClientPtr client, int
    /* Inform all clients about this cursor movement. */
    iterator = rfbGetClientIterator(screen);
    while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
-        cl->cursorWasMoved = TRUE;
+        cl->cursorWasMoved = true;
    }
    rfbReleaseClientIterator(iterator);

    /* The cursor was moved by this client, so don't send CursorPos. */
    if (client) {
-        client->cursorWasMoved = FALSE;
+        client->cursorWasMoved = false;
    }
 }

@@ -220,7 +221,7 @@ void RfbServer::onListenSocketActivated()

 void RfbServer::pendingClientFinished(RfbClient *client)
 {
-    kDebug();
+    //qDebug();
    if (client) {
        RfbServerManager::instance()->addClient(client);
        client->getRfbClientPtr()->clientGoneHook = clientGoneHook;
@@ -230,12 +231,12 @@ void RfbServer::pendingClientFinished(RfbClient *client)
 //static
 rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 {
-    kDebug() << "New client";
+    //qDebug() << "New client";
    RfbServer *server = static_cast<RfbServer*>(cl->screen->screenData);

    PendingRfbClient *pendingClient = server->newClient(cl);
-    connect(pendingClient, SIGNAL(finished(RfbClient*)),
-            server, SLOT(pendingClientFinished(RfbClient*)));
+    connect(pendingClient, &PendingRfbClient::finished,
+            server, &RfbServer::pendingClientFinished);

    return RFB_CLIENT_ON_HOLD;
 }
@@ -243,7 +244,7 @@ rfbNewClientAction RfbServer::newClientHook(rfbClientPtr cl)
 //static
 void RfbServer::clientGoneHook(rfbClientPtr cl)
 {
-    kDebug() << "client gone";
+    //qDebug() << "client gone";
    RfbClient *client = static_cast<RfbClient*>(cl->clientData);

    RfbServerManager::instance()->removeClient(client);
@@ -273,7 +274,7 @@ void RfbServer::pointerHook(int bm, int x, int y, rfbClientPtr cl)
 }

 //static
-void RfbServer::clipboardHook(char *str, int len, rfbClientPtr cl)
+void RfbServer::clipboardHook(char *str, int len, rfbClientPtr /*cl*/)
 {
    QApplication::clipboard()->setText(QString::fromLocal8Bit(str,len));
 }
--- a/krfb/rfbserver.h
+++ b/krfb/rfbserver.h
@@ -41,7 +41,7 @@ public:

 public Q_SLOTS:
    virtual bool start();
-    virtual void stop(bool disconnectClients = true);
+    virtual void stop();

    void updateScreen(const QList<QRect> & modifiedTiles);
    void updateCursorPosition(const QPoint & position);
--- a/krfb/rfbservermanager.cpp
+++ b/krfb/rfbservermanager.cpp
@@ -25,12 +25,13 @@
 #include "sockethelpers.h"
 #include "krfbconfig.h"
 #include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QGlobalStatic>
 #include <QtNetwork/QHostInfo>
-#include <KGlobal>
-#include <KDebug>
-#include <KLocale>
+#include <QDebug>
+
+#include <KLocalizedString>
 #include <KUser>
 #include <KNotification>

@@ -82,7 +83,7 @@ struct RfbServerManagerStatic
    RfbServerManager server;
 };

-K_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)
+Q_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)

 RfbServerManager* RfbServerManager::instance()
 {
@@ -114,7 +115,7 @@ RfbServerManager::~RfbServerManager()

 void RfbServerManager::init()
 {
-    kDebug();
+    //qDebug();

    d->fb = FrameBufferManager::instance()->frameBuffer(QApplication::desktop()->winId());
    d->myCursor = rfbMakeXCursor(19, 19, (char *) cur, (char *) mask);
@@ -122,8 +123,8 @@ void RfbServerManager::init()
    d->desktopName = QString("%1@%2 (shared desktop)") //FIXME check if we can use utf8
                        .arg(KUser().loginName(),QHostInfo::localHostName()).toLatin1();

-    connect(&d->rfbUpdateTimer, SIGNAL(timeout()), SLOT(updateScreens()));
-    connect(qApp, SIGNAL(aboutToQuit()), SLOT(cleanup()));
+    connect(&d->rfbUpdateTimer, &QTimer::timeout, this, &RfbServerManager::updateScreens);
+    connect(qApp, &QApplication::aboutToQuit, this, &RfbServerManager::cleanup);
 }

 void RfbServerManager::updateScreens()
@@ -147,7 +148,7 @@ void RfbServerManager::updateScreens()

 void RfbServerManager::cleanup()
 {
-    kDebug();
+    //qDebug();

    //copy because d->servers is going to be modified while we delete the servers
    QSet<RfbServer*> servers = d->servers;
@@ -187,7 +188,7 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
            bpp = 4;
        }

-        kDebug() << "bpp: " << bpp;
+        //qDebug() << "bpp: " << bpp;

        rfbLogEnable(0);

@@ -206,7 +207,7 @@ rfbScreenInfoPtr RfbServerManager::newScreen()
 void RfbServerManager::addClient(RfbClient* cc)
 {
    if (d->clients.size() == 0) {
-        kDebug() << "Starting framebuffer monitor";
+        //qDebug() << "Starting framebuffer monitor";
        d->fb->startMonitor();
        d->rfbUpdateTimer.start(50);
    }
@@ -222,7 +223,7 @@ void RfbServerManager::removeClient(RfbClient* cc)
 {
    d->clients.remove(cc);
    if (d->clients.size() == 0) {
-        kDebug() << "Stopping framebuffer monitor";
+        //qDebug() << "Stopping framebuffer monitor";
        d->fb->stopMonitor();
        d->rfbUpdateTimer.stop();
    }
--- a/krfb/rfbservermanager.h
+++ b/krfb/rfbservermanager.h
@@ -24,7 +24,7 @@
 #include <QtCore/QObject>

 class RfbClient;
-class RfbServerManagerStatic;
+struct RfbServerManagerStatic;
 class RfbServer;

 class RfbServerManager : public QObject
@@ -56,7 +56,7 @@ private:
    Q_DISABLE_COPY(RfbServerManager)

    friend class RfbServer;
-    friend class RfbServerManagerStatic;
+    friend struct RfbServerManagerStatic;

    struct Private;
    Private *const d;
--- a/krfb/trayicon.cpp
+++ b/krfb/trayicon.cpp
@@ -22,49 +22,51 @@
 #include "rfbservermanager.h"
 #include "rfbclient.h"

+#include <QIcon>
+#include <QMenu>
+
 #include <KAboutApplicationDialog>
 #include <KActionCollection>
-#include <KDialog>
-#include <KGlobal>
-#include <KLocale>
-#include <KMenu>
+#include <QDialog>
+#include <KHelpMenu>
+#include <KLocalizedString>
 #include <KStandardAction>
-#include <KDebug>
-
+#include <KToggleAction>
+#include <KConfigGroup>

 class ClientActions
 {
 public:
-    ClientActions(RfbClient *client, KMenu *menu, QAction *before);
+    ClientActions(RfbClient *client, QMenu *menu, QAction *before);
    virtual ~ClientActions();

 private:
-    KMenu *m_menu;
+    QMenu *m_menu;
    QAction *m_title;
    QAction *m_disconnectAction;
    QAction *m_enableControlAction;
    QAction *m_separator;
 };

-ClientActions::ClientActions(RfbClient* client, KMenu* menu, QAction* before)
+ClientActions::ClientActions(RfbClient* client, QMenu* menu, QAction* before)
    : m_menu(menu)
 {
-    m_title = m_menu->addTitle(client->name(), before);
+    m_title = m_menu->insertSection(before, client->name());

-    m_disconnectAction = new KAction(i18n("Disconnect"), m_menu);
+    m_disconnectAction = new QAction(i18n("Disconnect"), m_menu);
    m_menu->insertAction(before, m_disconnectAction);

-    QObject::connect(m_disconnectAction, SIGNAL(triggered()), client, SLOT(closeConnection()));
+    QObject::connect(m_disconnectAction, &QAction::triggered, client, &RfbClient::closeConnection);

    if (client->controlCanBeEnabled()) {
        m_enableControlAction = new KToggleAction(i18n("Enable Remote Control"), m_menu);
        m_enableControlAction->setChecked(client->controlEnabled());
        m_menu->insertAction(before, m_enableControlAction);

-        QObject::connect(m_enableControlAction, SIGNAL(triggered(bool)),
-                         client, SLOT(setControlEnabled(bool)));
-        QObject::connect(client, SIGNAL(controlEnabledChanged(bool)),
-                         m_enableControlAction, SLOT(setChecked(bool)));
+        QObject::connect(m_enableControlAction, &KToggleAction::triggered,
+                         client, &RfbClient::setControlEnabled);
+        QObject::connect(client, &RfbClient::controlEnabledChanged,
+                         m_enableControlAction, &KToggleAction::setChecked);
    } else {
        m_enableControlAction = NULL;
    }
@@ -74,8 +76,6 @@ ClientActions::ClientActions(RfbClient* client, KMenu* menu, QAction* before)

 ClientActions::~ClientActions()
 {
-    kDebug();
-
    m_menu->removeAction(m_title);
    delete m_title;

@@ -96,24 +96,22 @@ ClientActions::~ClientActions()
 TrayIcon::TrayIcon(QWidget *mainWindow)
    : KStatusNotifierItem(mainWindow)
 {
-    setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
+    setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));

    setToolTipTitle(i18n("Desktop Sharing - disconnected"));
    setCategory(KStatusNotifierItem::ApplicationStatus);

-    connect(RfbServerManager::instance(), SIGNAL(clientConnected(RfbClient*)),
-            this, SLOT(onClientConnected(RfbClient*)));
-    connect(RfbServerManager::instance(), SIGNAL(clientDisconnected(RfbClient*)),
-            this, SLOT(onClientDisconnected(RfbClient*)));
+    connect(RfbServerManager::instance(), &RfbServerManager::clientConnected,
+            this, &TrayIcon::onClientConnected);
+    connect(RfbServerManager::instance(), &RfbServerManager::clientDisconnected,
+            this, &TrayIcon::onClientDisconnected);

-    m_aboutAction = KStandardAction::aboutApp(this, SLOT(showAbout()), actionCollection());
+    m_aboutAction = KStandardAction::aboutApp(this, SLOT(showAbout()), this);
    contextMenu()->addAction(m_aboutAction);
 }

 void TrayIcon::onClientConnected(RfbClient* client)
 {
-    kDebug();
-
    if (m_clientActions.isEmpty()) { //first client connected
        setIconByName("krfb");
        setToolTipTitle(i18n("Desktop Sharing - connected with %1", client->name()));
@@ -127,13 +125,11 @@ void TrayIcon::onClientConnected(RfbClient* client)

 void TrayIcon::onClientDisconnected(RfbClient* client)
 {
-    kDebug();
-
    ClientActions *actions = m_clientActions.take(client);
    delete actions;

    if (m_clientActions.isEmpty()) {
-        setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
+        setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
        setToolTipTitle(i18n("Desktop Sharing - disconnected"));
        setStatus(KStatusNotifierItem::Passive);
    } else if (m_clientActions.size() == 1) { //clients number dropped back to 1
@@ -144,9 +140,8 @@ void TrayIcon::onClientDisconnected(RfbClient* client)

 void TrayIcon::showAbout()
 {
-    KDialog *dlg = new KAboutApplicationDialog(KGlobal::mainComponent().aboutData());
-    dlg->setAttribute(Qt::WA_DeleteOnClose, true);
-    dlg->show();
+    KHelpMenu menu;
+    menu.aboutApplication();
 }

 #include "trayicon.moc"
--- a/krfb/trayicon.h
+++ b/krfb/trayicon.h
@@ -19,9 +19,7 @@
 #define TRAYICON_H

 #include <KStatusNotifierItem>
-#include <KToggleAction>

-class KDialog;
 class RfbClient;
 class ClientActions;

@@ -42,7 +40,7 @@ public Q_SLOTS:
    void showAbout();

 private:
-    KAction *m_aboutAction;
+    QAction *m_aboutAction;
    QHash<RfbClient*, ClientActions*> m_clientActions;
 };

--- a/krfb/tubesrfbclient.cpp
+++ b/krfb/tubesrfbclient.cpp
@@ -1,87 +0,0 @@
-/*
-    Copyright (C) 2009-2010 Collabora Ltd. <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tubesrfbclient.h"
-#include "krfbconfig.h"
-#include "connectiondialog.h"
-#include <KNotification>
-#include <KLocale>
-
-QString TubesRfbClient::name() const
-{
-    return m_contact->alias();
-}
-
-//********
-
-PendingTubesRfbClient::PendingTubesRfbClient(rfbClientPtr client, QObject* parent) :
-    PendingRfbClient(client, parent),
-    m_processNewClientCalled(false)
-{
-    processNewClient();
-}
-
-void PendingTubesRfbClient::setContact(const Tp::ContactPtr & contact)
-{
-    m_contact = contact;
-    if (m_processNewClientCalled) {
-        //processNewClient has already been called, so we need to act here
-        showConfirmationDialog();
-    }
-}
-
-void PendingTubesRfbClient::processNewClient()
-{
-    if (!m_contact) {
-        //no associated contact yet, hold.
-        m_processNewClientCalled = true; //act when a contact is set
-    } else {
-        //we have a contact, begin handling
-        showConfirmationDialog();
-    }
-}
-
-void PendingTubesRfbClient::showConfirmationDialog()
-{
-    QString name = m_contact->alias();
-
-    KNotification::event("NewConnectionOnHold",
-                        i18n("Received connection from %1, on hold (waiting for confirmation)",
-                            name));
-
-    TubesConnectionDialog *dialog = new TubesConnectionDialog(0);
-    dialog->setContactName(name);
-    dialog->setAllowRemoteControl(KrfbConfig::allowDesktopControl());
-
-    connect(dialog, SIGNAL(okClicked()), SLOT(dialogAccepted()));
-    connect(dialog, SIGNAL(cancelClicked()), SLOT(reject()));
-
-    dialog->show();
-}
-
-void PendingTubesRfbClient::dialogAccepted()
-{
-    TubesConnectionDialog *dialog = qobject_cast<TubesConnectionDialog *>(sender());
-    Q_ASSERT(dialog);
-
-    TubesRfbClient *client = new TubesRfbClient(m_rfbClient, m_contact, parent());
-    client->setControlEnabled(dialog->allowRemoteControl());
-    accept(client);
-}
-
-#include "tubesrfbclient.moc"
--- a/krfb/tubesrfbclient.h
+++ b/krfb/tubesrfbclient.h
@@ -1,60 +0,0 @@
-/*
-    Copyright (C) 2010 Collabora Ltd. <info@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef TUBESRFBCLIENT_H
-#define TUBESRFBCLIENT_H
-
-#include "rfbclient.h"
-#include <TelepathyQt/Contact>
-
-class TubesRfbClient : public RfbClient
-{
-public:
-    TubesRfbClient(rfbClientPtr client,
-            const Tp::ContactPtr &contact, QObject *parent=0)
-        : RfbClient(client, parent), m_contact(contact)
-    {}
-
-    virtual QString name() const;
-
-private:
-    Tp::ContactPtr m_contact;
-};
-
-//*********
-
-class PendingTubesRfbClient : public PendingRfbClient
-{
-    Q_OBJECT
-public:
-    PendingTubesRfbClient(rfbClientPtr client, QObject* parent = 0);
-
-    void setContact(const Tp::ContactPtr & contact);
-
-protected Q_SLOTS:
-    virtual void processNewClient();
-
-private Q_SLOTS:
-    void showConfirmationDialog();
-    void dialogAccepted();
-
-private:
-    Tp::ContactPtr m_contact;
-    bool m_processNewClientCalled;
-};
-
-#endif // TUBESRFBCLIENT_H
--- a/krfb/tubesrfbserver.cpp
+++ b/krfb/tubesrfbserver.cpp
@@ -1,262 +0,0 @@
-/*
-    Copyright (C) 2009-2011 Collabora Ltd. <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "tubesrfbserver.h"
-#include "tubesrfbclient.h"
-#include "sockethelpers.h"
-
-#include <KDebug>
-#include <KRandom>
-
-#include <TelepathyQt/Debug>
-#include <TelepathyQt/Contact>
-#include <TelepathyQt/AccountFactory>
-#include <TelepathyQt/ConnectionFactory>
-#include <TelepathyQt/ContactFactory>
-#include <TelepathyQt/ChannelFactory>
-#include <TelepathyQt/OutgoingStreamTubeChannel>
-#include <TelepathyQt/StreamTubeServer>
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-#include <TelepathyQt/AccountSet>
-#include <TelepathyQt/AccountManager>
-#include <TelepathyQt/PendingReady>
-#include <KTp/Models/contacts-list-model.h>
-#include <KTp/contact-factory.h>
-#endif
-
-struct TubesRfbServer::Private
-{
-    Tp::StreamTubeServerPtr stubeServer;
-    QHash<quint16, Tp::ContactPtr> contactsPerPort;
-    QHash<quint16, PendingTubesRfbClient*> clientsPerPort;
-};
-
-//static
-TubesRfbServer *TubesRfbServer::instance;
-
-//static
-void TubesRfbServer::init()
-{
-    instance = new TubesRfbServer;
-    //RfbServerManager takes care of deletion
-
-    instance->startAndCheck();
-}
-
-TubesRfbServer::TubesRfbServer(QObject *parent)
-    : RfbServer(parent), d(new Private)
-{
-    kDebug() << "starting";
-
-    Tp::enableDebug(true);
-    Tp::enableWarnings(true);
-    Tp::registerTypes();
-
-    Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(
-            QDBusConnection::sessionBus(),
-            Tp::Features() << Tp::Account::FeatureCore
-            << Tp::Account::FeatureAvatar
-            << Tp::Account::FeatureCapabilities
-            << Tp::Account::FeatureProtocolInfo
-            << Tp::Account::FeatureProfile);
-
-    Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(
-            QDBusConnection::sessionBus(),
-            Tp::Features() << Tp::Connection::FeatureCore
-            << Tp::Connection::FeatureSelfContact);
-
-    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(
-            QDBusConnection::sessionBus());
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(
-            Tp::Features() << Tp::Contact::FeatureAlias
-            <<Tp::Contact::FeatureAvatarToken
-            <<Tp::Contact::FeatureAvatarData
-            <<Tp::Contact::FeatureSimplePresence
-            <<Tp::Contact::FeatureCapabilities
-            <<Tp::Contact::FeatureClientTypes);
-
-    m_accountManager = Tp::AccountManager::create(
-            QDBusConnection::sessionBus(),
-            accountFactory,
-            connectionFactory,
-            channelFactory,
-            contactFactory);
-
-    d->stubeServer = Tp::StreamTubeServer::create(
-            m_accountManager,
-            QStringList() << QLatin1String("rfb"),
-            QStringList(),
-            QLatin1String("krfb_rfb_handler"),
-            true);
-
-    connect(m_accountManager->becomeReady(),
-            SIGNAL(finished(Tp::PendingOperation*)),
-            this,
-            SLOT(onAccountManagerReady()));
-
-    m_contactsListModel = new KTp::ContactsListModel(this);
-#else
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(
-            Tp::Contact::FeatureAlias);
-
-    d->stubeServer = Tp::StreamTubeServer::create(
-            QStringList() << QLatin1String("rfb"),
-            QStringList(),
-            QLatin1String("krfb_rfb_handler"),
-            true,
-            accountFactory,
-            connectionFactory,
-            channelFactory,
-            contactFactory);
-#endif  //KRFB_WITH_KDE_TELEPATHY
-
-    connect(d->stubeServer.data(),
-            SIGNAL(tubeRequested(Tp::AccountPtr,Tp::OutgoingStreamTubeChannelPtr,
-                                 QDateTime,Tp::ChannelRequestHints)),
-            SLOT(onTubeRequested()));
-    connect(d->stubeServer.data(),
-            SIGNAL(tubeClosed(Tp::AccountPtr,Tp::OutgoingStreamTubeChannelPtr,QString,QString)),
-            SLOT(onTubeClosed()));
-
-    connect(d->stubeServer.data(),
-            SIGNAL(newTcpConnection(QHostAddress,quint16,Tp::AccountPtr,
-                                    Tp::ContactPtr,Tp::OutgoingStreamTubeChannelPtr)),
-            SLOT(onNewTcpConnection(QHostAddress,quint16,Tp::AccountPtr,
-                                    Tp::ContactPtr,Tp::OutgoingStreamTubeChannelPtr)));
-    connect(d->stubeServer.data(),
-            SIGNAL(tcpConnectionClosed(QHostAddress,quint16,Tp::AccountPtr,Tp::ContactPtr,
-                                       QString,QString,Tp::OutgoingStreamTubeChannelPtr)),
-            SLOT(onTcpConnectionClosed(QHostAddress,quint16,Tp::AccountPtr,Tp::ContactPtr,
-                                       QString,QString,Tp::OutgoingStreamTubeChannelPtr)));
-
-    // Pick a random port in the private range (49152–65535)
-    setListeningPort((KRandom::random() % 16383) + 49152);
-    // Listen only on the loopback network interface
-    setListeningAddress("127.0.0.1");
-    setPasswordRequired(false);
-}
-
-TubesRfbServer::~TubesRfbServer()
-{
-    kDebug();
-    stop();
-    delete d;
-}
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-KTp::ContactsListModel *TubesRfbServer::contactsListModel()
-{
-    return m_contactsListModel;
-}
-#endif
-
-void TubesRfbServer::startAndCheck()
-{
-    if (!start()) {
-        //try a few times with different ports
-        bool ok = false;
-        for (int i=0; !ok && i<5; i++) {
-            setListeningPort((KRandom::random() % 16383) + 49152);
-            ok = start();
-        }
-
-        if (!ok) {
-            kError() << "Failed to start tubes rfb server";
-            return;
-        }
-    }
-
-    //TODO listeningAddress() should be a QHostAddress
-    d->stubeServer->exportTcpSocket(QHostAddress(QString::fromAscii(listeningAddress())),
-                                    listeningPort());
-}
-
-void TubesRfbServer::onTubeRequested()
-{
-    kDebug() << "Got a tube";
-}
-
-void TubesRfbServer::onTubeClosed()
-{
-    kDebug() << "tube closed";
-}
-
-void TubesRfbServer::onNewTcpConnection(const QHostAddress & sourceAddress,
-                                        quint16 sourcePort,
-                                        const Tp::AccountPtr & account,
-                                        const Tp::ContactPtr & contact,
-                                        const Tp::OutgoingStreamTubeChannelPtr & tube)
-{
-    Q_UNUSED(account);
-    Q_UNUSED(tube);
-
-    kDebug() << "CM signaled tube connection from" << sourceAddress << ":" << sourcePort;
-
-    d->contactsPerPort[sourcePort] = contact;
-    if (d->clientsPerPort.contains(sourcePort)) {
-        kDebug() << "client already exists";
-        d->clientsPerPort[sourcePort]->setContact(contact);
-    }
-}
-
-void TubesRfbServer::onTcpConnectionClosed(const QHostAddress& sourceAddress,
-                                           quint16 sourcePort,
-                                           const Tp::AccountPtr& account,
-                                           const Tp::ContactPtr& contact,
-                                           const QString& error,
-                                           const QString& message,
-                                           const Tp::OutgoingStreamTubeChannelPtr& tube)
-{
-    Q_UNUSED(account);
-    Q_UNUSED(contact);
-    Q_UNUSED(tube);
-
-    kDebug() << "Connection from" << sourceAddress << ":" << sourcePort << "closed."
-             << error << message;
-
-    d->clientsPerPort.remove(sourcePort);
-    d->contactsPerPort.remove(sourcePort);
-}
-
-PendingRfbClient* TubesRfbServer::newClient(rfbClientPtr client)
-{
-    PendingTubesRfbClient *c = new PendingTubesRfbClient(client, this);
-    quint16 port = peerPort(client->sock);
-
-    kDebug() << "new tube client on port" << port;
-
-    d->clientsPerPort[port] = c;
-    if (d->contactsPerPort.contains(port)) {
-        kDebug() << "already have a contact";
-        c->setContact(d->contactsPerPort[port]);
-    }
-
-    return c;
-}
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-void TubesRfbServer::onAccountManagerReady()
-{
-    m_contactsListModel->setAccountManager(m_accountManager);
-}
-#endif
-
-#include "tubesrfbserver.moc"
--- a/krfb/tubesrfbserver.h
+++ b/krfb/tubesrfbserver.h
@@ -1,86 +0,0 @@
-/*
-    Copyright (C) 2009-2011 Collabora Ltd. <info@collabora.co.uk>
-      @author George Goldberg <george.goldberg@collabora.co.uk>
-      @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef TUBESRFBSERVER_H
-#define TUBESRFBSERVER_H
-
-#include "rfbserver.h"
-#include <QtNetwork/QHostAddress>
-#include <TelepathyQt/Types>
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-namespace KTp {
-    class ContactsListModel;
-}
-#endif
-
-class TubesRfbServer : public RfbServer
-{
-    Q_OBJECT
-public:
-    static TubesRfbServer *instance;
-    static void init();
-
-    virtual ~TubesRfbServer();
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    KTp::ContactsListModel *contactsListModel();
-#endif
-
-protected:
-    TubesRfbServer(QObject *parent = 0);
-
-    virtual PendingRfbClient* newClient(rfbClientPtr client);
-
-private Q_SLOTS:
-    void startAndCheck();
-
-    void onTubeRequested();
-    void onTubeClosed();
-
-    void onNewTcpConnection(
-            const QHostAddress &sourceAddress,
-            quint16 sourcePort,
-            const Tp::AccountPtr &account,
-            const Tp::ContactPtr &contact,
-            const Tp::OutgoingStreamTubeChannelPtr &tube);
-
-    void onTcpConnectionClosed(
-            const QHostAddress &sourceAddress,
-            quint16 sourcePort,
-            const Tp::AccountPtr &account,
-            const Tp::ContactPtr &contact,
-            const QString &error,
-            const QString &message,
-            const Tp::OutgoingStreamTubeChannelPtr &tube);
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    void onAccountManagerReady();
-#endif
-
-private:
-    struct Private;
-    Private *const d;
-
-#ifdef KRFB_WITH_KDE_TELEPATHY
-    KTp::ContactsListModel *m_contactsListModel;
-    Tp::AccountManagerPtr m_accountManager;
-#endif
-
-};
-
-#endif // TUBESRFBSERVER_H
--- a/krfb/ui/invitewidget.ui
+++ b/krfb/ui/invitewidget.ui
@@ -1,171 +0,0 @@
-<ui version="4.0" >
- <class>InviteWidget</class>
- <widget class="QWidget" name="InviteWidget" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>603</width>
-    <height>364</height>
-   </rect>
-  </property>
-  <layout class="QHBoxLayout" >
-   <item>
-    <widget class="QLabel" name="pixmapLabel" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
-      <size>
-       <width>128</width>
-       <height>128</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QLabel" name="TextLabel2" >
-       <property name="font" >
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text" >
-        <string>Welcome to KDE Desktop Sharing</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="helpLabel" >
-       <property name="text" >
-        <string>KDE Desktop Sharing allows you to invite somebody at a remote location to watch and possibly control your desktop. &lt;a href="whatsthis">More about invitations...&lt;/a></string>
-       </property>
-       <property name="textFormat" >
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="wordWrap" >
-        <bool>true</bool>
-       </property>
-       <property name="textInteractionFlags" >
-        <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::NoTextInteraction</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::MinimumExpanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>215</width>
-         <height>101</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>90</width>
-           <height>26</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" >
-         <item>
-          <widget class="QPushButton" name="btnCreateInvite" >
-           <property name="toolTip" >
-            <string/>
-           </property>
-           <property name="whatsThis" >
-            <string>Create a new invitation and display the connection data. Use this option if you want to invite somebody personally, for example, to give the connection data over the phone.</string>
-           </property>
-           <property name="text" >
-            <string>Create &amp;Personal Invitation...</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnEmailInvite" >
-           <property name="whatsThis" >
-            <string>This button will start your email application with a pre-configured text that explains to the recipient how to connect to your computer. </string>
-           </property>
-           <property name="text" >
-            <string>Invite via &amp;Email...</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnManageInvite" >
-           <property name="text" >
-            <string>&amp;Manage Invitations (%1)...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>90</width>
-           <height>26</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>24</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
-  <resources/>
- <connections/>
-</ui>
--- a/krfb/ui/mainwidget.ui
+++ b/krfb/ui/mainwidget.ui
@@ -442,7 +442,7 @@
           </widget>
          </item>
          <item>
-           <widget class="KPushButton" name="unattendedPasswordButton">
+           <widget class="QPushButton" name="unattendedPasswordButton">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
@@ -486,11 +486,6 @@
  </layout>
 </widget>
 <customwidgets>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
 </customwidgets>
 <tabstops>
  <tabstop>enableSharingCheckBox</tabstop>
--- a/krfb/ui/tubesconnectionwidget.ui
+++ b/krfb/ui/tubesconnectionwidget.ui
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TubesConnectionWidget</class>
- <widget class="QWidget" name="TubesConnectionWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>162</height>
-   </rect>
-  </property>
-  <layout class="QHBoxLayout">
-   <item>
-    <widget class="QLabel" name="pixmapLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>128</width>
-       <height>128</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout">
-     <item>
-      <widget class="QLabel" name="TextLabel5">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>13</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Confirmation</string>
-       </property>
-       <property name="wordWrap">
-        <bool>false</bool>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="mainTextLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="lineWidth">
-        <number>-1</number>
-       </property>
-       <property name="midLineWidth">
-        <number>5</number>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::AutoText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="cbAllowRemoteControl">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="whatsThis">
-        <string>If you turn this option on, the remote user can enter keystrokes and use your mouse pointer. This gives them full control over your computer, so be careful. When the option is disabled the remote user can only watch your screen.</string>
-       </property>
-       <property name="text">
-        <string>Allow remote user to &amp;control keyboard and mouse</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
Author	SHA1	Message	Date
l10n daemon script	0689b72f38	GIT_SILENT made messages (after extraction)	2017-07-04 05:16:00 +02:00
l10n daemon script	47c40225fd	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-06-20 05:48:45 +02:00
l10n daemon script	2a60739a16	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-04-09 05:12:08 +02:00
l10n daemon script	e3b9a0b30a	GIT_SILENT made messages (after extraction)	2017-04-03 04:24:46 +02:00
Albert Astals Cid	c0ceb8a83d	Set default framebuffer plugin to "qt" instead of "x11" Make default "qt" framebuffer plugin instead of "x11". Workaround for bug https://bugs.kde.org/show_bug.cgi?id=356782 Not a proper fix, ideally "x11" plugin needs to be fixed. REVIEW: 129721 BUGS: 356782	2017-03-24 00:20:12 +01:00
Alexey Min	4974154cc3	Qt framebuffer plugin: Do not use deprecated QPixmap::grabWindow(), use QScreen::grabWindow() instead REVIEW: 129722	2017-03-24 00:11:49 +01:00
l10n daemon script	05dc124c8b	GIT_SILENT made messages (after extraction)	2017-03-23 04:53:39 +01:00
Adriaan de Groot	f702422c9d	Drop duplicate linking to libvncserver. Summary: The duplicate link may also be missing necessary -L flags, so it causes linker errors when libvncserver is installed in unusual places (while ${LIBVNCSERVER_LIBRARIES} DTRT). Reviewers: sitter, apol, ltoscano, heikobecker Reviewed By: sitter Differential Revision: https://phabricator.kde.org/D5018	2017-03-12 22:31:30 +01:00
l10n daemon script	27e48f1114	GIT_SILENT made messages (after extraction)	2017-02-26 04:01:20 +01:00
l10n daemon script	9e77d1f5ac	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-02-23 06:16:56 +01:00
l10n daemon script	c12697e23f	GIT_SILENT made messages (after extraction)	2017-02-23 04:14:39 +01:00
l10n daemon script	3ce5047a6f	GIT_SILENT made messages (after extraction)	2017-02-19 03:57:26 +01:00
l10n daemon script	60b6f7b86b	GIT_SILENT made messages (after extraction)	2017-02-14 09:13:43 +01:00
l10n daemon script	b1f1a2f8d6	GIT_SILENT made messages (after extraction)	2017-02-12 03:54:12 +01:00
l10n daemon script	ee863548d9	GIT_SILENT made messages (after extraction)	2017-02-09 03:58:33 +01:00
l10n daemon script	ccc9ed069f	GIT_SILENT made messages (after extraction)	2017-02-07 08:59:20 +01:00
l10n daemon script	8c7138b592	GIT_SILENT made messages (after extraction)	2017-02-05 04:04:34 +01:00
Luigi Toscano	364cee9ba2	It is not just for a specific type of desktop	2017-02-04 16:33:57 +01:00
l10n daemon script	215d20c004	GIT_SILENT made messages (after extraction)	2017-02-04 04:00:01 +01:00
l10n daemon script	315b401227	GIT_SILENT made messages (after extraction)	2017-02-03 04:13:35 +01:00
l10n daemon script	9289a22d8a	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-02-02 05:57:39 +01:00
Harald Sitter	d529e22430	add appdata	2017-02-01 19:32:55 +01:00
Harald Sitter	b6fbb67af1	Merge branch 'Applications/16.12'	2017-02-01 19:13:02 +01:00
Harald Sitter	da4de72d55	set a comment appstream uses Comment for a summary when no appdata is present. without a comment/summary no appdata will be available at all rendering the app unavailable in software stores recycle genericname to avoid excess l10n work	2017-02-01 19:12:59 +01:00
l10n daemon script	b3e1624469	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-01-28 08:14:37 +01:00
l10n daemon script	aa80d3915d	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-01-28 06:35:16 +01:00
Heiko Becker	0b210563cb	Merge remote-tracking branch 'origin/Applications/16.12'	2017-01-11 20:21:12 +01:00
Heiko Becker	b4713d4755	Silence CMake policy CMP0063 warning ...by adding the NO_POLICY_SCOPE flag as recommended by ECM's documentation.	2017-01-11 20:18:38 +01:00
l10n daemon script	34d9387aa0	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-01-05 05:56:47 +01:00
l10n daemon script	eb7caf8594	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-01-04 06:14:48 +01:00
l10n daemon script	e761ee832e	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-01-03 12:34:42 +01:00
l10n daemon script	699d7f9a27	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"	2016-12-20 13:09:16 +01:00
l10n daemon script	43083c52dc	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"	2016-12-17 05:50:49 +01:00
l10n daemon script	903692c299	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"	2016-12-02 05:49:11 +01:00
l10n daemon script	2885bf2c5a	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"	2016-12-02 04:33:40 +01:00
l10n daemon script	6544fd56e9	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"	2016-11-30 04:27:39 +01:00
l10n daemon script	3fc2398707	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"	2016-11-25 05:01:57 +01:00
l10n daemon script	c1efd7158f	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"	2016-11-23 04:21:36 +01:00
l10n daemon script	cbc43a390f	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"	2016-11-22 06:10:53 +01:00
l10n daemon script	631d3c85ac	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"	2016-11-15 10:19:57 +00:00
l10n daemon script	ae15751847	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"	2016-10-24 09:34:05 +00:00
Tomaz Canabrava	f1a3e2b31c	Needed to simplify the creation of reviews via the rbt tool. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>	2016-10-10 16:25:17 +02:00
l10n daemon script	b95a5b285d	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"	2016-09-14 09:19:50 +00:00
l10n daemon script	0ee5738bf5	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"	2016-09-09 09:26:52 +00:00
Tomaz Canabrava	5195783757	Fix build by undefining the max macro The max macro was being defined in the c++ namespace, conflicting with the max C++ function call, breaking the build. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>	2016-08-19 12:43:24 -03:00
Yuri Chornoivan	1b6702167d	Fix minor glitches	2016-07-29 19:45:30 +03:00
Burkhard Lück	8b7fcb023d	Update KRFB docbook to 16.08 Update to reflect changes in https://git.reviewboard.kde.org/r/115499 Krfb modified to move away from invite-model, and modeled as a service that can be started/stopped. remove unused entities, pngs + appendix new screenshots remove krfb/ui/invitewidget.ui - unused REVIEW:128528	2016-07-29 06:59:12 +02:00
l10n daemon script	65595722bd	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"	2016-01-23 10:35:57 +00:00
l10n daemon script	916ffb525a	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"	2016-01-07 10:10:04 +00:00
Albert Astals Cid	ee5cb9eaf5	Merge remote-tracking branch 'origin/Applications/15.12'	2016-01-07 00:33:40 +01:00
Albert Astals Cid	ecb9fb8ee0	Make translations work Call KLocalizedString::setApplicationDomain	2016-01-07 00:31:40 +01:00
Albert Astals Cid	2c317584b9	Remove useless I18N_NOOP	2016-01-07 00:30:12 +01:00
l10n daemon script	c98d1d7676	SVN_SILENT made messages (.desktop file)	2015-12-30 12:15:07 +00:00
l10n daemon script	def5195e63	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"	2015-12-30 09:33:48 +00:00
l10n daemon script	510e5f8d52	SVN_SILENT made messages (.desktop file)	2015-12-29 13:51:44 +00:00
l10n daemon script	964386e2a6	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"	2015-12-29 11:26:11 +00:00
l10n daemon script	0d500c00ba	SVN_SILENT made messages (.desktop file)	2015-12-17 12:27:46 +00:00
l10n daemon script	07439f6408	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"	2015-12-17 09:32:43 +00:00
l10n daemon script	aa0e358136	SVN_SILENT made messages (.desktop file)	2015-12-13 11:50:46 +00:00
l10n daemon script	7c175bbc6e	SVN_SILENT made messages (.desktop file)	2015-12-09 12:00:52 +00:00
l10n daemon script	405bec30f6	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"	2015-12-09 09:08:00 +00:00
l10n daemon script	464cbd8573	SVN_SILENT made messages (.desktop file)	2015-11-26 18:11:03 +00:00
l10n daemon script	c1904c41c7	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"	2015-11-26 15:56:42 +00:00
Jeremy Whiting	17752eba7c	Merge branch 'Applications/15.12'	2015-11-23 12:22:39 -07:00
Jeremy Whiting	f4b4fe0f34	Fix launching the application from KDE menu and krunner Patch from Antonio Rojas <arojas@archlinux.org> REVIEW:126142 BUG:355776	2015-11-23 12:20:59 -07:00
l10n daemon script	ac6f4ca3ed	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"	2015-11-17 13:00:54 +00:00
l10n daemon script	d2d49abf23	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"	2015-11-11 10:33:20 +00:00
l10n daemon script	396e277113	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"	2015-11-07 21:16:29 +00:00
l10n daemon script	ab7ed1c006	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"	2015-11-04 17:14:10 +00:00
l10n daemon script	1c9db8798e	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"	2015-11-03 15:56:52 +00:00
l10n daemon script	a2b1c5e0b5	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"	2015-11-02 11:08:45 +00:00
l10n daemon script	f95fafe5a7	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"	2015-11-01 10:43:24 +00:00
l10n daemon script	3a9f58f12e	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"	2015-10-25 10:39:56 +00:00
l10n daemon script	74b4d19a35	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"	2015-10-18 11:02:35 +00:00
l10n daemon script	c0f1b1ebb4	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"	2015-10-17 12:43:21 +00:00
l10n daemon script	d306c6c73d	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"	2015-10-16 10:30:41 +00:00
Rohan Garg	8d1abb3a8f	Fix build	2015-10-15 15:51:31 +02:00
Rohan Garg	f15490d58a	Merge branch 'master' into frameworks	2015-10-15 15:38:37 +02:00
Rohan Garg	c83182f8d3	Allow krfb to store the fact that it was enabled the last time it was started	2015-10-15 15:36:38 +02:00
Rohan Garg	e0dc5b3a51	Allow krfb to start minimized, this is useful when autostarting krfb.	2015-10-15 15:36:19 +02:00
Rohan Garg	5948ee69c2	Allow for krfb to be started without a wallet. krfb will store obscured passwords in a regular text files in this mode.	2015-10-15 15:35:21 +02:00
Albert Astals Cid	e443b13227	virtual -> override And a class that is really a struct	2015-10-10 13:27:49 +02:00
Albert Astals Cid	ff2d0d999d	stop calls are always with true, remove param	2015-10-10 13:16:13 +02:00
Albert Astals Cid	0b9ed26137	Use new connect syntax And a few warning fixes	2015-10-10 13:12:07 +02:00
Jeremy Whiting	05b6105be8	Fix connections to QDialog subclass signals.	2015-10-10 05:07:43 -06:00
Jeremy Whiting	6d5e2bc356	Remove telepathy tubes and contact list support.	2015-09-17 17:44:07 -06:00
Jeremy Whiting	10176b9e01	Port from KServiceTypeTrader, etc. to new json style plugins. Finish porting away from KDELibs4Support. Changed preferred framebuffer config to use plugin ids defaulting to x11.	2015-09-16 20:55:30 -06:00
Jeremy Whiting	9bb8e28eeb	Remove unneccesarry TODO comment and commented out code.	2015-09-11 13:51:52 -06:00
Jeremy Whiting	56e1804b23	Port from K4AboutData to KAboutData, KCmdLineArgs to QCmdLineArgs and add about dialog	2015-09-11 13:47:10 -06:00
Jeremy Whiting	82707732d3	Port from KDialog to QDialog and KPushButton to QPushButton.	2015-09-11 13:13:13 -06:00
Jeremy Whiting	e63fb3f0b1	Port away from KLocale and kdemacros	2015-09-11 13:01:02 -06:00
Jeremy Whiting	a45aa4a16b	Port from KIcon to QIcon.	2015-09-11 12:32:54 -06:00
Jeremy Whiting	535e474cbd	Reenable finding telepathyqt and ktp and remove our local FindKTp.cmake.	2015-09-10 14:27:07 -06:00
Jeremy Whiting	2448d9e944	Update docbook to 4.5 dtd.	2015-09-09 17:52:54 -06:00
Jeremy Whiting	74683e0a02	Rename .desktop to org.kde.krfb.desktop.	2015-09-09 17:50:57 -06:00
Jeremy Whiting	87f2742fcc	Add feature_summary	2015-09-09 17:44:49 -06:00
Jeremy Whiting	6306bf85cf	Initial port to Qt5/KF5. Fixed FindLibVNCServer to use CheckStructHasMember. Ported from kDebug to qDebug Runs and seems to work, but probably missed some things.	2015-09-06 15:31:29 -06:00
David Faure	cb43be430c	set cmake_min_req to match kdelibs policy and enable newer cmake policies	2015-07-29 08:34:24 +02:00