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

11 files changed, 22 insertions, 22 deletions

diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index 258a5d965..8df54f231 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -140,7 +140,7 @@ void KCModuleContainer::addModule( const TQString& module )
 	KCModuleProxy* proxy = new KCModuleProxy( module, false, d->tabWidget, module.latin1());
 	allModules.append( proxy );
 
-	d->tabWidget->addTab( proxy, TQIconSet(KGlobal::iconLoader()->loadIcon(
+	d->tabWidget->addTab( proxy, TQIconSet(TDEGlobal::iconLoader()->loadIcon(
 					proxy->moduleInfo().icon(), KIcon::Desktop)),
 			/* QT eats ampersands for dinner. But not this time. */
 			proxy->moduleInfo().moduleName().replace( "&", "&&" ));
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 3528ae738..f034c9a5f 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -93,7 +93,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 		TQStringList							args;
 		KCModule							*kcm;
 		QXEmbed								*embedWidget;
-		KProcess							*rootProcess;
+		TDEProcess							*rootProcess;
 		TQVBox								*embedFrame;
 		KCModuleProxyIfaceImpl  					*dcopObject;
 		DCOPClient							*dcopClient;
@@ -359,17 +359,17 @@ void KCModuleProxy::runAsRoot()
 	if (!tdesu.isEmpty())
 	{
 
-		d->rootProcess = new KProcess;
+		d->rootProcess = new TDEProcess;
 
 		*d->rootProcess << tdesu;
 		*d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon());
 
 		*d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell"))
-			.arg(cmd).arg(d->embedWidget->winId()).arg(KGlobal::locale()->language());
+			.arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language());
 
-		connect(d->rootProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(rootExited()));
+		connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited()));
 
-		if ( !d->rootProcess->start( KProcess::NotifyOnExit ))
+		if ( !d->rootProcess->start( TDEProcess::NotifyOnExit ))
 		{
 			d->rootMode = false;
 			rootExited();
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index 633652955..baf532e34 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -31,7 +31,7 @@ class TDEAboutData;
 class KCModule;
 class KCModuleInfo;
 class TDEInstance;
-class KProcess;
+class TDEProcess;
 
 /**
  * @ingroup kcmodule
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index 58c196abc..511af866b 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -196,10 +196,10 @@ void KCMultiDialog::slotHelp()
     KURL url( KURL("help:/"), docPath );
 
     if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
-        KProcess process;
+        TDEProcess process;
         process << "khelpcenter"
                 << url.url();
-        process.start(KProcess::DontCare);
+        process.start(TDEProcess::DontCare);
 		process.detach();
     } else {
         new KRun(url);
diff --git a/kutils/kplugininfo.cpp b/kutils/kplugininfo.cpp
index 7b83be7ed..acdf57dc2 100644
--- a/kutils/kplugininfo.cpp
+++ b/kutils/kplugininfo.cpp
@@ -179,7 +179,7 @@ TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KC
 
 TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, KConfig * config, const TQString & group )
 {
-    TQStringList files = KGlobal::dirs()->findAllResources( "data", name +
+    TQStringList files = TDEGlobal::dirs()->findAllResources( "data", name +
             "/kpartplugins/*.desktop", true, false );
     return fromFiles( files, config, group );
 }
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 3b6b4c39a..9dbf42c4a 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -575,7 +575,7 @@ static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName
     if( instanceName.isNull() )
         return TQValueList<KPluginInfo*>(); //nothing
 
-    const TQStringList desktopfilenames = KGlobal::dirs()->findAllResources( "data",
+    const TQStringList desktopfilenames = TDEGlobal::dirs()->findAllResources( "data",
             instanceName + "/kpartplugins/*.desktop", true, false );
     return KPluginInfo::fromFiles( desktopfilenames );
 }
@@ -631,7 +631,7 @@ void KPluginSelector::addPlugins( const TQValueList<KPluginInfo*> & plugininfos,
 {
     checkNeedForTabWidget();
     // the KConfigGroup becomes owned by KPluginSelectionWidget
-    KConfigGroup * cfgGroup = new KConfigGroup( config ? config : KGlobal::config(), "Plugins" );
+    KConfigGroup * cfgGroup = new KConfigGroup( config ? config : TDEGlobal::config(), "Plugins" );
     kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl;
     addPluginsInternal( plugininfos, catname, category, cfgGroup );
 }
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index f018d2f9e..87026154e 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -130,7 +130,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          *                     and all plugins are shown.
          * @param config       The KConfig object that holds the state of the
          *                     plugins being enabled or not. By default it will
-         *                     use KGlobal::config(). It is recommended to
+         *                     use TDEGlobal::config(). It is recommended to
          *                     always pass a KConfig object if you use
          *                     KSettings::PluginPage since you never know from where the
          *                     page will be called (think global config app).
diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox
index f42c325eb..b9efd0dcb 100644
--- a/kutils/ksettings/README.dox
+++ b/kutils/ksettings/README.dox
@@ -77,7 +77,7 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args
 \endcode
 
 For the KConfig object you can either use
-KGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ).
+TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ).
 I added a method to KSettings::Dispatcher that gives you the KConfig
 object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName
 
@@ -122,7 +122,7 @@ Some explanation for those keys:
 - X-TDE-ParentApp is the name of the application this config page belongs to. It
   is used by the first two \ref KSettings::Dialog constructors. The Dialog will
   use all modules that set X-TDE-ParentApp to
-  KGlobal::instance()->instanceName(). It
+  TDEGlobal::instance()->instanceName(). It
   should be pretty easy to find out what name that is: look at the first
   argument to the TDEAboutData ctor.
 - X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever)
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index 8fbe74c81..c64e2e64a 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -428,7 +428,7 @@ KCMultiDialog * Dialog::dialog()
 TQValueList<KService::Ptr> Dialog::instanceServices() const
 {
 	kdDebug( 700 ) << k_funcinfo << endl;
-	TQString instanceName = KGlobal::instance()->instanceName();
+	TQString instanceName = TDEGlobal::instance()->instanceName();
 	d->registeredComponents.append( instanceName );
 	kdDebug( 700 ) << "calling KServiceGroup::childGroup( " << instanceName
 		<< " )" << endl;
@@ -533,8 +533,8 @@ void Dialog::createDialogFromServices()
 {
 	// read .setdlg files
 	TQString setdlgpath = locate( "appdata",
-			KGlobal::instance()->instanceName() + ".setdlg" );
-	TQStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata",
+			TDEGlobal::instance()->instanceName() + ".setdlg" );
+	TQStringList setdlgaddon = TDEGlobal::dirs()->findAllResources( "appdata",
 			"ksettingsdialog/*.setdlg" );
 	if( ! setdlgpath.isNull() )
 		parseGroupFile( setdlgpath );
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index 5a8afa510..cd9b539ef 100644
--- a/kutils/ksettings/dialog.h
+++ b/kutils/ksettings/dialog.h
@@ -95,7 +95,7 @@ class KUTILS_EXPORT Dialog : public TQObject
 
         /**
          * Construct a new Preferences Dialog for the application. It uses all
-         * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName().
+         * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName().
          *
          * @param parent       The parent is only used as the parent for the
          *                     dialog - centering the dialog over the parent
@@ -106,7 +106,7 @@ class KUTILS_EXPORT Dialog : public TQObject
 
         /**
          * Construct a new Preferences Dialog for the application. It uses all
-         * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName().
+         * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName().
          *
          * @param content      Select whether you want a static or configurable
          *                     config dialog.
diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h
index 74c7756da..16cfbc572 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/kutils/ksettings/pluginpage.h
@@ -44,8 +44,8 @@ namespace KSettings
  * MyAppPluginConfig( TQWidget * parent, const char *, const TQStringList & args )
  *     : PluginPage( MyAppPluginConfigFactory::instance(), parent, args )
  * {
- *     pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" );
- *     pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" );
+ *     pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" );
+ *     pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" );
  * }
  * \endcode
  *