From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- twin/kcmtwin/twindecoration/buttons.cpp | 2 +- twin/kcmtwin/twindecoration/preview.cpp | 4 ++-- twin/kcmtwin/twindecoration/twindecoration.cpp | 6 +++--- twin/kcmtwin/twinoptions/main.cpp | 12 ++++++------ twin/kcmtwin/twinoptions/mouse.cpp | 8 ++++---- twin/kcmtwin/twinoptions/windows.cpp | 4 ++-- twin/kcmtwin/twinoptions/windows.h | 4 ++-- twin/kcmtwin/twinrules/kcm.cpp | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'twin/kcmtwin') diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 3cf0ab78d..fc00dea9d 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -607,7 +607,7 @@ void ButtonDropSite::drawContents( TQPainter* p ) TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour p->fillRect( r, c1 ); p->setPen( Qt::white ); - p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); + p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") ); offset = geometry().width() - 3 - rightoffset; diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp index 29d93a7f3..43555ef60 100644 --- a/twin/kcmtwin/twindecoration/preview.cpp +++ b/twin/kcmtwin/twindecoration/preview.cpp @@ -321,8 +321,8 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const TQIconSet KDecorationPreviewBridge::icon() const { - return TQIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), - KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); + return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), + TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); } TQString KDecorationPreviewBridge::caption() const diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 4f9c82a21..efe46c1bc 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -399,7 +399,7 @@ KWinDecorationModule::~KWinDecorationModule() // And insert these into a DecorationInfo structure void KWinDecorationModule::findDecorations() { - TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin"); + TQStringList dirList = TDEGlobal::dirs()->findDirs("data", "twin"); TQStringList::ConstIterator it; for (it = dirList.begin(); it != dirList.end(); it++) @@ -819,13 +819,13 @@ void KWinDecorationModule::writeConfig( KConfig* conf ) wmExecutableName.truncate(descStart); } if (conf->readEntry("WMExecutable", "twin") != wmExecutableName) { - KProcess newWMProc; + TDEProcess newWMProc; TQStringList wmstartupcommand; wmstartupcommand.split(" ", thirdpartyWMArguments->text()); wmstartupcommand.prepend(wmExecutableName); wmstartupcommand.append("--replace"); newWMProc << wmstartupcommand; - newWMProc.start(KProcess::DontCare, KProcess::NoCommunication); + newWMProc.start(TDEProcess::DontCare, TDEProcess::NoCommunication); newWMProc.detach(); } conf->writeEntry("WMExecutable", wmExecutableName); diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index 5b193ed5f..3c072996b 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -39,7 +39,7 @@ extern "C" KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KFocusConfig(true, c, parent, name); } @@ -47,14 +47,14 @@ extern "C" KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); return new KActionsOptions( parent, name); } KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KMovingConfig(true, c, parent, name); } @@ -62,7 +62,7 @@ extern "C" KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KAdvancedConfig(true, c, parent, name); } @@ -70,7 +70,7 @@ extern "C" KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); KConfig *c = new KConfig("twinrc", false, true); return new KTranslucencyConfig(true, c, parent, name); } @@ -78,7 +78,7 @@ extern "C" KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + TDEGlobal::locale()->insertCatalogue("kcmkwm"); return new KWinOptions( parent, name); } } diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 077df2ee4..76b4ba2f9 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -109,8 +109,8 @@ void createMaxButtonPixmaps() "..............."}, }; - TQString baseColor(". c " + KGlobalSettings::baseColor().name()); - TQString textColor("# c " + KGlobalSettings::textColor().name()); + TQString baseColor(". c " + TDEGlobalSettings::baseColor().name()); + TQString textColor("# c " + TDEGlobalSettings::textColor().name()); for (int t = 0; t < 3; ++t) { maxButtonXpms[t][0] = "15 13 2 1"; @@ -143,7 +143,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQString strMouseButton1, strMouseButton3, strMouseWheel; TQString txtButton1, txtButton3, txtButton4; TQStringList items; - bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded); /** Titlebar doubleclick ************/ @@ -595,7 +595,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQString strMouseButton1, strMouseButton3; TQString txtButton1, txtButton3; TQStringList items; - bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded); /** Inactive inner window ******************/ diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index f7b5780b7..fd2152db2 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -1708,9 +1708,9 @@ void KTranslucencyConfig::defaults() bool KTranslucencyConfig::kompmgrAvailable() { bool ret; - KProcess proc; + TDEProcess proc; proc << "kompmgr" << "-v"; - ret = proc.start(KProcess::DontCare, KProcess::AllOutput); + ret = proc.start(TDEProcess::DontCare, TDEProcess::AllOutput); proc.detach(); return ret; } diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h index cbce12676..4c6290a4e 100644 --- a/twin/kcmtwin/twinoptions/windows.h +++ b/twin/kcmtwin/twinoptions/windows.h @@ -238,7 +238,7 @@ private: TQCheckBox* hideUtilityWindowsForInactive; }; -class KProcess; +class TDEProcess; class KTranslucencyConfig : public KCModule { Q_OBJECT @@ -289,7 +289,7 @@ private: void startKompmgr(); void stopKompmgr(); bool kompmgrAvailable_; - KProcess *kompmgr; + TDEProcess *kompmgr; private slots: void resetKompmgr(); diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index d498a5e71..9b3b1676e 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -31,7 +31,7 @@ extern "C" KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name ) { //CT there's need for decision: kwm or twin? - KGlobal::locale()->insertCatalogue( "kcmtwinrules" ); + TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" ); return new KWinInternal::KCMRules( parent, name ); } -- cgit v1.2.3