summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:20:13 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:20:13 -0600
commit67799121a2843f131fab7da2c1b11d180d908f07 (patch)
treebc8dc22b9739047ef3bb77c70c072f832c8fcea0
parent145eccb81496ef6dde588d34a360e67d2e65c793 (diff)
downloadkcpuload-67799121a2843f131fab7da2c1b11d180d908f07.tar.gz
kcpuload-67799121a2843f131fab7da2c1b11d180d908f07.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--kcpuload/kcpuload/statpopup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcpuload/kcpuload/statpopup.cpp b/kcpuload/kcpuload/statpopup.cpp
index 668614b..1993166 100644
--- a/kcpuload/kcpuload/statpopup.cpp
+++ b/kcpuload/kcpuload/statpopup.cpp
@@ -79,7 +79,7 @@ StatPopup::StatPopup(bool useSupportSplit, TQWidget *parent, const char *name) :
// Prepare for actions and the config file, but don't actually add
// any actions or read the configuration.
- config = KGlobal::config();
+ config = TDEGlobal::config();
coll = new KActionCollection(this);
// Set up a timer for our periodic updates.
@@ -138,7 +138,7 @@ void StatPopup::initDock(StatDock* target, KPopupMenu* menu, int whichDock) {
r[whichDock].actColor->plug(menu);
menu->insertSeparator();
menu->insertItem(SmallIcon("help"), i18n("&Help"),
- (new KHelpMenu(0, KGlobal::instance()->aboutData(), false))->menu());
+ (new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false))->menu());
// Set up display properties for the dock.
target->setActive(actActive->isChecked());