From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/compatibility/kmdi/qextmdi/kdockwidget.cpp') diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 00ba06c7..92fc9ba3 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -1616,7 +1616,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) d->mainDockWidget=0; #ifndef NO_KDE2 - d->splitterOpaqueResize = KGlobalSettings::opaqueResize(); + d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize(); #else d->splitterOpaqueResize = false; #endif @@ -2477,7 +2477,7 @@ void KDockManager::setReadDockConfigMode(int mode) void KDockManager::writeConfig( KConfig* c, TQString group ) { //debug("BEGIN Write Config"); - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); @@ -2618,7 +2618,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) #include void KDockManager::readConfig( KConfig* c, TQString group ) { - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); -- cgit v1.2.3