[Libreoffice-commits] core.git: Branch 'feature/kde5' - vcl/Library_vclplug_kde5.mk vcl/unx

[Katarina Behrens]

 vcl/Library_vclplug_kde5.mk         |    1 +
 vcl/unx/kde5/KDE5XLib.hxx           |    7 +++----
 vcl/unx/kde5/VCLKDE5Application.cxx |    7 ++++---
 vcl/unx/kde5/VCLKDE5Application.hxx |    6 ++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 355087e5bd0167397f2c5aa4789fffe9a2787a02
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Oct 20 18:49:00 2017 +0200

    Make VCLKDE5Application build again
    
    sorta :|
    
    Change-Id: Ia1f4d1254583d04d1993e9a0ce8ad1f1aaa868d3

diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index cfd6beb524ce..1fe5c784831f 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
     vcl/unx/kde5/KDE5SalGraphics \
     vcl/unx/kde5/KDE5SalInstance \
     vcl/unx/kde5/KDE5XLib \
+    vcl/unx/kde5/VCLKDE5Application \
     vcl/unx/kde5/main \
 ))
 
diff --git a/vcl/unx/kde5/KDE5XLib.hxx b/vcl/unx/kde5/KDE5XLib.hxx
index 152bba357f3b..4bd99ab3bbd7 100644
--- a/vcl/unx/kde5/KDE5XLib.hxx
+++ b/vcl/unx/kde5/KDE5XLib.hxx
@@ -22,6 +22,7 @@
 #include <memory>
 
 #include <unx/saldisp.hxx>
+#include <unx/salinst.h>
 
 //#include <fixx11h.h>
 //
@@ -31,16 +32,14 @@
 #include <QtCore/QTimer>
 #include <QtCore/QAbstractNativeEventFilter>
 
-#include <unx/salinst.h>
-
-class VCLKDEApplication;
+class VCLKDE5Application;
 
 class KDE5XLib : public QObject, public QAbstractNativeEventFilter, public SalXLib
 {
     Q_OBJECT
     private:
         bool m_bStartupDone;
-        std::unique_ptr<VCLKDEApplication> m_pApplication;
+        std::unique_ptr<VCLKDE5Application> m_pApplication;
         std::unique_ptr<char*[]> m_pFreeCmdLineArgs;
         std::unique_ptr<char*[]> m_pAppCmdLineArgs;
         int m_nFakeCmdLineArgs;
diff --git a/vcl/unx/kde5/VCLKDE5Application.cxx b/vcl/unx/kde5/VCLKDE5Application.cxx
index 15ff9a2dfdac..981a98a51399 100644
--- a/vcl/unx/kde5/VCLKDE5Application.cxx
+++ b/vcl/unx/kde5/VCLKDE5Application.cxx
@@ -24,8 +24,8 @@
 
 #include "KDE5SalDisplay.hxx"
 
-VCLKDE5Application::VCLKDE5Application() :
-    QApplication()
+VCLKDE5Application::VCLKDE5Application( int argc, char** argv) :
+    QApplication( argc, argv)
 {
 }
 
@@ -53,7 +53,8 @@ void VCLKDE5Application::postDialogCleanup()
     // (such as the auto-extension flag), but that doesn't update KGlobal::config()
     // (which is probably a KDE bug), so force reading the new configuration,
     // otherwise the next opening of the dialog would use the old settings.
-    KGlobal::config()->reparseConfiguration();
+    KConfig config;
+    config.reparseConfiguration();
     // HACK: If Qt owns clipboard or selection, give up on their ownership now. Otherwise
     // LO core might ask for the contents, but it would block while doing so (i.e. it
     // doesn't seem to have an equivalent of QClipboard's "useEventLoopWhenWaiting"),
diff --git a/vcl/unx/kde5/VCLKDE5Application.hxx b/vcl/unx/kde5/VCLKDE5Application.hxx
index 6d2b6f2fdae1..c9526d4e15b6 100644
--- a/vcl/unx/kde5/VCLKDE5Application.hxx
+++ b/vcl/unx/kde5/VCLKDE5Application.hxx
@@ -24,13 +24,15 @@
 
 #include <QtWidgets/QApplication>
 #include <QtCore/QAbstractNativeEventFilter>
+#include <KConfigCore/kconfig.h>
+
 
 #undef Region
 
-class VCLKDEApplication : public QApplication, public QAbstractNativeEventFilter
+class VCLKDE5Application : public QApplication, public QAbstractNativeEventFilter
 {
     public:
-        VCLKDEApplication();
+        VCLKDE5Application( int argv, char** argc);
         static void preDialogSetup();
         static void postDialogCleanup();
 };