Rename KInstance and KAboutData to avoid conflicts with KDE4

11 files changed, 29 insertions, 29 deletions

diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index c613e4385..258a5d965 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -182,7 +182,7 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
 		d->btnRootMode->setEnabled( false );
 
 	setQuickHelp( mod->quickHelp() );
-	setAboutData( const_cast<KAboutData*>(mod->aboutData()) );
+	setAboutData( const_cast<TDEAboutData*>(mod->aboutData()) );
 
 }
 
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 2323cd262..3528ae738 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -586,12 +586,12 @@ TQString KCModuleProxy::quickHelp() const
 	}
 }
 
-const KAboutData * KCModuleProxy::aboutData() const
+const TDEAboutData * KCModuleProxy::aboutData() const
 {
 	if( !d->rootMode )
 		return realModule() ? realModule()->aboutData() : 0;
 	else
-	/* This needs fixing, perhaps cache a KAboutData copy 
+	/* This needs fixing, perhaps cache a TDEAboutData copy 
 	 * while in root mode? */
 		return 0;
 		
@@ -614,7 +614,7 @@ bool KCModuleProxy::useRootOnlyMsg() const
 	return realModule() ? realModule()->useRootOnlyMsg() : true;
 }
 
-KInstance * KCModuleProxy::instance() const
+TDEInstance * KCModuleProxy::instance() const
 {
 	return realModule() ? realModule()->instance() : 0;
 }
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index 11ae06dbb..633652955 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -27,10 +27,10 @@
 #include <kservice.h>
 #include <tdelibs_export.h>
 
-class KAboutData;
+class TDEAboutData;
 class KCModule;
 class KCModuleInfo;
-class KInstance;
+class TDEInstance;
 class KProcess;
 
 /**
@@ -155,7 +155,7 @@ public:
 	/**
 	 * @return the module's aboutData()
 	 */
-	const KAboutData * aboutData() const;
+	const TDEAboutData * aboutData() const;
 
 	/**
 	 * @return what buttons the module
@@ -181,11 +181,11 @@ public:
 	// this one's available via moduleInfo()-> and realModule()->
 
 	/**
-	 * Returns the embedded KCModule's KInstance.
-	 * @return The module's KInstance.
+	 * Returns the embedded KCModule's TDEInstance.
+	 * @return The module's TDEInstance.
 	 * @deprecated
 	 */
-	KInstance * instance() const;
+	TDEInstance * instance() const;
 	//KDE4 remove. There's a limit for convenience functions,
 	// this one's available via realModule()
 
diff --git a/kutils/kplugininfo.h b/kutils/kplugininfo.h
index b75edf1a2..bebd11cb6 100644
--- a/kutils/kplugininfo.h
+++ b/kutils/kplugininfo.h
@@ -133,7 +133,7 @@ class KUTILS_EXPORT KPluginInfo
         /**
          * @return A list of KPluginInfo objects for the KParts plugins of an
          * instance. You only need the name of the instance not a pointer to the
-         * KInstance object.
+         * TDEInstance object.
          */
         static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null );
 
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index a385d2719..3b6b4c39a 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -618,7 +618,7 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin
     d->pswidgets += w;
 }
 
-void KPluginSelector::addPlugins( const KInstance * instance, const TQString &
+void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString &
         catname, const TQString & category, KConfig * config )
 {
     if ( !config )
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index 278906793..f018d2f9e 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-class KInstance;
+class TDEInstance;
 class KPluginInfo;
 class TQWidgetStack;
 class KConfig;
@@ -78,7 +78,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          * The information about the plugins will be loaded from the
          * share/apps/&lt;instancename&gt;/kpartplugins directory.
          *
-         * @param instanceName The name of the KInstance of the plugin's parent.
+         * @param instanceName The name of the TDEInstance of the plugin's parent.
          * @param catname      The translated name of the category. This is the
          *                     name that is shown in the TabWidget if there is
          *                     more than one category.
@@ -107,7 +107,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          * Add a list of KParts plugins. Convenience method for the one above.
          * If not set explicitely, @p config is set to instance->config().
          */
-        void addPlugins( const KInstance * instance,
+        void addPlugins( const TDEInstance * instance,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
                 KConfig * config = 0 );
diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox
index 4abfc6be5..f42c325eb 100644
--- a/kutils/ksettings/README.dox
+++ b/kutils/ksettings/README.dox
@@ -124,7 +124,7 @@ Some explanation for those keys:
   use all modules that set X-TDE-ParentApp to
   KGlobal::instance()->instanceName(). It
   should be pretty easy to find out what name that is: look at the first
-  argument to the KAboutData ctor.
+  argument to the TDEAboutData ctor.
 - X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever)
   this config page belongs to. Normally there is only one component.
   It is used for two things:
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index 7f20c1bc3..eb9acf0bc 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -58,10 +58,10 @@ Dispatcher::~Dispatcher()
     //delete d;
 }
 
-void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const char * slot )
+void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, const char * slot )
 {
     assert( instance != 0 );
-    // keep the KInstance around and call
+    // keep the TDEInstance around and call
     // instance->config()->reparseConfiguration when the app should reparse
     TQCString instanceName = instance->instanceName();
     kdDebug( 701 ) << k_funcinfo << instanceName << endl;
@@ -88,7 +88,7 @@ KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
     kdDebug( 701 ) << k_funcinfo << endl;
     if( m_instanceInfo.contains( instanceName ) )
     {
-        KInstance * inst = m_instanceInfo[ instanceName ].instance;
+        TDEInstance * inst = m_instanceInfo[ instanceName ].instance;
         if( inst )
             return inst->config();
     }
@@ -145,7 +145,7 @@ void Dispatcher::unregisterInstance( TQObject * obj )
     }
 }
 
-//X KInstance * Dispatcher::instanceForName( const TQCString & instanceName )
+//X TDEInstance * Dispatcher::instanceForName( const TQCString & instanceName )
 //X {
 //X     return m_instanceInfo[ instanceName ].instance;
 //X }
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index 52829f9e7..c04a41b99 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -28,7 +28,7 @@ class TQCString;
 class TQSignal;
 class TQStrList;
 template<class T> class KStaticDeleter;
-class KInstance;
+class TDEInstance;
 class KConfig;
 
 namespace KSettings
@@ -61,17 +61,17 @@ class KUTILS_EXPORT Dispatcher : public TQObject
 
         /**
          * Register a slot to be called when the configuration for the instance
-         * has changed. @p instance is the KInstance object
+         * has changed. @p instance is the TDEInstance object
          * that is passed to KGenericFactory (if it is used). You can query
          * it with KGenericFactory<YourClassName>::instance().
          * instance->instanceName() is also the same name that is put into the
          * .desktop file of the KCMs for the X-TDE-ParentComponents.
          *
-         * @param instance     The KInstance object
+         * @param instance     The TDEInstance object
          * @param recv         The object that should receive the signal
          * @param slot         The slot to be called: TQT_SLOT( slotName() )
          */
-        void registerInstance( KInstance * instance, TQObject * recv, const char * slot );
+        void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot );
 
         /**
          * @return the KConfig object that belongs to the instanceName
@@ -85,10 +85,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         TQStrList instanceNames() const;
 
 //X         /**
-//X          * @return The KInstance object belonging to the instance name you pass
+//X          * @return The TDEInstance object belonging to the instance name you pass
 //X          * (only works for registered instances of course).
 //X          */
-//X         KInstance * instanceForName( const TQCString & instanceName );
+//X         TDEInstance * instanceForName( const TQCString & instanceName );
 
     public slots:
         /**
@@ -116,7 +116,7 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         static Dispatcher * m_self;
 
         struct InstanceInfo {
-            KInstance * instance;
+            TDEInstance * instance;
             TQSignal * signal;
             int count;
         };
diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp
index 99ea904f2..4a94d21d4 100644
--- a/kutils/ksettings/pluginpage.cpp
+++ b/kutils/ksettings/pluginpage.cpp
@@ -46,7 +46,7 @@ class PluginPage::PluginPagePrivate
     connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
 }
 
-    PluginPage::PluginPage( KInstance * instance, TQWidget * parent, const TQStringList & args )
+    PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
     : KCModule( instance, parent, args )
     , d( new PluginPagePrivate )
 {
diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h
index df9acd490..74c7756da 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/kutils/ksettings/pluginpage.h
@@ -84,7 +84,7 @@ class KUTILS_EXPORT PluginPage : public KCModule
          * Standart KCModule constructor. Automatically creates the the
          * KPluginSelector widget.
          */
-        PluginPage( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
+        PluginPage( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
 
         ~PluginPage();