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

pull/1/head
Timothy Pearson 12 years ago
parent c83e2a3a8e
commit fe1fc00450

@ -328,8 +328,8 @@ void KNetLoad::takeReadingInternal() {
fullReading = i18n(
"Current In: %1 KBit/s, Total In: %2 MB.\n"
"Current Out: %3 KBit/s, Total Out: %4 MB.")
.arg(KGlobal::locale()->formatNumber((int)((bitRateIn + 50) / 100) / 10.0)).arg(KGlobal::locale()->formatNumber(proc->totalMbIn()))
.arg(KGlobal::locale()->formatNumber((int)((bitRateOut + 50) / 100) / 10.0)).arg(KGlobal::locale()->formatNumber(proc->totalMbOut()));
.arg(TDEGlobal::locale()->formatNumber((int)((bitRateIn + 50) / 100) / 10.0)).arg(TDEGlobal::locale()->formatNumber(proc->totalMbIn()))
.arg(TDEGlobal::locale()->formatNumber((int)((bitRateOut + 50) / 100) / 10.0)).arg(TDEGlobal::locale()->formatNumber(proc->totalMbOut()));
}
void KNetLoad::updateDeviceMenu(KPopupMenu* menu) {

@ -56,7 +56,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.
@ -116,7 +116,7 @@ void StatPopup::initDock(StatDock* target, KPopupMenu* menu, int whichDock) {
actColor1->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