Browse Source

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent
commit
67799121a2
  1. 4
      kcpuload/kcpuload/statpopup.cpp

4
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());

Loading…
Cancel
Save