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

4 files changed, 9 insertions, 9 deletions

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
  *