diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/kcontrol | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol')
-rw-r--r-- | kcontrol/kcontrol/aboutwidget.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kcontrol/dockcontainer.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kcontrol/helpwidget.cpp | 4 | ||||
-rw-r--r-- | kcontrol/kcontrol/main.cpp | 8 | ||||
-rw-r--r-- | kcontrol/kcontrol/modulemenu.cpp | 4 | ||||
-rw-r--r-- | kcontrol/kcontrol/modules.cpp | 12 | ||||
-rw-r--r-- | kcontrol/kcontrol/modules.h | 6 | ||||
-rw-r--r-- | kcontrol/kcontrol/moduletreeview.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kcontrol/searchwidget.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kcontrol/toplevel.cpp | 10 |
10 files changed, 26 insertions, 26 deletions
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 1bfd3d127..12db9e615 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -150,7 +150,7 @@ void AboutWidget::updatePixmap() } else { - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQString iconPath; if (!_icon.isEmpty()) { iconPath = loader->iconPath( _icon, KIcon::Toolbar ); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 5c4907a91..d6cdd91d1 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -83,7 +83,7 @@ void ModuleTitle::showTitleFor( ConfigModule *config ) TQWhatsThis::remove( this ); TQWhatsThis::add( this, config->comment() ); - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 ); m_icon->setPixmap( icon ); m_name->setText( config->moduleName() ); diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 7421d353e..76fc756c4 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -74,13 +74,13 @@ bool HelpWidget::clicked(const TQString & _url) return true; } - KProcess process; + TDEProcess process; KURL url(KURL("help:/"), _url); if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { process << "khelpcenter" << url.url(); - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); } else { new KRun(url); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 411a95748..7edc8bd43 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -56,7 +56,7 @@ KControlApp::KControlApp() toplevel = new TopLevel(); setMainWidget(toplevel); - KGlobal::setActiveInstance(this); + TDEGlobal::setActiveInstance(this); // KUniqueApplication does dcop regitration for us ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface"); @@ -64,8 +64,8 @@ KControlApp::KControlApp() connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); - TQRect desk = KGlobalSettings::desktopGeometry(toplevel); - KConfig *config = KGlobal::config(); + TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); // Initial size is: // never bigger than workspace as reported by desk @@ -88,7 +88,7 @@ KControlApp::~KControlApp() { if (toplevel) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index ad60eda5a..2b8f74b12 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -72,7 +72,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) TQString name = group->caption(); name.replace("&", "&&"); - parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) + parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, menu); fill(menu, path); @@ -87,7 +87,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) TQString name = module->moduleName(); name.replace("&", "&&"); - int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) + int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, id); _moduleDict.insert(realid, module); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 584480837..592eb52c2 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -189,7 +189,7 @@ void ConfigModule::runAsRoot() TQString tdesu = KStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { - _rootProcess = new KProcess; + _rootProcess = new TDEProcess; *_rootProcess << tdesu; *_rootProcess << "--nonewdcop"; // We have to disable the keep-password feature because @@ -198,15 +198,15 @@ void ConfigModule::runAsRoot() // We also don't have a way to close the module in that case. *_rootProcess << "--n"; // Don't keep password. if (kdeshell) { - *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language()); + *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); } else { - *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() ); + *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); } - connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(rootExited(KProcess*))); + connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*))); - if ( !_rootProcess->start(KProcess::NotifyOnExit) ) + if ( !_rootProcess->start(TDEProcess::NotifyOnExit) ) { delete _rootProcess; _rootProcess = 0L; @@ -226,7 +226,7 @@ void ConfigModule::runAsRoot() } -void ConfigModule::rootExited(KProcess *) +void ConfigModule::rootExited(TDEProcess *) { if (_embedWidget->embeddedWinId()) XDestroyWindow(tqt_xdisplay(), _embedWidget->embeddedWinId()); diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index fc5406fa6..bb612e376 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -30,7 +30,7 @@ class TQStringList; class TDEAboutData; class KCModule; class ProxyWidget; -class KProcess; +class TDEProcess; class QXEmbed; class TQVBoxLayout; class TQVBox; @@ -63,7 +63,7 @@ private slots: void clientClosed(); void clientChanged(bool state); void runAsRoot(); - void rootExited(KProcess *proc); + void rootExited(TDEProcess *proc); void embedded(); @@ -80,7 +80,7 @@ private: bool _changed; ProxyWidget *_module; QXEmbed *_embedWidget; - KProcess *_rootProcess; + TDEProcess *_rootProcess; TQVBoxLayout *_embedLayout; TQVBox *_embedFrame; TQWidgetStack *_embedStack; diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 794a69b91..7c095c5f7 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -38,7 +38,7 @@ static TQPixmap appIcon(const TQString &iconName) { TQString path; - TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true); + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true); // make sure they are not larger than KIcon::SizeSmall if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall) { diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 2333774ba..1b32e0f7f 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap public: ModuleItem(ConfigModule *module, TQListBox * listbox = 0) : TQListBoxPixmap(listbox, - KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall), + TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall), module->moduleName()) , m_module(module) { diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index bd3c70222..62b23591a 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name) report_bug = 0; // read settings - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Index"); TQString viewmode = config->readEntry("ViewMode", "Tree"); @@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name) TQT_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) ); } else { @@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name) TopLevel::~TopLevel() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Index"); if (KCGlobal::viewMode() == Tree) config->writeEntry("ViewMode", "Tree"); @@ -486,7 +486,7 @@ void TopLevel::reportBug() bool deleteit = false; if (!_active) // report against kcontrol - dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData()); + dummyAbout = const_cast<TDEAboutData*>(TDEGlobal::instance()->aboutData()); else { if (_active->aboutData()) |