diff options
author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-09-07 16:18:31 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-10-25 03:23:13 +0200 |
commit | 8b52adcad3f129606dc48025afafe2cbf80cdd7e (patch) | |
tree | a901ed3903b88c88dede4d32c75e6bbcd9ab57f4 | |
parent | dd7a3147f160813022d1c2724bbdf7fc46ffcc59 (diff) |
kde5: rename classes and other relevant data: KDE[4]->KDE5
add log area too
Change-Id: I187c04c8646ec9c9264d84938e1ccf3a1cbd62f1
-rw-r--r-- | include/sal/log-areas.dox | 1 | ||||
-rw-r--r-- | vcl/inc/unx/gendata.hxx | 3 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5Data.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5Data.hxx | 8 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalDisplay.cxx | 14 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalDisplay.hxx | 12 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5XLib.cxx | 44 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5XLib.hxx | 6 | ||||
-rw-r--r-- | vcl/unx/kde5/VCLKDE5Application.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/kde5/main.cxx | 10 |
14 files changed, 81 insertions, 79 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 8c0db9de0809..4bc8e66d7995 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -454,6 +454,7 @@ certain functionality. @li @c vcl.icontest @li @c vcl.kde - KDE @li @c vcl.kde4 - KDE4 +@li @c vcl.kde5 - KDE5 @li @c vcl.layout - Widget layout @li @c vcl.lazydelete @li @c vcl.opengl diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx index 55a9aaf4ba8c..4088985678a6 100644 --- a/vcl/inc/unx/gendata.hxx +++ b/vcl/inc/unx/gendata.hxx @@ -20,7 +20,8 @@ class SalGenericDisplay; namespace psp { class PrintFontManager; } enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3, - SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4, + SAL_DATA_TDE3, + SAL_DATA_KDE3,SAL_DATA_KDE4, SAL_DATA_KDE5, SAL_DATA_UNX, SAL_DATA_SVP, SAL_DATA_ANDROID, SAL_DATA_IOS, SAL_DATA_HEADLESS }; diff --git a/vcl/unx/kde5/KDE5Data.cxx b/vcl/unx/kde5/KDE5Data.cxx index 487a0b254af3..b066c7d9f955 100644 --- a/vcl/unx/kde5/KDE5Data.cxx +++ b/vcl/unx/kde5/KDE5Data.cxx @@ -27,18 +27,18 @@ #include "KDE5XLib.hxx" #include "KDE5SalDisplay.hxx" -KDEData::~KDEData() +KDE5Data::~KDE5Data() { } -void KDEData::Init() +void KDE5Data::Init() { - pXLib_ = new KDEXLib(); + pXLib_ = new KDE5XLib(); pXLib_->Init(); - SetDisplay( SalKDEDisplay::self() ); + SetDisplay( SalKDE5Display::self() ); } -void KDEData::initNWF() +void KDE5Data::initNWF() { ImplSVData *pSVData = ImplGetSVData(); @@ -61,7 +61,7 @@ void KDEData::initNWF() style->pixelMetric( QStyle::PM_MenuVMargin ); } -void KDEData::deInitNWF() +void KDE5Data::deInitNWF() { } diff --git a/vcl/unx/kde5/KDE5Data.hxx b/vcl/unx/kde5/KDE5Data.hxx index 4efd23a7df34..9791089ce57d 100644 --- a/vcl/unx/kde5/KDE5Data.hxx +++ b/vcl/unx/kde5/KDE5Data.hxx @@ -22,12 +22,12 @@ #include <unx/saldisp.hxx> #include <unx/saldata.hxx> -class KDEData : public X11SalData +class KDE5Data : public X11SalData { public: - explicit KDEData( SalInstance *pInstance ) - : X11SalData( SAL_DATA_KDE4, pInstance ) {} - virtual ~KDEData() override; + explicit KDE5Data( SalInstance *pInstance ) + : X11SalData( SAL_DATA_KDE5, pInstance ) {} + virtual ~KDE5Data() override; virtual void Init() override; virtual void initNWF() override; diff --git a/vcl/unx/kde5/KDE5SalDisplay.cxx b/vcl/unx/kde5/KDE5SalDisplay.cxx index eddac063048f..319f475317eb 100644 --- a/vcl/unx/kde5/KDE5SalDisplay.cxx +++ b/vcl/unx/kde5/KDE5SalDisplay.cxx @@ -28,9 +28,9 @@ #include <assert.h> -SalKDEDisplay* SalKDEDisplay::selfptr = nullptr; +SalKDE5Display* SalKDE5Display::selfptr = nullptr; -SalKDEDisplay::SalKDEDisplay( Display* pDisp ) +SalKDE5Display::SalKDE5Display( Display* pDisp ) : SalX11Display( pDisp ) { assert( selfptr == nullptr ); @@ -38,10 +38,10 @@ SalKDEDisplay::SalKDEDisplay( Display* pDisp ) xim_protocol = XInternAtom( pDisp_, "_XIM_PROTOCOL", False ); } -SalKDEDisplay::~SalKDEDisplay() +SalKDE5Display::~SalKDE5Display() { // in case never a frame opened - static_cast<KDEXLib*>(GetXLib())->doStartup(); + static_cast<KDE5XLib*>(GetXLib())->doStartup(); // clean up own members doDestruct(); selfptr = nullptr; @@ -49,7 +49,7 @@ SalKDEDisplay::~SalKDEDisplay() pDisp_ = nullptr; } -void SalKDEDisplay::Yield() +void SalKDE5Display::Yield() { if( DispatchInternalEvent() ) return; @@ -60,7 +60,7 @@ void SalKDEDisplay::Yield() DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == osl::Thread::getCurrentIdentifier(), - "will crash soon since solar mutex not locked in SalKDEDisplay::Yield" ); + "will crash soon since solar mutex not locked in SalKDE5Display::Yield" ); /*XEvent event; XNextEvent( pDisp_, &event ); @@ -77,7 +77,7 @@ void SalKDEDisplay::Yield() // completely. Skipped events are KeyPress, KeyRelease and also _XIM_PROTOCOL client message // (seems to be necessary too, hopefully there are not other internal XIM messages that // would need this handling). -bool SalKDEDisplay::checkDirectInputEvent( xcb_generic_event_t* ev ) +bool SalKDE5Display::checkDirectInputEvent( xcb_generic_event_t* ev ) { switch (ev->response_type & ~0x80) { diff --git a/vcl/unx/kde5/KDE5SalDisplay.hxx b/vcl/unx/kde5/KDE5SalDisplay.hxx index 0a31dcedc10d..8cd18d4ed813 100644 --- a/vcl/unx/kde5/KDE5SalDisplay.hxx +++ b/vcl/unx/kde5/KDE5SalDisplay.hxx @@ -26,20 +26,20 @@ #undef CursorShape #endif -class SalKDEDisplay : public SalX11Display +class SalKDE5Display : public SalX11Display { public: - explicit SalKDEDisplay( Display* pDisp ); - virtual ~SalKDEDisplay() override; - static SalKDEDisplay* self(); + explicit SalKDE5Display( Display* pDisp ); + virtual ~SalKDE5Display() override; + static SalKDE5Display* self(); virtual void Yield() override; bool checkDirectInputEvent( xcb_generic_event_t* ev ); private: Atom xim_protocol; - static SalKDEDisplay* selfptr; + static SalKDE5Display* selfptr; }; -inline SalKDEDisplay* SalKDEDisplay::self() +inline SalKDE5Display* SalKDE5Display::self() { return selfptr; } diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx index 090abbc240d1..28f47f860015 100644 --- a/vcl/unx/kde5/KDE5SalFrame.cxx +++ b/vcl/unx/kde5/KDE5SalFrame.cxx @@ -47,16 +47,16 @@ #include <boost/optional.hpp> -KDESalFrame::KDESalFrame( SalFrame* pParent, SalFrameStyleFlags nState ) : +KDE5SalFrame::KDE5SalFrame( SalFrame* pParent, SalFrameStyleFlags nState ) : X11SalFrame( pParent, nState ) { } -void KDESalFrame::Show( bool bVisible, bool bNoActivate ) +void KDE5SalFrame::Show( bool bVisible, bool bNoActivate ) { if ( !GetParent() && ! (GetStyle() & SalFrameStyleFlags::INTRO) ) { - KDEXLib* pXLib = static_cast<KDEXLib*>(GetDisplay()->GetXLib()); + KDE5XLib* pXLib = static_cast<KDE5XLib*>(GetDisplay()->GetXLib()); pXLib->doStartup(); } @@ -120,12 +120,12 @@ static vcl::Font toFont( const QFont &rQFont, const css::lang::Locale& rLocale ) else aInfo.m_eWidth = WIDTH_ULTRA_EXPANDED; - SAL_INFO( "vcl.kde4", "font name BEFORE system match: \"" << aInfo.m_aFamilyName << "\"" ); + SAL_INFO( "vcl.kde5", "font name BEFORE system match: \"" << aInfo.m_aFamilyName << "\"" ); // match font to e.g. resolve "Sans" psp::PrintFontManager::get().matchFont( aInfo, rLocale ); - SAL_INFO( "vcl.kde4", "font match " << + SAL_INFO( "vcl.kde5", "font match " << (aInfo.m_nID != 0 ? "succeeded" : "failed") << ", name AFTER: \"" << aInfo.m_aFamilyName << "\"" ); @@ -150,7 +150,7 @@ static vcl::Font toFont( const QFont &rQFont, const css::lang::Locale& rLocale ) /** Implementation of KDE integration's main method. */ -void KDESalFrame::UpdateSettings( AllSettings& rSettings ) +void KDE5SalFrame::UpdateSettings( AllSettings& rSettings ) { StyleSettings style( rSettings.GetStyleSettings() ); bool bSetTitleFont = false; @@ -334,7 +334,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( style ); } -void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics ) +void KDE5SalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { for( int i = 0; i < nMaxGraphics; i++ ) { @@ -346,7 +346,7 @@ void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics ) } } -void KDESalFrame::updateGraphics( bool bClear ) +void KDE5SalFrame::updateGraphics( bool bClear ) { Drawable aDrawable = bClear ? None : GetWindow(); for( int i = 0; i < nMaxGraphics; i++ ) @@ -356,7 +356,7 @@ void KDESalFrame::updateGraphics( bool bClear ) } } -SalGraphics* KDESalFrame::AcquireGraphics() +SalGraphics* KDE5SalFrame::AcquireGraphics() { if( GetWindow() ) { diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx index 114cd49bd8d2..dc77ec6daae5 100644 --- a/vcl/unx/kde5/KDE5SalFrame.hxx +++ b/vcl/unx/kde5/KDE5SalFrame.hxx @@ -25,7 +25,7 @@ #include <unx/salframe.h> #include <unx/salgdi.h> -class KDESalFrame : public X11SalFrame +class KDE5SalFrame : public X11SalFrame { private: static const int nMaxGraphics = 2; @@ -41,7 +41,7 @@ class KDESalFrame : public X11SalFrame GraphicsHolder m_aGraphics[ nMaxGraphics ]; public: - KDESalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ); + KDE5SalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ); virtual SalGraphics* AcquireGraphics() override; virtual void ReleaseGraphics( SalGraphics *pGraphics ) override; diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx index 5d4bc5eec5dd..b8d3471a44c6 100644 --- a/vcl/unx/kde5/KDE5SalInstance.cxx +++ b/vcl/unx/kde5/KDE5SalInstance.cxx @@ -33,20 +33,20 @@ using namespace com::sun::star; -KDESalInstance::KDESalInstance(SalYieldMutex* pMutex) +KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex) : X11SalInstance(pMutex) { ImplSVData* pSVData = ImplGetSVData(); delete pSVData->maAppData.mpToolkitName; - pSVData->maAppData.mpToolkitName = new OUString("kde4"); + pSVData->maAppData.mpToolkitName = new OUString("kde5"); } -SalFrame* KDESalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nState ) +SalFrame* KDE5SalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nState ) { - return new KDESalFrame( pParent, nState ); + return new KDE5SalFrame( pParent, nState ); } -uno::Reference< ui::dialogs::XFilePicker2 > KDESalInstance::createFilePicker( +uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker( const uno::Reference< uno::XComponentContext >& xMSF ) { /*KDEXLib* kdeXLib = static_cast<KDEXLib*>( mpXLib ); @@ -57,12 +57,12 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDESalInstance::createFilePicker( return X11SalInstance::createFilePicker( xMSF ); } -SalX11Display* KDESalInstance::CreateDisplay() const +SalX11Display* KDE5SalInstance::CreateDisplay() const { - return new SalKDEDisplay( QX11Info::display() ); + return new SalKDE5Display( QX11Info::display() ); } -bool KDESalInstance::IsMainThread() const +bool KDE5SalInstance::IsMainThread() const { return qApp->thread() == QThread::currentThread(); } diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx index 7b7417caaaf1..233d6fd7430b 100644 --- a/vcl/unx/kde5/KDE5SalInstance.hxx +++ b/vcl/unx/kde5/KDE5SalInstance.hxx @@ -24,13 +24,13 @@ class SalYieldMutex; class SalFrame; -class KDESalInstance : public X11SalInstance +class KDE5SalInstance : public X11SalInstance { protected: virtual SalX11Display* CreateDisplay() const override; public: - explicit KDESalInstance(SalYieldMutex* pMutex); + explicit KDE5SalInstance(SalYieldMutex* pMutex); virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; virtual bool hasNativeFileSelection() const override { return true; } diff --git a/vcl/unx/kde5/KDE5XLib.cxx b/vcl/unx/kde5/KDE5XLib.cxx index b05e8e6ed047..2c85ab7fa3f9 100644 --- a/vcl/unx/kde5/KDE5XLib.cxx +++ b/vcl/unx/kde5/KDE5XLib.cxx @@ -51,7 +51,7 @@ #include "tst_exclude_posted_events.moc" #endif -KDEXLib::KDEXLib() : +KDE5XLib::KDE5XLib() : SalXLib(), m_bStartupDone(false), m_nFakeCmdLineArgs( 0 ), m_isGlibEventLoopType(false), m_allowKdeDialogs(false), @@ -84,7 +84,7 @@ KDEXLib::KDEXLib() : Qt::BlockingQueuedConnection ); } -KDEXLib::~KDEXLib() +KDE5XLib::~KDE5XLib() { // free the faked cmdline arguments no longer needed by KApplication @@ -94,7 +94,7 @@ KDEXLib::~KDEXLib() } } -void KDEXLib::Init() +void KDE5XLib::Init() { m_pInputMethod = new SalI18N_InputMethod; m_pInputMethod->SetLocale(); @@ -218,22 +218,22 @@ static bool qt_event_filter( void* m ) { if( old_qt_event_filter != nullptr && old_qt_event_filter( m )) return true; - if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) + if( SalKDE5Display::self() && SalKDE5Display::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) return true; return false; }*/ -bool KDEXLib::nativeEventFilter(const QByteArray &eventType, void *message, long *) +bool KDE5XLib::nativeEventFilter(const QByteArray &eventType, void *message, long *) { if (eventType == "xcb_generic_event_t") { xcb_generic_event_t* ev = static_cast<xcb_generic_event_t *>(message); - if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( ev )) + if( SalKDE5Display::self() && SalKDE5Display::self()->checkDirectInputEvent( ev )) return true; } return false; } -void KDEXLib::setupEventLoop() +void KDE5XLib::setupEventLoop() { QAbstractEventDispatcher::instance()->installNativeEventFilter( this ); #if KF5_HAVE_GLIB @@ -248,7 +248,7 @@ void KDEXLib::setupEventLoop() #endif } -void KDEXLib::Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, YieldFunc handle ) +void KDE5XLib::Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, YieldFunc handle ) { if( !m_isGlibEventLoopType ) return SalXLib::Insert( fd, data, pending, queued, handle ); @@ -263,7 +263,7 @@ void KDEXLib::Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, Y socketData[ fd ] = sdata; } -void KDEXLib::Remove( int fd ) +void KDE5XLib::Remove( int fd ) { if( !m_isGlibEventLoopType ) return SalXLib::Remove( fd ); @@ -271,13 +271,13 @@ void KDEXLib::Remove( int fd ) delete sdata.notifier; } -void KDEXLib::socketNotifierActivated( int fd ) +void KDE5XLib::socketNotifierActivated( int fd ) { const SocketData& sdata = socketData[ fd ]; sdata.handle( fd, sdata.data ); } -bool KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) +bool KDE5XLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) { if( !m_isGlibEventLoopType ) { @@ -312,7 +312,7 @@ bool KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) * Quoting the Qt docs: [QAbstractEventDispatcher::processEvents] processes * pending events that match flags until there are no more events to process. */ -bool KDEXLib::processYield( bool bWait, bool ) +bool KDE5XLib::processYield( bool bWait, bool ) { QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance( qApp->thread()); bool wasEvent = false; @@ -323,7 +323,7 @@ bool KDEXLib::processYield( bool bWait, bool ) return wasEvent; } -void KDEXLib::StartTimer( sal_uLong nMS ) +void KDE5XLib::StartTimer( sal_uLong nMS ) { if( !m_isGlibEventLoopType ) return SalXLib::StartTimer( nMS ); @@ -335,47 +335,47 @@ void KDEXLib::StartTimer( sal_uLong nMS ) Q_EMIT startTimeoutTimerSignal(); } -void KDEXLib::startTimeoutTimer() +void KDE5XLib::startTimeoutTimer() { timeoutTimer.start(); } -void KDEXLib::StopTimer() +void KDE5XLib::StopTimer() { if( !m_isGlibEventLoopType ) return SalXLib::StopTimer(); timeoutTimer.stop(); } -void KDEXLib::timeoutActivated() +void KDE5XLib::timeoutActivated() { // don't potentially wait in timeout, as QTimer is non-recursive QApplication::postEvent(this, new QEvent(QEvent::Type( m_timerEventId ))); } -void KDEXLib::customEvent(QEvent* e) +void KDE5XLib::customEvent(QEvent* e) { if( e->type() == m_timerEventId ) X11SalData::Timeout(); else if( e->type() == m_postUserEventId ) - SalKDEDisplay::self()->DispatchInternalEvent(); + SalKDE5Display::self()->DispatchInternalEvent(); } -void KDEXLib::Wakeup() +void KDE5XLib::Wakeup() { if( !m_isGlibEventLoopType ) return SalXLib::Wakeup(); QAbstractEventDispatcher::instance( qApp->thread())->wakeUp(); // main thread event loop } -void KDEXLib::PostUserEvent() +void KDE5XLib::PostUserEvent() { if( !m_isGlibEventLoopType ) return SalXLib::PostUserEvent(); QApplication::postEvent(this, new QEvent(QEvent::Type( m_postUserEventId ))); } -void KDEXLib::doStartup() +void KDE5XLib::doStartup() { if( ! m_bStartupDone ) { @@ -387,7 +387,7 @@ void KDEXLib::doStartup() using namespace com::sun::star; -uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker( +uno::Reference< ui::dialogs::XFilePicker2 > KDE5XLib::createFilePicker( const uno::Reference< uno::XComponentContext >& xMSF ) { #if KF5_HAVE_GLIB diff --git a/vcl/unx/kde5/KDE5XLib.hxx b/vcl/unx/kde5/KDE5XLib.hxx index cb506edea1c6..152bba357f3b 100644 --- a/vcl/unx/kde5/KDE5XLib.hxx +++ b/vcl/unx/kde5/KDE5XLib.hxx @@ -35,7 +35,7 @@ class VCLKDEApplication; -class KDEXLib : public QObject, public QAbstractNativeEventFilter, public SalXLib +class KDE5XLib : public QObject, public QAbstractNativeEventFilter, public SalXLib { Q_OBJECT private: @@ -75,8 +75,8 @@ class KDEXLib : public QObject, public QAbstractNativeEventFilter, public SalXLi createFilePickerSignal( const css::uno::Reference< css::uno::XComponentContext >& ); public: - KDEXLib(); - virtual ~KDEXLib() override; + KDE5XLib(); + virtual ~KDE5XLib() override; virtual void Init() override; virtual bool Yield( bool bWait, bool bHandleAllCurrentEvents ) override; diff --git a/vcl/unx/kde5/VCLKDE5Application.cxx b/vcl/unx/kde5/VCLKDE5Application.cxx index cea68a3321f8..15ff9a2dfdac 100644 --- a/vcl/unx/kde5/VCLKDE5Application.cxx +++ b/vcl/unx/kde5/VCLKDE5Application.cxx @@ -24,14 +24,14 @@ #include "KDE5SalDisplay.hxx" -VCLKDEApplication::VCLKDEApplication() : - KApplication() +VCLKDE5Application::VCLKDE5Application() : + QApplication() { } // various hacks to be performed before re-entering Qt's event loop // because of showing a Qt dialog -void VCLKDEApplication::preDialogSetup() +void VCLKDE5Application::preDialogSetup() { // KFileDialog integration requires using event loop with QClipboard. // Opening the KDE file dialog here can lead to QClipboard @@ -47,7 +47,7 @@ void VCLKDEApplication::preDialogSetup() } // various hacks to be performed after a Qt dialog has been closed -void VCLKDEApplication::postDialogCleanup() +void VCLKDE5Application::postDialogCleanup() { // HACK: KFileDialog uses KConfig("kdeglobals") for saving some settings // (such as the auto-extension flag), but that doesn't update KGlobal::config() diff --git a/vcl/unx/kde5/main.cxx b/vcl/unx/kde5/main.cxx index 96af86e54607..654a9d654ee8 100644 --- a/vcl/unx/kde5/main.cxx +++ b/vcl/unx/kde5/main.cxx @@ -54,7 +54,7 @@ extern "C" { #if QT_VERSION < 0x050000 // Qt 4.x support needs >= 4.1.0 OString aVersion( qVersion() ); - SAL_INFO( "vcl.kde4", "qt version string is " << aVersion ); + SAL_INFO( "vcl.kde5", "qt version string is " << aVersion ); sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0; nMajor = aVersion.getToken( 0, '.', nIndex ).toInt32(); @@ -66,17 +66,17 @@ extern "C" { sal_Int32 nMicro = 0; if( nIndex > 0 ) nMicro = aVersion.getToken( 0, '.', nIndex ).toInt32(); - SAL_INFO( "vcl.kde4", "unsuitable qt version " << nMajor << "." << nMinor << "." << nMicro ); + SAL_INFO( "vcl.kde5", "unsuitable qt version " << nMajor << "." << nMinor << "." << nMicro ); #endif return nullptr; } #endif - KDESalInstance* pInstance = new KDESalInstance( new SalYieldMutex() ); - SAL_INFO( "vcl.kde4", "created KDESalInstance " << &pInstance ); + KDE5SalInstance* pInstance = new KDE5SalInstance( new SalYieldMutex() ); + SAL_INFO( "vcl.kde5", "created KDE5SalInstance " << &pInstance ); // initialize SalData - KDEData *salData = new KDEData( pInstance ); + KDE5Data *salData = new KDE5Data( pInstance ); salData->Init(); salData->initNWF(); pInstance->SetLib(salData->GetLib()); |