From 74b0d908a41eddb3bc210fa0cae3f17be124a0fe Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Wed, 27 Sep 2017 17:00:58 +0200 Subject: kde5: convert KDE5SalInstance to SvpSalInstance Change-Id: I72da846525128a689d92598b64e6a70062ff1c69 --- vcl/unx/kde5/KDE5SalInstance.cxx | 8 ++++---- vcl/unx/kde5/KDE5SalInstance.hxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx index b8d3471a44c6..38629113295c 100644 --- a/vcl/unx/kde5/KDE5SalInstance.cxx +++ b/vcl/unx/kde5/KDE5SalInstance.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex) - : X11SalInstance(pMutex) + :SvpSalInstance( pMutex ) { ImplSVData* pSVData = ImplGetSVData(); delete pSVData->maAppData.mpToolkitName; @@ -54,13 +54,13 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker( return uno::Reference< ui::dialogs::XFilePicker2 >( kdeXLib->createFilePicker(xMSF) ); else*/ - return X11SalInstance::createFilePicker( xMSF ); + return SalInstance::createFilePicker( xMSF ); } -SalX11Display* KDE5SalInstance::CreateDisplay() const +/*SalX11Display* KDE5SalInstance::CreateDisplay() const { return new SalKDE5Display( QX11Info::display() ); -} +}*/ bool KDE5SalInstance::IsMainThread() const { diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx index 233d6fd7430b..5c0247518246 100644 --- a/vcl/unx/kde5/KDE5SalInstance.hxx +++ b/vcl/unx/kde5/KDE5SalInstance.hxx @@ -19,15 +19,15 @@ #pragma once -#include +#include class SalYieldMutex; class SalFrame; -class KDE5SalInstance : public X11SalInstance +class KDE5SalInstance : public SvpSalInstance { protected: - virtual SalX11Display* CreateDisplay() const override; +// virtual SalX11Display* CreateDisplay() const override; public: explicit KDE5SalInstance(SalYieldMutex* pMutex); -- cgit