Kaydet (Commit) a555163e authored tarafından Katarina Behrens's avatar Katarina Behrens Kaydeden (comit) Thorsten Behrens

kde5: make VCLKDE5Application build again

Change-Id: Ia1f4d1254583d04d1993e9a0ce8ad1f1aaa868d3
üst 05daba4a
...@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\ ...@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
vcl/unx/kde5/KDE5SalGraphics \ vcl/unx/kde5/KDE5SalGraphics \
vcl/unx/kde5/KDE5SalInstance \ vcl/unx/kde5/KDE5SalInstance \
vcl/unx/kde5/KDE5XLib \ vcl/unx/kde5/KDE5XLib \
vcl/unx/kde5/VCLKDE5Application \
vcl/unx/kde5/main \ vcl/unx/kde5/main \
)) ))
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <memory> #include <memory>
#include <unx/saldisp.hxx> #include <unx/saldisp.hxx>
#include <unx/salinst.h>
//#include <fixx11h.h> //#include <fixx11h.h>
// //
...@@ -31,16 +32,14 @@ ...@@ -31,16 +32,14 @@
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtCore/QAbstractNativeEventFilter> #include <QtCore/QAbstractNativeEventFilter>
#include <unx/salinst.h> class VCLKDE5Application;
class VCLKDEApplication;
class KDE5XLib : public QObject, public QAbstractNativeEventFilter, public SalXLib class KDE5XLib : public QObject, public QAbstractNativeEventFilter, public SalXLib
{ {
Q_OBJECT Q_OBJECT
private: private:
bool m_bStartupDone; 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_pFreeCmdLineArgs;
std::unique_ptr<char*[]> m_pAppCmdLineArgs; std::unique_ptr<char*[]> m_pAppCmdLineArgs;
int m_nFakeCmdLineArgs; int m_nFakeCmdLineArgs;
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include "KDE5SalDisplay.hxx" #include "KDE5SalDisplay.hxx"
VCLKDE5Application::VCLKDE5Application() : VCLKDE5Application::VCLKDE5Application( int argc, char** argv) :
QApplication() QApplication( argc, argv)
{ {
} }
...@@ -53,7 +53,8 @@ void VCLKDE5Application::postDialogCleanup() ...@@ -53,7 +53,8 @@ void VCLKDE5Application::postDialogCleanup()
// (such as the auto-extension flag), but that doesn't update KGlobal::config() // (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, // (which is probably a KDE bug), so force reading the new configuration,
// otherwise the next opening of the dialog would use the old settings. // 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 // 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 // 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"), // doesn't seem to have an equivalent of QClipboard's "useEventLoopWhenWaiting"),
......
...@@ -24,13 +24,15 @@ ...@@ -24,13 +24,15 @@
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtCore/QAbstractNativeEventFilter> #include <QtCore/QAbstractNativeEventFilter>
#include <KConfigCore/kconfig.h>
#undef Region #undef Region
class VCLKDEApplication : public QApplication, public QAbstractNativeEventFilter class VCLKDE5Application : public QApplication, public QAbstractNativeEventFilter
{ {
public: public:
VCLKDEApplication(); VCLKDE5Application( int argv, char** argc);
static void preDialogSetup(); static void preDialogSetup();
static void postDialogCleanup(); static void postDialogCleanup();
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment