tdf#125922 rename kde5 to kf5 + plasma5

Just as the gtk3 plugin isn't named GNOME, rename kde5 to kf5, as
it is based on the KDE frameworks 5 libraries.

This also includes:
* a convenience alias to load the kf5 VCL plugin in case someone
requests the kde5 plugin.
* keep convenience kde5 configure switch, but warn about it
* rename detected desktop from kde5 to plasma5

Change-Id: I6764a05b81a5edbf284484c234fee2649aacf735
Reviewed-on: https://gerrit.libreoffice.org/75313
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

5 files changed, 18 insertions, 20 deletions

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 6b402a892427..2872438d4f96 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -304,11 +304,9 @@ css::uno::Reference< css::uno::XInterface > createInstance(
 
     // Fall back to the default if the specific backend is not available:
     css::uno::Reference< css::uno::XInterface > backend;
-    if ( desktop == "KDE5" ) {
-        backend = createBackend(
-            context,
-            "com.sun.star.configuration.backend.KDE5Backend");
-    }
+    if (desktop == "PLASMA5")
+        backend = createBackend(context,
+            "com.sun.star.configuration.backend.KF5Backend");
     return backend.is()
         ? backend : static_cast< cppu::OWeakObject * >(new Default);
 }
diff --git a/shell/source/backends/kde5be/kde5access.cxx b/shell/source/backends/kf5be/kf5access.cxx
index 6147c8f0a83d..00db5c5448b4 100644
--- a/shell/source/backends/kde5be/kde5access.cxx
+++ b/shell/source/backends/kf5be/kf5access.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include "kde5access.hxx"
+#include "kf5access.hxx"
 
 #include <QtGui/QFont>
 #include <QtCore/QString>
@@ -40,7 +40,7 @@
 #include <rtl/string.h>
 #include <rtl/ustring.hxx>
 
-namespace kde5access
+namespace kf5access
 {
 namespace
 {
diff --git a/shell/source/backends/kde5be/kde5access.hxx b/shell/source/backends/kf5be/kf5access.hxx
index e1e8a11c8a94..34ee7c6d3d6b 100644
--- a/shell/source/backends/kde5be/kde5access.hxx
+++ b/shell/source/backends/kf5be/kf5access.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_KDE5BE_KDE5ACCESS_HXX
-#define INCLUDED_SHELL_SOURCE_BACKENDS_KDE5BE_KDE5ACCESS_HXX
+#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_KF5BE_KF5ACCESS_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_KF5BE_KF5ACCESS_HXX
 
 #include <sal/config.h>
 
@@ -38,7 +38,7 @@ class Any;
 }
 }
 
-namespace kde5access
+namespace kf5access
 {
 css::beans::Optional<css::uno::Any> getValue(OUString const& id);
 }
diff --git a/shell/source/backends/kde5be/kde5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
index 101a21387a4c..182d24893456 100644
--- a/shell/source/backends/kde5be/kde5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -52,18 +52,18 @@
 #include <osl/process.h>
 #include <osl/thread.h>
 
-#include "kde5access.hxx"
+#include "kf5access.hxx"
 
 namespace
 {
 OUString getServiceImplementationName()
 {
-    return OUString("com.sun.star.comp.configuration.backend.KDE5Backend");
+    return OUString("com.sun.star.comp.configuration.backend.KF5Backend");
 }
 
 css::uno::Sequence<OUString> getServiceSupportedServiceNames()
 {
-    OUString name("com.sun.star.configuration.backend.KDE5Backend");
+    OUString name("com.sun.star.configuration.backend.KF5Backend");
     return css::uno::Sequence<OUString>(&name, 1);
 }
 
@@ -159,14 +159,14 @@ void readKDESettings(std::map<OUString, css::beans::Optional<css::uno::Any>>& rS
 
     for (const OUString& aKey : aKeys)
     {
-        css::beans::Optional<css::uno::Any> aValue = kde5access::getValue(aKey);
+        css::beans::Optional<css::uno::Any> aValue = kf5access::getValue(aKey);
         std::pair<OUString, css::beans::Optional<css::uno::Any>> elem
             = std::make_pair(aKey, aValue);
         rSettings.insert(elem);
     }
 }
 
-// init the QApplication when we load the kde5backend into a non-Qt vclplug (e.g. Gtk3KDE5)
+// init the QApplication when we load the kf5backend into a non-Qt vclplug (e.g. gtk3_kde5)
 // TODO: use a helper process to read these values without linking to Qt directly?
 // TODO: share this code somehow with Qt5Instance.cxx?
 void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings)
@@ -212,7 +212,7 @@ Service::Service()
         OUString desktop;
         context->getValueByName("system.desktop-environment") >>= desktop;
 
-        if (desktop == "KDE5")
+        if (desktop == "PLASMA5")
         {
             if (!qApp) // no qt event loop yet
             {
@@ -271,7 +271,7 @@ static cppu::ImplementationEntry const services[]
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void*
-kde5be1_component_getFactory(char const* pImplName, void* pServiceManager, void* pRegistryKey)
+kf5be1_component_getFactory(char const* pImplName, void* pServiceManager, void* pRegistryKey)
 {
     return cppu::component_getFactoryHelper(pImplName, pServiceManager, pRegistryKey, services);
 }
diff --git a/shell/source/backends/kde5be/kde5be1.component b/shell/source/backends/kf5be/kf5be1.component
index 74111874cb6b..ad217dc80e66 100644
--- a/shell/source/backends/kde5be/kde5be1.component
+++ b/shell/source/backends/kf5be/kf5be1.component
@@ -18,8 +18,8 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="kde5be1" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.configuration.backend.KDE5Backend">
-    <service name="com.sun.star.configuration.backend.KDE5Backend"/>
+    prefix="kf5be1" xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.KF5Backend">
+    <service name="com.sun.star.configuration.backend.KF5Backend"/>
   </implementation>
 </component>