summaryrefslogtreecommitdiffstats
path: root/twin/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /twin/lib
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'twin/lib')
-rw-r--r--twin/lib/kdecoration_p.cpp2
-rw-r--r--twin/lib/kdecoration_plugins_p.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index 1e063d099..fbf35c285 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -145,7 +145,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
TQFont old_activeFontSmall = activeFontSmall;
TQFont old_inactiveFontSmall = inactiveFontSmall;
- TQFont activeFontGuess = KGlobalSettings::windowTitleFont();
+ TQFont activeFontGuess = TDEGlobalSettings::windowTitleFont();
activeFont = config->readFontEntry("activeFont", &activeFontGuess);
inactiveFont = config->readFontEntry("inactiveFont", &activeFont);
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index 644f4a63c..b680170c3 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -168,13 +168,13 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
// For clients in tdeartwork
TQString catalogue = nameStr;
catalogue.replace( "twin3_", "twin_" );
- KGlobal::locale()->insertCatalogue( catalogue );
+ TDEGlobal::locale()->insertCatalogue( catalogue );
// For KCommonDecoration based clients
- KGlobal::locale()->insertCatalogue( "twin_lib" );
+ TDEGlobal::locale()->insertCatalogue( "twin_lib" );
// For clients in tdebase
- KGlobal::locale()->insertCatalogue( "twin_clients" );
+ TDEGlobal::locale()->insertCatalogue( "twin_clients" );
// For clients in tdeartwork
- KGlobal::locale()->insertCatalogue( "twin_art_clients" );
+ TDEGlobal::locale()->insertCatalogue( "twin_art_clients" );
old_library = oldLibrary; // save for delayed destroying
old_fact = oldFactory;