Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

27 files changed, 402 insertions, 402 deletions

diff --git a/kutils/Mainpage.dox b/kutils/Mainpage.dox
index 935908d1d..77abe5777 100644
--- a/kutils/Mainpage.dox
+++ b/kutils/Mainpage.dox
@@ -1,6 +1,6 @@
 /** @mainpage Some random bits and pieces
 
-Some utility classes for KSettings, KCModule and KPlugin.
+Some utility classes for KSettings, TDECModule and KPlugin.
 
 @authors
 Matthias Kretz \<kretz@kde.org\><br>
diff --git a/kutils/TODO b/kutils/TODO
index 82f28e129..7d9f473ab 100644
--- a/kutils/TODO
+++ b/kutils/TODO
@@ -1,25 +1,25 @@
 
 This is a list of random changes to do in KDE 4 with the various KCM* classes.
 
-* KCModuleinfo;
+* TDECModuleinfo;
 	- Make it inherit KService; saves a lot of code, simplifies ctors/overloads in surrounding classes
 	- Implement docPath in KService
 	- Get rid of loadAll() and do lazy loading in each getter
 
-* Merge KCModuleProxy and its DCOP Object class(MI)
+* Merge TDECModuleProxy and its DCOP Object class(MI)
 
-* Get rid of `QStringlist arguments` in KCModule and all the helper classes(simplify API)
+* Get rid of `QStringlist arguments` in TDECModule and all the helper classes(simplify API)
 
 * Move stuff to d pointers.. Too much hackish solutions otherwise
 
 * Get rid of bool fallback argument in helper classes(never fails, simplify API)
 
-* Re-implement the QScrollView(d->view) in KCModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval.
+* Re-implement the QScrollView(d->view) in TDECModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval.
 
-* The API in KCModule, KCModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification.
+* The API in TDECModule, TDECModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification.
 
-* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if KCModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?).
+* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if TDECModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?).
 
-* Root modules in KCModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the  XEmbed Protocol Specification says:
+* Root modules in TDECModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the  XEmbed Protocol Specification says:
 
 Solving the drag-and-drop problem, however, is quite easy, since the XDND protocol was carefully designed in a way that makes it possible to support embedded windows. Basically, the embedder has to operate as drag-and-drop proxy for the client. Any XDND messages like XdndEnter, Xdnd,Leave, etc. simply have to be passed through. A toolkit's XDND implementation has to take this situation in consideration.
diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index 8df54f231..b91ffb641 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -40,10 +40,10 @@
 #include "kcmodulecontainer.moc"
 
 /***********************************************************************/
-class KCModuleContainer::KCModuleContainerPrivate
+class TDECModuleContainer::TDECModuleContainerPrivate
 {
 	public:
-		KCModuleContainerPrivate( const TQStringList& mods )
+		TDECModuleContainerPrivate( const TQStringList& mods )
 			: modules( mods )
 			, tabWidget( 0 )
 			, buttons( 0 )
@@ -70,22 +70,22 @@ class KCModuleContainer::KCModuleContainerPrivate
 
 
 /***********************************************************************/
-KCModuleContainer::KCModuleContainer( TQWidget* parent, const char* name, 
+TDECModuleContainer::TDECModuleContainer( TQWidget* parent, const char* name, 
 	const TQString& mods )
-	: KCModule( parent, name )
+	: TDECModule( parent, name )
 {
-	d = new KCModuleContainerPrivate( TQStringList::split( ",", TQString(mods).remove( " " )) );
+	d = new TDECModuleContainerPrivate( TQStringList::split( ",", TQString(mods).remove( " " )) );
 	init();
 }
 
-KCModuleContainer::KCModuleContainer( TQWidget* parent, const char* name, 
+TDECModuleContainer::TDECModuleContainer( TQWidget* parent, const char* name, 
 	const TQStringList& mods )
-	: KCModule( parent, name ), d( new KCModuleContainerPrivate( mods ) )
+	: TDECModule( parent, name ), d( new TDECModuleContainerPrivate( mods ) )
 {
 	init();
 }
 
-void KCModuleContainer::init()
+void TDECModuleContainer::init()
 {
 	d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" );
 	d->tabWidget = new TQTabWidget(this, "tabWidget");
@@ -104,7 +104,7 @@ void KCModuleContainer::init()
 
 }
 
-void KCModuleContainer::finalize()
+void TDECModuleContainer::finalize()
 {
 	setButtons( d->buttons );
 	if ( d->hasRootKCM ) /* Add a root mode button */
@@ -121,7 +121,7 @@ void KCModuleContainer::finalize()
 	}
 }
 
-void KCModuleContainer::addModule( const TQString& module )
+void TDECModuleContainer::addModule( const TQString& module )
 {
 	/* In case it doesn't exist we just silently drop it.
 	 * This allows people to easily extend containers.
@@ -129,15 +129,15 @@ void KCModuleContainer::addModule( const TQString& module )
 	 */
 	if ( !KService::serviceByDesktopName( module ) )
 	{
-		kdDebug(713) << "KCModuleContainer: module '" << 
+		kdDebug(713) << "TDECModuleContainer: module '" << 
 			module << "' was not found and thus not loaded" << endl;
 		return;
 	}
 
-	if( !KCModuleLoader::testModule( module ))
+	if( !TDECModuleLoader::testModule( module ))
 		return;
 
-	KCModuleProxy* proxy = new KCModuleProxy( module, false, d->tabWidget, module.latin1());
+	TDECModuleProxy* proxy = new TDECModuleProxy( module, false, d->tabWidget, module.latin1());
 	allModules.append( proxy );
 
 	d->tabWidget->addTab( proxy, TQIconSet(TDEGlobal::iconLoader()->loadIcon(
@@ -147,7 +147,7 @@ void KCModuleContainer::addModule( const TQString& module )
 
 	d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() );
 
-	connect( proxy, TQT_SIGNAL(changed(KCModuleProxy *)), TQT_SLOT(moduleChanged(KCModuleProxy *)));
+	connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *)));
 
 	/* Collect our buttons - we go for the common deliminator */
 	d->buttons = d->buttons | proxy->realModule()->buttons();
@@ -159,7 +159,7 @@ void KCModuleContainer::addModule( const TQString& module )
 
 }
 
-void KCModuleContainer::tabSwitched( TQWidget * module )
+void TDECModuleContainer::tabSwitched( TQWidget * module )
 {
 	if ( !d->hasRootKCM )
 		return;
@@ -168,7 +168,7 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
 	disconnect( d->btnRootMode, 0, 0, 0 );
 	/* Welcome to the real world huh baby? */
 	
-	KCModuleProxy* mod = (KCModuleProxy *) module;
+	TDECModuleProxy* mod = (TDECModuleProxy *) module;
 
 	if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() )
 	{
@@ -186,20 +186,20 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
 
 }
 
-void KCModuleContainer::runAsRoot()
+void TDECModuleContainer::runAsRoot()
 {
 	if ( d->tabWidget->currentPage() )
-		( (KCModuleProxy *) d->tabWidget->currentPage() )->runAsRoot();
+		( (TDECModuleProxy *) d->tabWidget->currentPage() )->runAsRoot();
 	d->btnRootMode->setEnabled( false );
 }
 
-void KCModuleContainer::rootExited()
+void TDECModuleContainer::rootExited()
 {
 	connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() ));
 	d->btnRootMode->setEnabled( true );
 }
 
-void KCModuleContainer::save()
+void TDECModuleContainer::save()
 {
 	ModuleList list = changedModules;
 	ModuleList::iterator it;
@@ -212,7 +212,7 @@ void KCModuleContainer::save()
 
 }
 
-void KCModuleContainer::load()
+void TDECModuleContainer::load()
 {
 	ModuleList list = allModules;
 	ModuleList::iterator it;
@@ -224,7 +224,7 @@ void KCModuleContainer::load()
 	emit changed( false );
 }
 
-void KCModuleContainer::defaults()
+void TDECModuleContainer::defaults()
 {
 	ModuleList list = allModules;
 	ModuleList::iterator it;
@@ -237,7 +237,7 @@ void KCModuleContainer::defaults()
 }
 
 
-void KCModuleContainer::moduleChanged(KCModuleProxy * proxy)
+void TDECModuleContainer::moduleChanged(TDECModuleProxy * proxy)
 {
 	changedModules.append( proxy );
 	if( changedModules.isEmpty() )
@@ -246,7 +246,7 @@ void KCModuleContainer::moduleChanged(KCModuleProxy * proxy)
 	emit changed(true);
 }
 
-KCModuleContainer::~KCModuleContainer()
+TDECModuleContainer::~TDECModuleContainer()
 {
 	delete d;
 }
diff --git a/kutils/kcmodulecontainer.h b/kutils/kcmodulecontainer.h
index 7b8551b21..956b23efd 100644
--- a/kutils/kcmodulecontainer.h
+++ b/kutils/kcmodulecontainer.h
@@ -31,60 +31,60 @@ class TQTabWidget;
 class TQWidget;
 class TQVBoxLayout;
 
-class KCModuleProxy;
+class TDECModuleProxy;
 
 /**
  * @ingroup kcmodule
- * @brief KCModuleContainer is a convenience class encapsulating several KCModules.
+ * @brief TDECModuleContainer is a convenience class encapsulating several TDECModules.
  *
- * The KCModuleContainer class is a convenience class for organizing a multiple set
- * of KCModule. KCModuleContainer is a sub class of KCModule and builds an interface mainly
+ * The TDECModuleContainer class is a convenience class for organizing a multiple set
+ * of TDECModule. TDECModuleContainer is a sub class of TDECModule and builds an interface mainly
  * consisting of a tab widget where each tab contains one of the modules specified via one of the
- * constructors. KCModuleContainer can handle modules which requires root permissions. What you
+ * constructors. TDECModuleContainer can handle modules which requires root permissions. What you
  * most likely want is the KCMODULECONTAINER macro. \n
  * Sometimes it is of interest to detect in runtime whether a module should be loaded or not. This
- * can be achieved by sub classing KCModuleContainer, doing the probing/testing checks and then manually
+ * can be achieved by sub classing TDECModuleContainer, doing the probing/testing checks and then manually
  * call addModule for each module which should be displayed. When all calls to addModule is done, call
  * finalize() which performs some necessary final steps.
  *
  * @author Frans Englich <frans.englich@telia.com>
  * @since 3.4
  */
-class KUTILS_EXPORT KCModuleContainer : public KCModule
+class KUTILS_EXPORT TDECModuleContainer : public TDECModule
 {
 	Q_OBJECT
 	public:
 		/**
-		 * Creates a KCModuleContainer with tabs, each one containing one of the
+		 * Creates a TDECModuleContainer with tabs, each one containing one of the
 		 * specified modules in @p mods.
 		 *
                  * @param parent the parent TQWidget.
                  * @param name the module's name.
-		 * @param mods The list of KCModules to be loaded. The name of each
-		 * KCModule is its service name, that is the name of the desktop file without
+		 * @param mods The list of TDECModules to be loaded. The name of each
+		 * TDECModule is its service name, that is the name of the desktop file without
 		 * the ".desktop" part
 		 *
 		 */
-		KCModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods );
+		TDECModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods );
 
 		/**
 		 * This is a convenience function, instead of building a TQStringList you
 		 * can specify the modules in a comma separated TQString. For example;
 		 * \code
-		 * KCModuleContainer* cont = KCModuleContainer( this, "kcm_misc", TQString("kcm_energy, kcm_keyboard ,kcm_useraccount, kcm_mouse") );
+		 * TDECModuleContainer* cont = TDECModuleContainer( this, "kcm_misc", TQString("kcm_energy, kcm_keyboard ,kcm_useraccount, kcm_mouse") );
 		 * \endcode
 		 * The other constructor takes its modules in a QStringlist which also can be constructed from a
 		 * string and thus you will have to be explicit on the data type.
 		 *
-		 * What you probably want is the KCMODULECONTAINER macro which builds an KCModule
+		 * What you probably want is the KCMODULECONTAINER macro which builds an TDECModule
 		 * for you, taking the modules you want as argument.
 		 *
 		 * @param parent The parent widget
 		 * @param name The service name
 		 * @param mods The modules to load
-		 * @return The KCModule containing the requested modules.
+		 * @return The TDECModule containing the requested modules.
 		 */
-		KCModuleContainer( TQWidget *parent, const char* name, const TQString& mods = TQString() );
+		TDECModuleContainer( TQWidget *parent, const char* name, const TQString& mods = TQString() );
 
 		/**
 		 * Adds the specified module to the tab widget. Setting the tab icon, text,
@@ -98,7 +98,7 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 		/**
 		 * Default destructor.
 		 */
-		virtual ~KCModuleContainer();
+		virtual ~TDECModuleContainer();
 
 		/**
 		 * Reimplemented for internal purposes.
@@ -122,16 +122,16 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 
 		/**
 		 * Sets this KCM's buttons and adds a AdminMode button
-		 * if necessary. If KCModuleContainer is subclassed finalize()
+		 * if necessary. If TDECModuleContainer is subclassed finalize()
 		 * should be called in the constructor after all calls to addModule
 		 * have been done. Call it once.
 		 */
 		void finalize();
 
-		typedef TQValueList<KCModuleProxy*> ModuleList;
+		typedef TQValueList<TDECModuleProxy*> ModuleList;
 
 		/**
-		 * A list containing KCModuleProxy objects which
+		 * A list containing TDECModuleProxy objects which
 		 * have changed and must be saved.
 		 */
 		ModuleList changedModules;
@@ -148,7 +148,7 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 		 */
 		void tabSwitched( TQWidget * module );
 
-		void moduleChanged(KCModuleProxy *proxy);
+		void moduleChanged(TDECModuleProxy *proxy);
 
 		/**
 		 * Called when the user clicks our custom root button.
@@ -164,19 +164,19 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 
 		void init();
 
-		class KCModuleContainerPrivate;
-		KCModuleContainerPrivate *d;
+		class TDECModuleContainerPrivate;
+		TDECModuleContainerPrivate *d;
 
 };
 
 /**
  * @ingroup kcmodule
- * This macro creates an factory declaration which when run creates an KCModule with specified
+ * This macro creates an factory declaration which when run creates an TDECModule with specified
  * modules. For example:
  * \code
  * KCMODULECONTAINER( "kcm_fonts, kcm_keyboard,kcm_fonts", misc_modules)
  * \endcode
- * would create a KCModule with three tabs, each containing one of the specified KCMs. Each
+ * would create a TDECModule with three tabs, each containing one of the specified KCMs. Each
  * use of the macro must be accompanied by a desktop file where the factory name equals
  * the second argument in the macro(in this example, misc_modules). \n
  * The module container takes care of testing the contained modules when being shown, as well
@@ -188,16 +188,16 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 #define KCMODULECONTAINER( modules, factoryName ) \
 extern "C" \
 { \
-	KCModule *create_## factoryName(TQWidget *parent, const char *name) \
+	TDECModule *create_## factoryName(TQWidget *parent, const char *name) \
 	{ \
-		return new KCModuleContainer( parent, name, TQString( modules ) ); \
+		return new TDECModuleContainer( parent, name, TQString( modules ) ); \
 	} \
 	\
 	bool test_## factoryName() \
 	{ \
 		TQStringList modList = TQStringList::split( ",", TQString(modules).remove( " " )); \
 		for ( TQStringList::Iterator it = modList.begin(); it != modList.end(); ++it ) \
-			if ( KCModuleLoader::testModule( *it ) ) \
+			if ( TDECModuleLoader::testModule( *it ) ) \
 				return true; \
 		return false; \
 	} \
diff --git a/kutils/kcmoduleinfo.cpp b/kutils/kcmoduleinfo.cpp
index c34069c09..c1892df36 100644
--- a/kutils/kcmoduleinfo.cpp
+++ b/kutils/kcmoduleinfo.cpp
@@ -31,13 +31,13 @@
 
 #include "kcmoduleinfo.h"
 
-class KCModuleInfo::KCModuleInfoPrivate
+class TDECModuleInfo::TDECModuleInfoPrivate
 {
   public:
-    KCModuleInfoPrivate() :
+    TDECModuleInfoPrivate() :
       testModule( false )
     {}
-    ~KCModuleInfoPrivate()
+    ~TDECModuleInfoPrivate()
     { }
 
     TQString factoryName;
@@ -45,34 +45,34 @@ class KCModuleInfo::KCModuleInfoPrivate
 
 };
 
-KCModuleInfo::KCModuleInfo()
+TDECModuleInfo::TDECModuleInfo()
 {
   _allLoaded = false;
-  d = new KCModuleInfoPrivate;
+  d = new TDECModuleInfoPrivate;
 }
 
-KCModuleInfo::KCModuleInfo(const TQString& desktopFile)
+TDECModuleInfo::TDECModuleInfo(const TQString& desktopFile)
 {
   KService::Ptr service = KService::serviceByStorageId(desktopFile);
   if(!service) setName(desktopFile);
   init(service);
 }
 
-KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo )
+TDECModuleInfo::TDECModuleInfo( KService::Ptr moduleInfo )
 {
   init(moduleInfo);
 }
 
-KCModuleInfo::KCModuleInfo( const KCModuleInfo &rhs )
+TDECModuleInfo::TDECModuleInfo( const TDECModuleInfo &rhs )
 {
-    d = new KCModuleInfoPrivate;
+    d = new TDECModuleInfoPrivate;
     ( *this ) = rhs;
 }
 
 // this re-implementation exists to ensure that other code always calls
 // our re-implementation, so in case we add data to the d pointer in the future 
 // we can be sure that we get called when we are copied.
-KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs )
+TDECModuleInfo &TDECModuleInfo::operator=( const TDECModuleInfo &rhs )
 {
     _keywords = rhs._keywords;
     _name = rhs._name;
@@ -92,7 +92,7 @@ KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs )
     return *this;
 }
 
-TQString KCModuleInfo::factoryName() const
+TQString TDECModuleInfo::factoryName() const
 {
   if( d->factoryName.isEmpty() )
   {
@@ -104,25 +104,25 @@ TQString KCModuleInfo::factoryName() const
   return d->factoryName;
 }
 
-bool KCModuleInfo::operator==( const KCModuleInfo & rhs ) const
+bool TDECModuleInfo::operator==( const TDECModuleInfo & rhs ) const
 {
   return ( ( _name == rhs._name ) && ( _lib == rhs._lib ) && ( _fileName == rhs._fileName ) );
 }
 
-bool KCModuleInfo::operator!=( const KCModuleInfo & rhs ) const
+bool TDECModuleInfo::operator!=( const TDECModuleInfo & rhs ) const
 {
   return ! operator==( rhs );
 }
 
-KCModuleInfo::~KCModuleInfo()
+TDECModuleInfo::~TDECModuleInfo()
 { 
   delete d;
 }
 
-void KCModuleInfo::init(KService::Ptr s)
+void TDECModuleInfo::init(KService::Ptr s)
 {
   _allLoaded = false;
-  d = new KCModuleInfoPrivate;
+  d = new TDECModuleInfoPrivate;
 
   if ( s )
     _service = s;
@@ -147,7 +147,7 @@ void KCModuleInfo::init(KService::Ptr s)
 }
 
 void
-KCModuleInfo::loadAll() 
+TDECModuleInfo::loadAll() 
 {
   if( !_service ) /* We have a bogus service. All get functions will return empty/zero values */
     return;
@@ -180,19 +180,19 @@ KCModuleInfo::loadAll()
 }
 
 TQString
-KCModuleInfo::docPath() const
+TDECModuleInfo::docPath() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _doc;
 }
 
 TQString
-KCModuleInfo::handle() const
+TDECModuleInfo::handle() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   if (_handle.isEmpty())
      return _lib;
@@ -201,38 +201,38 @@ KCModuleInfo::handle() const
 }
 
 int
-KCModuleInfo::weight() const
+TDECModuleInfo::weight() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _weight;
 }
 
 bool
-KCModuleInfo::needsRootPrivileges() const
+TDECModuleInfo::needsRootPrivileges() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _needsRootPrivileges;
 }
 
 bool
-KCModuleInfo::isHiddenByDefault() const
+TDECModuleInfo::isHiddenByDefault() const
 {
   if (!_allLoaded)
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _isHiddenByDefault;
 }
 
-bool KCModuleInfo::needsTest() const 
+bool TDECModuleInfo::needsTest() const 
 {
   return d->testModule;
 }
 
-void KCModuleInfo::setNeedsTest( bool val )
+void TDECModuleInfo::setNeedsTest( bool val )
 {
   d->testModule = val;
 }
diff --git a/kutils/kcmoduleinfo.h b/kutils/kcmoduleinfo.h
index b2e79ee46..a17f6af7a 100644
--- a/kutils/kcmoduleinfo.h
+++ b/kutils/kcmoduleinfo.h
@@ -32,12 +32,12 @@ class TQStringList;
 
 /**
  * @ingroup kcmodule
- * A class that provides information about a KCModule
+ * A class that provides information about a TDECModule
  *
- * KCModuleInfo provides various technical information, such as icon, library
- * etc. about a KCModule.n
+ * TDECModuleInfo provides various technical information, such as icon, library
+ * etc. about a TDECModule.n
  * @note Any values set with the set* functions is not
- * written back with KCModuleInfo it only reads value from the desktop file.
+ * written back with TDECModuleInfo it only reads value from the desktop file.
  *
  * @internal
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
@@ -46,19 +46,19 @@ class TQStringList;
  * @since 3.2
  *
  */
-class KUTILS_EXPORT KCModuleInfo
+class KUTILS_EXPORT TDECModuleInfo
 {
 
 public:
 
   /**
-   * Constructs a KCModuleInfo.
-   * @note a KCModuleInfo object will have to be manually deleted, it is not
+   * Constructs a TDECModuleInfo.
+   * @note a TDECModuleInfo object will have to be manually deleted, it is not
    * done automatically for you.
    * @param desktopFile the desktop file representing the module, or
    * the name of the module.
    */
-  KCModuleInfo(const TQString& desktopFile);
+  TDECModuleInfo(const TQString& desktopFile);
 
   /**
    * Same as above but takes a KService::Ptr as argument.
@@ -67,27 +67,27 @@ public:
    *
    * @param moduleInfo specifies the module
    */
-  KCModuleInfo( KService::Ptr moduleInfo );
+  TDECModuleInfo( KService::Ptr moduleInfo );
 
 
   /**
-   * Same as above but takes a KCModuleInfo as argument.
+   * Same as above but takes a TDECModuleInfo as argument.
    *
    * @param rhs specifies the module
    */
-  KCModuleInfo( const KCModuleInfo &rhs );
+  TDECModuleInfo( const TDECModuleInfo &rhs );
 
   /**
-   * Same as above but creates an empty KCModuleInfo.
+   * Same as above but creates an empty TDECModuleInfo.
    * You should not normally call this.
    * @since 3.4
    */
-  KCModuleInfo();
+  TDECModuleInfo();
 
   /**
    * Assignment operator
    */
-  KCModuleInfo &operator=( const KCModuleInfo &rhs );
+  TDECModuleInfo &operator=( const TDECModuleInfo &rhs );
 
   /**
    * Equal operator
@@ -95,17 +95,17 @@ public:
    * @return true if @p rhs equals itself
    */
 
-  bool operator==( const KCModuleInfo &rhs ) const;
+  bool operator==( const TDECModuleInfo &rhs ) const;
 
   /**
    * @return true if @p rhs is not equal itself
    */
-  bool operator!=( const KCModuleInfo &rhs ) const;
+  bool operator!=( const TDECModuleInfo &rhs ) const;
 
   /**
    * Default destructor.
    */
-  ~KCModuleInfo();
+  ~TDECModuleInfo();
 
   /**
    * @return the filename of the .desktop file that describes the KCM
@@ -262,7 +262,7 @@ protected:
   void setDocPath(const TQString &p) { _doc = p; }
 
   /**
-   * Reads the service entries specific for KCModule from the desktop file.
+   * Reads the service entries specific for TDECModule from the desktop file.
    * The usual desktop entries are read in init.
    */
   void loadAll();
@@ -276,7 +276,7 @@ private:
 
 private:
 
-  // KDE4 These needs to be moved to KCModuleInfoPrivate
+  // KDE4 These needs to be moved to TDECModuleInfoPrivate
   TQStringList _keywords;
   TQString     _name, _icon, _lib, _handle, _fileName, _doc, _comment;
   bool        _needsRootPrivileges : 1;
@@ -286,8 +286,8 @@ private:
 
   KService::Ptr _service;
 
-  class KCModuleInfoPrivate;
-  KCModuleInfoPrivate *d;
+  class TDECModuleInfoPrivate;
+  TDECModuleInfoPrivate *d;
 
 };
 
diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp
index 2238616c2..da31a72c2 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/kutils/kcmoduleloader.cpp
@@ -39,11 +39,11 @@
  * When something goes wrong in loading the module, this one
  * jumps in as a "dummy" module.
  */
-class KCMError : public KCModule
+class KCMError : public TDECModule
 {
 	public:
 		KCMError( const TQString& msg, const TQString& details, TQWidget* parent )
-			: KCModule( parent, "KCMError" )
+			: TDECModule( parent, "KCMError" )
 		{
 			TQVBoxLayout* topLayout = new TQVBoxLayout( this );
 			topLayout->addWidget( new TQLabel( msg, this ) );
@@ -55,7 +55,7 @@ class KCMError : public KCModule
 
 
 
-KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
+TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &libname,
     KLibLoader *loader, ErrorReporting report, TQWidget * parent,
     const char * name, const TQStringList & args )
 {
@@ -72,7 +72,7 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
       KLibFactory *factory = lib->factory();
       if ( factory )
       {
-        KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args );
+        TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args );
         if (module)
           return module;
       }
@@ -87,8 +87,8 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
     if (create)
     {
       // create the module
-      KCModule* (*func)(TQWidget *, const char *);
-      func = (KCModule* (*)(TQWidget *, const char *)) create;
+      TDECModule* (*func)(TQWidget *, const char *);
+      func = (TDECModule* (*)(TQWidget *, const char *)) create;
       return  func( parent, name ? name : mod.handle().latin1() );
     }
     else
@@ -113,12 +113,12 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
   return 0;
 }
 
-KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
+TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
 {
   return loadModule( mod, None, withfallback, parent, name, args );
 }
 
-KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting report, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
+TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, ErrorReporting report, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
 {
   /*
    * Simple libraries as modules are the easiest case:
@@ -153,7 +153,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
 
     KLibLoader *loader = KLibLoader::self();
 
-    KCModule *module = load(mod, "kcm_%1", loader, report, parent, name, args );
+    TDECModule *module = load(mod, "kcm_%1", loader, report, parent, name, args );
     /*
      * Only try to load libkcm_* if it exists, otherwise KLibLoader::lastErrorMessage would say
      * "libkcm_foo not found" instead of the real problem with loading kcm_foo.
@@ -189,19 +189,19 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
   return 0;
 }
 
-KCModule* KCModuleLoader::loadModule(const TQString &module, TQWidget *parent,
+TDECModule* TDECModuleLoader::loadModule(const TQString &module, TQWidget *parent,
       const char *name, const TQStringList & args)
 {
-  return loadModule(KCModuleInfo(module), None, false, parent, name, args);
+  return loadModule(TDECModuleInfo(module), None, false, parent, name, args);
 }
 
-KCModule* KCModuleLoader::loadModule(const TQString &module, ErrorReporting
+TDECModule* TDECModuleLoader::loadModule(const TQString &module, ErrorReporting
     report, TQWidget *parent, const char *name, const TQStringList & args)
 {
-  return loadModule(KCModuleInfo(module), report, false, parent, name, args);
+  return loadModule(TDECModuleInfo(module), report, false, parent, name, args);
 }
 
-void KCModuleLoader::unloadModule(const KCModuleInfo &mod)
+void TDECModuleLoader::unloadModule(const TDECModuleInfo &mod)
 {
   // get the library loader instance
   KLibLoader *loader = KLibLoader::self();
@@ -214,7 +214,7 @@ void KCModuleLoader::unloadModule(const KCModuleInfo &mod)
   loader->unloadLibrary(TQFile::encodeName(libname.arg(mod.library())));
 }
 
-void KCModuleLoader::showLastLoaderError(TQWidget *parent)
+void TDECModuleLoader::showLastLoaderError(TQWidget *parent)
 {
   KMessageBox::detailedError(parent,
       i18n("There was an error loading the module."),i18n("<qt><p>The diagnostics is:<br>%1"
@@ -227,12 +227,12 @@ void KCModuleLoader::showLastLoaderError(TQWidget *parent)
 
 }
 
-bool KCModuleLoader::testModule( const TQString& module )
+bool TDECModuleLoader::testModule( const TQString& module )
 {
-  return testModule( KCModuleInfo( module ) );
+  return testModule( TDECModuleInfo( module ) );
 }
 
-bool KCModuleLoader::testModule( const KCModuleInfo& module )
+bool TDECModuleLoader::testModule( const TDECModuleInfo& module )
 {
   if (!module.service())
   {
@@ -250,7 +250,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module )
     /**
      * If something fails we return true - we can't risk functionality becoming
      * unavailable because of a buggy test. Furthermore, the error needs to
-     * show so it is discovered. KCModuleProxy will detect the error and load
+     * show so it is discovered. TDECModuleProxy will detect the error and load
      * a corresponding KCMError.
      * */
     KLibLoader* loader = KLibLoader::self();
@@ -281,7 +281,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module )
   }
 }
 
-KCModule* KCModuleLoader::reportError( ErrorReporting report, const TQString & text,
+TDECModule* TDECModuleLoader::reportError( ErrorReporting report, const TQString & text,
         TQString details, TQWidget * parent )
 {
   if( details.isNull() )
diff --git a/kutils/kcmoduleloader.h b/kutils/kcmoduleloader.h
index 9e0871241..b4b57e21a 100644
--- a/kutils/kcmoduleloader.h
+++ b/kutils/kcmoduleloader.h
@@ -31,23 +31,23 @@ class KLibLoader;
  * @ingroup kcmodule
  * @brief Loads a KControl Module.
  *
- * KCModuleLoader tries in several ways 
- * to locate and load a KCModule. If loading fails a 
+ * TDECModuleLoader tries in several ways 
+ * to locate and load a TDECModule. If loading fails a 
  * zero pointer is returned. \n
- * It is very unlikely KCModuleLoader is what you want 
- * and @ref KCModuleProxy suits your needs.
+ * It is very unlikely TDECModuleLoader is what you want 
+ * and @ref TDECModuleProxy suits your needs.
  * 
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
  * @author Frans Englich <frans.englich@telia.com>
  * @since 3.2
  * @internal
 **/
-class KUTILS_EXPORT KCModuleLoader
+class KUTILS_EXPORT TDECModuleLoader
 {
   public:
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * @param withFallback if true and loading failed a separate window
      * with the module may appear and a zero pointer is a returned
@@ -55,17 +55,17 @@ class KUTILS_EXPORT KCModuleLoader
      * @param name The widget's name
      * @param args A list of arguments for the module to load
      *
-     * @return a pointer to the loaded @ref KCModule
+     * @return a pointer to the loaded @ref TDECModule
      *
      * @deprecated use the function which explicitly states the error reporting
      * method
      */
-    static KCModule *loadModule(const KCModuleInfo &module, bool withFallback=true, 
+    static TDECModule *loadModule(const TDECModuleInfo &module, bool withFallback=true, 
         TQWidget * parent = 0, const char * name = 0,
         const TQStringList & args = TQStringList() ) KDE_DEPRECATED;
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * with the module may appear and a zero pointer is a returned
      * @param parent The parent widget
@@ -75,7 +75,7 @@ class KUTILS_EXPORT KCModuleLoader
      * @deprecated use the function which explicitly states the error reporting
      * method
      */
-    static KCModule *loadModule(const TQString &module, TQWidget *parent = 0,
+    static TDECModule *loadModule(const TQString &module, TQWidget *parent = 0,
         const char *name = 0, const TQStringList & args = TQStringList()) KDE_DEPRECATED;
 
     /**
@@ -88,7 +88,7 @@ class KUTILS_EXPORT KCModuleLoader
       None = 0,
       /**
        * the error report is shown instead of the 
-       * KCModule that should have * been loaded 
+       * TDECModule that should have * been loaded 
        */
       Inline = 1,
       /** 
@@ -102,7 +102,7 @@ class KUTILS_EXPORT KCModuleLoader
     };
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * @param report see ErrorReporting
      * @param withFallback if true and loading failed a separate window
@@ -111,15 +111,15 @@ class KUTILS_EXPORT KCModuleLoader
      * @param name The widget's name
      * @param args A list of arguments for the module to load
      *
-     * @return a pointer to the loaded @ref KCModule
+     * @return a pointer to the loaded @ref TDECModule
      * @since 3.4
      */
-    static KCModule *loadModule(const KCModuleInfo &module, ErrorReporting
+    static TDECModule *loadModule(const TDECModuleInfo &module, ErrorReporting
         report, bool withFallback=true, TQWidget * parent = 0,
         const char * name = 0, const TQStringList & args = TQStringList() );
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * @param report see ErrorReporting
      * with the module may appear and a zero pointer is a returned
@@ -127,10 +127,10 @@ class KUTILS_EXPORT KCModuleLoader
      * @param name The widget's name
      * @param args A list of arguments for the module to load
      *
-     * @return a pointer to the loaded @ref KCModule
+     * @return a pointer to the loaded @ref TDECModule
      * @since 3.4
      */
-    static KCModule *loadModule(const TQString &module, ErrorReporting
+    static TDECModule *loadModule(const TQString &module, ErrorReporting
         report, TQWidget *parent = 0, const char *name = 0,
         const TQStringList & args = TQStringList());
 
@@ -138,7 +138,7 @@ class KUTILS_EXPORT KCModuleLoader
      * Unloads the module's library
      * @param mod What module to unload for
      */
-    static void unloadModule(const KCModuleInfo &mod);
+    static void unloadModule(const TDECModuleInfo &mod);
 
     /**
      * Display a message box explaining an error occured and possible
@@ -151,7 +151,7 @@ class KUTILS_EXPORT KCModuleLoader
 
 
     /**
-     * Checks whether an KCModule should be shown by running its 
+     * Checks whether an TDECModule should be shown by running its 
      * test function. If it is unsure whether a module should be shown, it should 
      * be made available, leaving the decision to the user.
      * If false is returned, the module should not be loaded in any interface.
@@ -187,10 +187,10 @@ class KUTILS_EXPORT KCModuleLoader
      * @returns true if the module should be loaded
      * @since 3.4
      */
-    static bool testModule( const KCModuleInfo& module );
+    static bool testModule( const TDECModuleInfo& module );
 
     /**
-     * Returns a KCModule containing the messages @p report and @p text.
+     * Returns a TDECModule containing the messages @p report and @p text.
      *
      * @param report the type of error reporting, see ErrorReporting
      * @param text the main message
@@ -200,7 +200,7 @@ class KUTILS_EXPORT KCModuleLoader
      * @since 3.4
      * @internal
      */
-    static KCModule* reportError( ErrorReporting report, const TQString & text,
+    static TDECModule* reportError( ErrorReporting report, const TQString & text,
         TQString details, TQWidget * parent );
 
   private:
@@ -209,7 +209,7 @@ class KUTILS_EXPORT KCModuleLoader
      * Internal loader called by the public loaders.
      * @internal
      */
-    static KCModule* load(const KCModuleInfo &mod, const TQString &libname, 
+    static TDECModule* load(const TDECModuleInfo &mod, const TQString &libname, 
         KLibLoader *loader, ErrorReporting report, TQWidget * parent = 0,
         const char * name = 0, const TQStringList & args = TQStringList() );
 
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index f034c9a5f..df6b2bb98 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -55,10 +55,10 @@
 #include "kcmoduleproxyIfaceImpl.h"
 
 /***************************************************************/
-class KCModuleProxy::KCModuleProxyPrivate
+class TDECModuleProxy::TDECModuleProxyPrivate
 {
 	public:
-		KCModuleProxyPrivate( const KCModuleInfo & info )
+		TDECModuleProxyPrivate( const TDECModuleInfo & info )
 			: args( 0 )
 			, kcm( 0 )
 			//, view( 0 )
@@ -78,7 +78,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 			, isInitialized( false )
 		{}
 
-		~KCModuleProxyPrivate()
+		~TDECModuleProxyPrivate()
 		{
 			delete rootInfo; // Delete before embedWidget!
 			delete embedWidget; // Delete before embedFrame!
@@ -91,17 +91,17 @@ class KCModuleProxy::KCModuleProxyPrivate
 		}
 
 		TQStringList							args;
-		KCModule							*kcm;
+		TDECModule							*kcm;
 		QXEmbed								*embedWidget;
 		TDEProcess							*rootProcess;
 		TQVBox								*embedFrame;
-		KCModuleProxyIfaceImpl  					*dcopObject;
+		TDECModuleProxyIfaceImpl  					*dcopObject;
 		DCOPClient							*dcopClient;
 		TQVBoxLayout							*topLayout; /* Contains TQScrollView view, and root stuff */
-		KCModuleProxyRootCommunicatorImpl				*rootCommunicator;
+		TDECModuleProxyRootCommunicatorImpl				*rootCommunicator;
 		TQLabel								*rootInfo;
 		TQCString							dcopName;
-		KCModuleInfo 							modInfo;
+		TDECModuleInfo 							modInfo;
 		bool 								withFallback;
 		bool 								changed;
 		bool 								rootMode;
@@ -115,7 +115,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 /*
  TODO:
 
- - How KCModuleProxy behaves wrt memory leaks and behavior, when exiting
+ - How TDECModuleProxy behaves wrt memory leaks and behavior, when exiting
  	from root mode is not tested, because no code make use of it. It needs 
 	work, if it should be used.
 
@@ -137,7 +137,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 
  */
 /***************************************************************/
-KCModule * KCModuleProxy::realModule() const
+TDECModule * TDECModuleProxy::realModule() const
 {
 
 	/*
@@ -157,11 +157,11 @@ KCModule * KCModuleProxy::realModule() const
 
 	TQApplication::setOverrideCursor( Qt::WaitCursor );
 	
-	KCModuleProxy * that = const_cast<KCModuleProxy*>( this );
+	TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this );
 
 	if( !d->isInitialized )
 	{
-  		d->dcopName = TQString(moduleInfo().handle().prepend("KCModuleProxy-")).utf8();
+  		d->dcopName = TQString(moduleInfo().handle().prepend("TDECModuleProxy-")).utf8();
 		d->topLayout = new TQVBoxLayout( that, 0, 0, "topLayout" );
 
 		d->isInitialized = true;
@@ -180,9 +180,9 @@ KCModule * KCModuleProxy::realModule() const
 	   * or, it was an random application which had picked that name */
 		kdDebug(711) << "Module not already loaded, loading module" << endl;
 
-		d->dcopObject = new KCModuleProxyIfaceImpl( d->dcopName, that );
+		d->dcopObject = new TDECModuleProxyIfaceImpl( d->dcopName, that );
 
-		d->kcm = KCModuleLoader::loadModule( moduleInfo(), KCModuleLoader::Inline, d->withFallback,
+		d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback,
 			that, name(), d->args );
 
 		connect( d->kcm, TQT_SIGNAL( changed( bool ) ),
@@ -248,7 +248,7 @@ KCModule * KCModuleProxy::realModule() const
 		{
 			stream >> result;
 
-			d->kcm = KCModuleLoader::reportError( KCModuleLoader::Inline, 
+			d->kcm = TDECModuleLoader::reportError( TDECModuleLoader::Inline, 
 					i18n( "Argument is application name", "This configuration section is "
 						"already opened in %1" ).arg( result ), " ", that );
 
@@ -256,7 +256,7 @@ KCModule * KCModuleProxy::realModule() const
 		}
 		else
 		{
-			kdDebug(711) << "Calling KCModuleProxy's DCOP interface for fetching the name failed." << endl;
+			kdDebug(711) << "Calling TDECModuleProxy's DCOP interface for fetching the name failed." << endl;
 			d->bogusOccupier = true;
 			TQApplication::restoreOverrideCursor();
 			return realModule();
@@ -268,7 +268,7 @@ KCModule * KCModuleProxy::realModule() const
 	return d->kcm;
 }
 
-void KCModuleProxy::applicationRemoved( const TQCString& app )
+void TDECModuleProxy::applicationRemoved( const TQCString& app )
 {
 	if( app == d->dcopName )
 	{
@@ -282,7 +282,7 @@ void KCModuleProxy::applicationRemoved( const TQCString& app )
 	}
 }
 
-void KCModuleProxy::showEvent( TQShowEvent * ev )
+void TDECModuleProxy::showEvent( TQShowEvent * ev )
 {
 
 	kdDebug(711) << k_funcinfo << endl;
@@ -296,7 +296,7 @@ void KCModuleProxy::showEvent( TQShowEvent * ev )
 
 }
 
-void KCModuleProxy::runAsRoot()
+void TDECModuleProxy::runAsRoot()
 {
 	if ( !moduleInfo().needsRootPrivileges() )
 		return;
@@ -378,7 +378,7 @@ void KCModuleProxy::runAsRoot()
 		{
 			d->rootMode = true;
 			kapp->dcopClient();
-			d->rootCommunicator = new KCModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this );
+			d->rootCommunicator = new TDECModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this );
 		}
 
 		delete lblBusy;
@@ -395,7 +395,7 @@ void KCModuleProxy::runAsRoot()
 	TQApplication::restoreOverrideCursor();
 }
 
-void KCModuleProxy::rootExited()
+void TDECModuleProxy::rootExited()
 {
 	kdDebug(711) << k_funcinfo << endl;
 
@@ -426,15 +426,15 @@ void KCModuleProxy::rootExited()
 	emit childClosed();
 }
 
-KCModuleProxy::~KCModuleProxy()
+TDECModuleProxy::~TDECModuleProxy()
 {
 	deleteClient();
-	KCModuleLoader::unloadModule(moduleInfo());
+	TDECModuleLoader::unloadModule(moduleInfo());
 
 	delete d;
 }
 
-void KCModuleProxy::deleteClient()
+void TDECModuleProxy::deleteClient()
 {
 	if( d->embedWidget )
 		XKillClient(tqt_xdisplay(), d->embedWidget->embeddedWinId());
@@ -456,7 +456,7 @@ void KCModuleProxy::deleteClient()
 
 }
 
-void KCModuleProxy::moduleChanged( bool c )
+void TDECModuleProxy::moduleChanged( bool c )
 {
 	if(  d->changed == c )
 		return;
@@ -466,21 +466,21 @@ void KCModuleProxy::moduleChanged( bool c )
 	emit changed( this );
 }
 
-void KCModuleProxy::moduleDestroyed()
+void TDECModuleProxy::moduleDestroyed()
 {
 	d->kcm = 0;
 }
 
-KCModuleProxy::KCModuleProxy( const KService::Ptr & service, bool withFallback, 
+TDECModuleProxy::TDECModuleProxy( const KService::Ptr & service, bool withFallback, 
 		TQWidget  * parent, const char * name, const TQStringList & args)
 	: TQWidget( parent, name )
 {
-	init( KCModuleInfo( service ));
+	init( TDECModuleInfo( service ));
 	d->args = args;
 	d->withFallback = withFallback;
 }
 
-KCModuleProxy::KCModuleProxy( const KCModuleInfo & info, bool withFallback,
+TDECModuleProxy::TDECModuleProxy( const TDECModuleInfo & info, bool withFallback,
 		TQWidget * parent, const char * name, const TQStringList & args )
 	: TQWidget( parent, name )
 {
@@ -489,21 +489,21 @@ KCModuleProxy::KCModuleProxy( const KCModuleInfo & info, bool withFallback,
 	d->withFallback = withFallback;
 }
 
-KCModuleProxy::KCModuleProxy( const TQString& serviceName, bool withFallback, 
+TDECModuleProxy::TDECModuleProxy( const TQString& serviceName, bool withFallback, 
 		TQWidget * parent, const char * name, 
 		const TQStringList & args)
 	: TQWidget( parent, name )
 {
-	init( KCModuleInfo( serviceName ));
+	init( TDECModuleInfo( serviceName ));
 	d->args = args;
 	d->withFallback = withFallback;
 }
 
-void KCModuleProxy::init( const KCModuleInfo& info )
+void TDECModuleProxy::init( const TDECModuleInfo& info )
 { 
 	kdDebug(711) << k_funcinfo << endl;
 
-	d = new KCModuleProxyPrivate( info );
+	d = new TDECModuleProxyPrivate( info );
 
 	/* This is all we do for now; all the heavy work is 
 	 * done in realModule(). It's called when the module
@@ -513,7 +513,7 @@ void KCModuleProxy::init( const KCModuleInfo& info )
 
 }
 
-void KCModuleProxy::load()
+void TDECModuleProxy::load()
 {
 
 	if( d->rootMode )
@@ -525,7 +525,7 @@ void KCModuleProxy::load()
 	}
 }
 
-void KCModuleProxy::save()
+void TDECModuleProxy::save()
 {
 	if( d->rootMode )
 		callRootModule( "save()" );
@@ -536,7 +536,7 @@ void KCModuleProxy::save()
 	}
 }
 
-void KCModuleProxy::callRootModule( const TQCString& function )
+void TDECModuleProxy::callRootModule( const TQCString& function )
 {
 	TQByteArray sendData, replyData;
 	TQCString replyType;
@@ -549,7 +549,7 @@ void KCModuleProxy::callRootModule( const TQCString& function )
 
 }
 
-void KCModuleProxy::defaults()
+void TDECModuleProxy::defaults()
 {
 	if( d->rootMode )
 		callRootModule( "defaults()" );
@@ -557,7 +557,7 @@ void KCModuleProxy::defaults()
 		d->kcm->defaults();
 }
 
-TQString KCModuleProxy::quickHelp() const
+TQString TDECModuleProxy::quickHelp() const
 {
 
 	if( !d->rootMode )
@@ -586,7 +586,7 @@ TQString KCModuleProxy::quickHelp() const
 	}
 }
 
-const TDEAboutData * KCModuleProxy::aboutData() const
+const TDEAboutData * TDECModuleProxy::aboutData() const
 {
 	if( !d->rootMode )
 		return realModule() ? realModule()->aboutData() : 0;
@@ -598,48 +598,48 @@ const TDEAboutData * KCModuleProxy::aboutData() const
 
 }
 
-int KCModuleProxy::buttons() const
+int TDECModuleProxy::buttons() const
 {
 	return realModule() ? realModule()->buttons() :
-		KCModule::Help | KCModule::Default | KCModule::Apply ;
+		TDECModule::Help | TDECModule::Default | TDECModule::Apply ;
 }
 
-TQString KCModuleProxy::rootOnlyMsg() const
+TQString TDECModuleProxy::rootOnlyMsg() const
 {
 	return realModule() ? realModule()->rootOnlyMsg() : TQString::null;
 }
 
-bool KCModuleProxy::useRootOnlyMsg() const
+bool TDECModuleProxy::useRootOnlyMsg() const
 {
 	return realModule() ? realModule()->useRootOnlyMsg() : true;
 }
 
-TDEInstance * KCModuleProxy::instance() const
+TDEInstance * TDECModuleProxy::instance() const
 {
 	return realModule() ? realModule()->instance() : 0;
 }
 
-bool KCModuleProxy::changed() const
+bool TDECModuleProxy::changed() const
 {
 	return d->changed;
 }
 
-const KCModuleInfo& KCModuleProxy::moduleInfo() const
+const TDECModuleInfo& TDECModuleProxy::moduleInfo() const
 {
 	return d->modInfo;
 }
 
-bool KCModuleProxy::rootMode() const
+bool TDECModuleProxy::rootMode() const
 {
 	return d->rootMode;
 }
 
-TQCString KCModuleProxy::dcopName() const
+TQCString TDECModuleProxy::dcopName() const
 {
 	return d->dcopName;
 }
 
-void KCModuleProxy::emitQuickHelpChanged()
+void TDECModuleProxy::emitQuickHelpChanged()
 {
 	emit quickHelpChanged();
 }
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index baf532e34..2ffeabf56 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -28,56 +28,56 @@
 #include <tdelibs_export.h>
 
 class TDEAboutData;
-class KCModule;
-class KCModuleInfo;
+class TDECModule;
+class TDECModuleInfo;
 class TDEInstance;
 class TDEProcess;
 
 /**
  * @ingroup kcmodule
  *
- * @brief Encapsulates a KCModule for embedding.
+ * @brief Encapsulates a TDECModule for embedding.
  *
- * KCModuleProxy is a wrapper for KCModule intended for cases where
+ * TDECModuleProxy is a wrapper for TDECModule intended for cases where
  * modules are to be displayed. It ensures layout is consistent, handles
  * root/administrator modules and in general takes care of the details
- * needed for making a module available in an interface. A KCModuleProxy
+ * needed for making a module available in an interface. A TDECModuleProxy
  * can be treated as a TQWidget, without worrying about the details specific
- * for modules such as library loading. KCModuleProxy is not a sub class of KCModule
- * but its API closely resembles KCModule's.\n
+ * for modules such as library loading. TDECModuleProxy is not a sub class of TDECModule
+ * but its API closely resembles TDECModule's.\n
  * Usually, an instance is created by passing one of the constructors a KService::Ptr,
- * KCModuleInfo or simply the name of the module and then added to the layout as any
+ * TDECModuleInfo or simply the name of the module and then added to the layout as any
  * other widget. \n
- * When the user have changed the module, changed( bool ) as well as changed ( KCModuleProxy * )
- * is emitted. KCModuleProxy does not take care of prompting for saving - if the object is deleted while
+ * When the user have changed the module, changed( bool ) as well as changed ( TDECModuleProxy * )
+ * is emitted. TDECModuleProxy does not take care of prompting for saving - if the object is deleted while
  * changes is not saved the changes will be lost. changed() returns true if changes are unsaved. \n
  * \n
- * KCModuleProxy does not take care of authorization of KCModules. \n
- * KCModuleProxy do lazy loading, meaning the library will not be loaded or
+ * TDECModuleProxy does not take care of authorization of TDECModules. \n
+ * TDECModuleProxy do lazy loading, meaning the library will not be loaded or
  * any other initialization done before its show() function is called. This means
  * modules will only be loaded when they are actually needed as well as it is possible to
- * load many KCModuleProxy without any speed penalty.
+ * load many TDECModuleProxy without any speed penalty.
  *
- * KCModuleProxy should be used in all cases where modules are embedded in order to
+ * TDECModuleProxy should be used in all cases where modules are embedded in order to
  * promote code efficiency and usability consistency.
  *
  * @author Frans Englich <frans.englich@telia.com>
  * @author Matthias Kretz <kretz@kde.org>
  *
  */
-class KUTILS_EXPORT KCModuleProxy : public TQWidget
+class KUTILS_EXPORT TDECModuleProxy : public TQWidget
 {
 Q_OBJECT
 
 
-	friend class KCModuleProxyRootCommunicatorImpl;
+	friend class TDECModuleProxyRootCommunicatorImpl;
 
 public:
 
 	/**
-	 * Constructs a KCModuleProxy from a KCModuleInfo class.
+	 * Constructs a TDECModuleProxy from a TDECModuleInfo class.
 	 *
-	 * @param info The KCModuleInfo to construct the module from.
+	 * @param info The TDECModuleInfo to construct the module from.
 	 * @param withFallback If set to true and loading of the module fails,
 	 * a alternative will be tried, resulting in the module appearing in its
 	 * own window, if at all.
@@ -87,12 +87,12 @@ public:
 	 * @param args This is used in the implementation and is internal.
 	 * Use the default.
 	 */
-	KCModuleProxy( const KCModuleInfo & info, bool withFallback = true,
+	TDECModuleProxy( const TDECModuleInfo & info, bool withFallback = true,
 			TQWidget * parent = 0, const char * name = 0,
 			const TQStringList & args = TQStringList() );
 
 	/**
-	 * Constructs a KCModuleProxy from a module's service name, which is
+	 * Constructs a TDECModuleProxy from a module's service name, which is
 	 * equivalent to the desktop file for the kcm without the ".desktop" part.
 	 * Otherwise equal to the one above.
 	 *
@@ -106,12 +106,12 @@ public:
 	 * @param args This is used in the implementation and is internal.
 	 * Use the default.
 	 */
-	KCModuleProxy( const TQString& serviceName, bool withFallback = true,
+	TDECModuleProxy( const TQString& serviceName, bool withFallback = true,
 			TQWidget * parent = 0, const char * name = 0,
 			const TQStringList & args = TQStringList() );
 
 	/**
-	 * Constructs a KCModuleProxy from KService. Otherwise equal to the one above.
+	 * Constructs a TDECModuleProxy from KService. Otherwise equal to the one above.
 	 *
 	 * @param service The KService to construct from.
 	 * @param withFallback If set to true and loading of the module fails,
@@ -123,14 +123,14 @@ public:
 	 * @param args This is used in the implementation and is internal.
 	 * Use the default.
 	 */
-	KCModuleProxy( const KService::Ptr& service, bool withFallback = true,
+	TDECModuleProxy( const KService::Ptr& service, bool withFallback = true,
 			TQWidget  * parent = 0, const char * name = 0,
 			const TQStringList & args = TQStringList() );
 
 	/**
 	 * Default destructor
 	 */
-	~KCModuleProxy();
+	~TDECModuleProxy();
 
 	/**
 	 * Calling it will cause the contained module to
@@ -181,7 +181,7 @@ public:
 	// this one's available via moduleInfo()-> and realModule()->
 
 	/**
-	 * Returns the embedded KCModule's TDEInstance.
+	 * Returns the embedded TDECModule's TDEInstance.
 	 * @return The module's TDEInstance.
 	 * @deprecated
 	 */
@@ -215,13 +215,13 @@ public:
 	 *
 	 * @return the encapsulated module.
 	 */
-	KCModule* realModule() const;
+	TDECModule* realModule() const;
 
 	/**
-	 * @return a KCModuleInfo for the encapsulated
+	 * @return a TDECModuleInfo for the encapsulated
 	 * module
 	 */
-	const KCModuleInfo& moduleInfo() const;
+	const TDECModuleInfo& moduleInfo() const;
 
 	/**
 	 * Returns the DCOP the module's DCOPClient
@@ -250,7 +250,7 @@ public slots:
 	/**
 	 * Calling this, results in deleting the contained
 	 * module, and unregistering from DCOP. A similar result is achieved
-	 * by deleting the KCModuleProxy itself.
+	 * by deleting the TDECModuleProxy itself.
 	 *
 	 * @since 3.4
 	 */
@@ -265,11 +265,11 @@ signals:
 
 	/**
 	 * This is emitted in the same situations as in the one above. Practical
-	 * when several KCModuleProxys are loaded.
+	 * when several TDECModuleProxys are loaded.
 	 *
 	 * @since 3.4
 	 */
-	void changed( KCModuleProxy* mod );
+	void changed( TDECModuleProxy* mod );
 
 	/**
 	 * When a module running with root privileges and exits, returns to normal mode, the
@@ -301,7 +301,7 @@ protected:
 	 * @internal
 	 * @since 3.4
 	 */
-	void init( const KCModuleInfo& info );
+	void init( const TDECModuleInfo& info );
 
 
 	/**
@@ -313,7 +313,7 @@ protected:
 private slots:
 
    /**
-	* Calls the function @p function of the root module's KCModuleProxy
+	* Calls the function @p function of the root module's TDECModuleProxy
 	* DCOP interface.
 	*
 	* @param function the function signature of the function to call.
@@ -350,8 +350,8 @@ private slots:
 
 private:
 
-	class KCModuleProxyPrivate;
-	KCModuleProxyPrivate * d;
+	class TDECModuleProxyPrivate;
+	TDECModuleProxyPrivate * d;
 };
 
 #endif // KCMODULEPROXY_H
diff --git a/kutils/kcmoduleproxyIface.h b/kutils/kcmoduleproxyIface.h
index ff597b5c6..5bf24ac91 100644
--- a/kutils/kcmoduleproxyIface.h
+++ b/kutils/kcmoduleproxyIface.h
@@ -24,16 +24,16 @@
 
 /**
  * @ingroup kcmodule
- * @brief DCOP Interface for KCModule.
+ * @brief DCOP Interface for TDECModule.
  * 
- * A module (which is loaded via KCModuleProxy) does always have 
+ * A module (which is loaded via TDECModuleProxy) does always have 
  * this DCOP interface, whether it's in root mode or not.
  *
  * @since 3.4
  * @internal
  * @author Frans Englich <frans.englich@telia.com>
  */
-class KCModuleProxyIface : virtual public DCOPObject
+class TDECModuleProxyIface : virtual public DCOPObject
 {
 	K_DCOP
 
@@ -81,7 +81,7 @@ k_dcop_signals:
 	 *
 	 * @param c true if the module is modified, false if its not.
 	 * @param module a string identifying the module which was changed. This 
-	 * is typically "KCModuleProx-X" where X is the module's name.
+	 * is typically "TDECModuleProx-X" where X is the module's name.
 	 */
 	virtual void changed( bool c );
 
@@ -93,25 +93,25 @@ k_dcop_signals:
  * @ingroup kcmodule
  * @brief DCOP interface for communicating with the real module running in root mode.
  * 
- * When a KCModuleProxy tells kcmshell to load "itself" and embed into the 
- * KCModuleProxy, this DCOP interface is used to communicate to the real KCModuleProxy, since 
- * the KCModuleProxy which told kcmshell to load itself, is nothing but a shell.
+ * When a TDECModuleProxy tells kcmshell to load "itself" and embed into the 
+ * TDECModuleProxy, this DCOP interface is used to communicate to the real TDECModuleProxy, since 
+ * the TDECModuleProxy which told kcmshell to load itself, is nothing but a shell.
  *
  * Currently is only the changed signal routed, but it's possible to proxy
- * the rest of the KCModuleProxy API, if it turns out necessary.
+ * the rest of the TDECModuleProxy API, if it turns out necessary.
  *
  * @since 3.4
  * @internal
  * @author Frans Englich <frans.englich@telia.com>
  */
-class KCModuleProxyRootDispatcher : virtual public DCOPObject
+class TDECModuleProxyRootDispatcher : virtual public DCOPObject
 {
 	K_DCOP
 
 k_dcop:
 
 	/**
-	 * KCModuleProxyIface::changed() gets connected to this.
+	 * TDECModuleProxyIface::changed() gets connected to this.
 	 */
 	virtual void changed( bool c ) = 0;
 
diff --git a/kutils/kcmoduleproxyIfaceImpl.cpp b/kutils/kcmoduleproxyIfaceImpl.cpp
index c9de5ba7a..5e1ca4986 100644
--- a/kutils/kcmoduleproxyIfaceImpl.cpp
+++ b/kutils/kcmoduleproxyIfaceImpl.cpp
@@ -30,10 +30,10 @@
 
 #include <tqmessagebox.h>
 
-KCModuleProxyIfaceImpl::KCModuleProxyIfaceImpl( const TQCString& name, 
-		KCModuleProxy* const client )
+TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name, 
+		TDECModuleProxy* const client )
 	: DCOPObject( name ), TQObject( 0, name ),
-		p( const_cast<KCModuleProxy *>( client ))
+		p( const_cast<TDECModuleProxy *>( client ))
 { 
 	connect( p, TQT_SIGNAL( changed(bool)), 
 			TQT_SLOT( changedRelay(bool)));
@@ -41,40 +41,40 @@ KCModuleProxyIfaceImpl::KCModuleProxyIfaceImpl( const TQCString& name,
 			TQT_SLOT( quickHelpRelay()));
 }
 
-void KCModuleProxyIfaceImpl::save()
+void TDECModuleProxyIfaceImpl::save()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->save();
 }
 
-void KCModuleProxyIfaceImpl::load()
+void TDECModuleProxyIfaceImpl::load()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->load();
 }
 
-void KCModuleProxyIfaceImpl::defaults()
+void TDECModuleProxyIfaceImpl::defaults()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->defaults();
 }
 
-TQString KCModuleProxyIfaceImpl::applicationName()
+TQString TDECModuleProxyIfaceImpl::applicationName()
 {
 	return kapp->caption();
 }
 
-TQString KCModuleProxyIfaceImpl::quickHelp()
+TQString TDECModuleProxyIfaceImpl::quickHelp()
 {
 	return p->quickHelp();
 }
 
-bool KCModuleProxyIfaceImpl::changed()
+bool TDECModuleProxyIfaceImpl::changed()
 {
 	return p->changed();
 }
 
-void KCModuleProxyIfaceImpl::changedRelay( bool c )
+void TDECModuleProxyIfaceImpl::changedRelay( bool c )
 {
 	TQByteArray data;
 	TQDataStream stream(data, IO_WriteOnly);
@@ -82,7 +82,7 @@ void KCModuleProxyIfaceImpl::changedRelay( bool c )
 	emitDCOPSignal( "changed(bool)", data );
 }
 
-void KCModuleProxyIfaceImpl::quickHelpRelay()
+void TDECModuleProxyIfaceImpl::quickHelpRelay()
 {
 	TQByteArray data;
 	emitDCOPSignal( "quickHelpChanged()", data );
@@ -94,18 +94,18 @@ void KCModuleProxyIfaceImpl::quickHelpRelay()
 
 
 /***************************************************************/
-KCModuleProxyRootCommunicatorImpl::KCModuleProxyRootCommunicatorImpl
-		( const TQCString& name, KCModuleProxy* const client )
+TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl
+		( const TQCString& name, TDECModuleProxy* const client )
 	: DCOPObject( name ), TQObject( 0, name ), 
-		p( const_cast<KCModuleProxy *>( client ))
+		p( const_cast<TDECModuleProxy *>( client ))
 { 
 	/*
-	 * Connect kcmshell's KCModuleProxy's change signal 
+	 * Connect kcmshell's TDECModuleProxy's change signal 
 	 * to us, such that we act as a proxy for 
-	 * KCModuleProxy's API.
+	 * TDECModuleProxy's API.
 	 */
 
-	/* Note, we don't use KCModuleProxy::d->dcopClient */
+	/* Note, we don't use TDECModuleProxy::d->dcopClient */
 	kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), 
 			"changed(bool)", objId(), "changed(bool)", false );
 
@@ -114,13 +114,13 @@ KCModuleProxyRootCommunicatorImpl::KCModuleProxyRootCommunicatorImpl
 }
 
 /* Reimplementations of DCOP members */
-void KCModuleProxyRootCommunicatorImpl::changed( bool c )
+void TDECModuleProxyRootCommunicatorImpl::changed( bool c )
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->moduleChanged( c );
 }
 
-void KCModuleProxyRootCommunicatorImpl::quickHelpChanged()
+void TDECModuleProxyRootCommunicatorImpl::quickHelpChanged()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->emitQuickHelpChanged();
diff --git a/kutils/kcmoduleproxyIfaceImpl.h b/kutils/kcmoduleproxyIfaceImpl.h
index bbfe51a28..9de3d58dd 100644
--- a/kutils/kcmoduleproxyIfaceImpl.h
+++ b/kutils/kcmoduleproxyIfaceImpl.h
@@ -21,14 +21,14 @@
 
 #include "kcmoduleproxyIface.h"
 
-class KCModuleProxy;
+class TDECModuleProxy;
 
 /***************************************************************/
 /** @internal
     @ingroup internal */
-class KCModuleProxyIfaceImpl: public TQObject, virtual public KCModuleProxyIface
+class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyIface
 {
-	/* KDE4 Merge KCModuleProxyIfaceImpl with KCModuleProxy(MI)
+	/* KDE4 Merge TDECModuleProxyIfaceImpl with TDECModuleProxy(MI)
 	 * if it doesn't break what DCOPClient it binds to.
 	 * Update: This is probably not possible, since we don't want the DCOPObject when 
 	 * we're running in root mode. */
@@ -38,7 +38,7 @@ class KCModuleProxyIfaceImpl: public TQObject, virtual public KCModuleProxyIface
 public:
 
 	/* Reimplementations of DCOP members */
-	KCModuleProxyIfaceImpl( const TQCString& name, KCModuleProxy* const client );
+	TDECModuleProxyIfaceImpl( const TQCString& name, TDECModuleProxy* const client );
 
 	virtual void save();
 
@@ -59,14 +59,14 @@ public slots:
 	void changedRelay( bool c );
 
 	/**
-	 * Simply relays KCModuleProxy's signal with the same name.
+	 * Simply relays TDECModuleProxy's signal with the same name.
 	 */
 	void quickHelpRelay();
 	
 
 private:
 
-	KCModuleProxy* p;
+	TDECModuleProxy* p;
 };
 /***************************************************************/
 
@@ -76,20 +76,20 @@ private:
 /***************************************************************/
 /** @internal
     @ingroup internal */
-class KCModuleProxyRootCommunicatorImpl: public TQObject, 
-	virtual public KCModuleProxyRootDispatcher
+class TDECModuleProxyRootCommunicatorImpl: public TQObject, 
+	virtual public TDECModuleProxyRootDispatcher
 {
 	Q_OBJECT
 
 public:
-	KCModuleProxyRootCommunicatorImpl( const TQCString& name, KCModuleProxy* const client );
+	TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client );
 
 	/* Reimplementations of DCOP members */
 	virtual void changed( bool c );
 
 	virtual void quickHelpChanged();
 
-KCModuleProxy* p;
+TDECModuleProxy* p;
 };
 /***************************************************************/
 
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index 511af866b..5fe862177 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -51,7 +51,7 @@ class KCMultiDialog::KCMultiDialogPrivate
         {}
 
         bool hasRootKCM;
-        KCModuleProxy* currentModule;
+        TDECModuleProxy* currentModule;
 };
 
  
@@ -141,7 +141,7 @@ void KCMultiDialog::apply()
     ModuleList::Iterator end = m_modules.end();
     for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it )
     {
-        KCModuleProxy * m = ( *it ).kcm;
+        TDECModuleProxy * m = ( *it ).kcm;
         if( m->changed() )
         {
             m->save();
@@ -228,10 +228,10 @@ void KCMultiDialog::addModule(const TQString& path, bool withfallback, TQStringL
 
     KService::Ptr service = KService::serviceByStorageId( complete );
 
-    addModule( KCModuleInfo( service ), TQStringList(), withfallback, args );
+    addModule( TDECModuleInfo( service ), TQStringList(), withfallback, args );
 }
 
-void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
+void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo,
         TQStringList parentmodulenames, bool withfallback, TQStringList args)
 {
     kdDebug(710) << "KCMultiDialog::addModule " 
@@ -243,7 +243,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
     if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() ))
             return;
 
-    if( !KCModuleLoader::testModule( moduleinfo ))
+    if( !TDECModuleLoader::testModule( moduleinfo ))
             return;
 
     TQFrame* page = 0;
@@ -271,17 +271,17 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
                 break;
         }
     if(!page) {
-        KCModuleLoader::unloadModule(moduleinfo);
+        TDECModuleLoader::unloadModule(moduleinfo);
         return;
     }
-    KCModuleProxy * module;
+    TDECModuleProxy * module;
     if( m_orphanModules.contains( moduleinfo.service() ) )
     {
-        // the KCModule already exists - it was removed from the dialog in
+        // the TDECModule already exists - it was removed from the dialog in
         // removeAllModules
         module = m_orphanModules[ moduleinfo.service() ];
         m_orphanModules.remove( moduleinfo.service() );
-        kdDebug( 710 ) << "Use KCModule from the list of orphans for " <<
+        kdDebug( 710 ) << "Use TDECModule from the list of orphans for " <<
             moduleinfo.moduleName() << ": " << module << endl;
 
         module->reparent( page, 0, TQPoint( 0, 0 ), true );
@@ -294,7 +294,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
     }
     else
     {
-        module = new KCModuleProxy( moduleinfo, withfallback, page, 0, args );
+        module = new TDECModuleProxy( moduleinfo, withfallback, page, 0, args );
         TQStringList parentComponents = moduleinfo.service()->property(
                 "X-TDE-ParentComponents" ).toStringList();
         moduleParentComponents.insert( module,
@@ -327,7 +327,7 @@ void KCMultiDialog::removeAllModules()
     for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it )
     {
         kdDebug( 710 ) << "remove 2" << endl;
-        KCModuleProxy * kcm = ( *it ).kcm;
+        TDECModuleProxy * kcm = ( *it ).kcm;
         TQObject * page = TQT_TQOBJECT(kcm->parent());
         kcm->hide();
         if( page )
@@ -337,7 +337,7 @@ void KCMultiDialog::removeAllModules()
             delete page;
         }
         m_orphanModules[ ( *it ).service ] = kcm;
-        kdDebug( 710 ) << "added KCModule to the list of orphans: " <<
+        kdDebug( 710 ) << "added TDECModule to the list of orphans: " <<
             kcm << endl;
     }
     m_modules.clear();
@@ -354,19 +354,19 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page)
 {
     kdDebug(710) << k_funcinfo << endl;
 
-    TQObject * obj = page->child( 0, "KCModuleProxy" );
+    TQObject * obj = page->child( 0, "TDECModuleProxy" );
     if( ! obj )
         return;
 
-    KCModuleProxy * module = ::tqqt_cast<KCModuleProxy*>(obj);
+    TDECModuleProxy * module = ::tqqt_cast<TDECModuleProxy*>(obj);
     if( ! module )
         return;
     d->currentModule = module;
 
     enableButton( KDialogBase::Help,
-            d->currentModule->buttons() & KCModule::Help );
+            d->currentModule->buttons() & TDECModule::Help );
     enableButton( KDialogBase::Default,
-            d->currentModule->buttons() & KCModule::Default );
+            d->currentModule->buttons() & TDECModule::Default );
 
     disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 );
 
diff --git a/kutils/kcmultidialog.h b/kutils/kcmultidialog.h
index c26836e31..7c89621ca 100644
--- a/kutils/kcmultidialog.h
+++ b/kutils/kcmultidialog.h
@@ -29,8 +29,8 @@
 #include <klocale.h>
 #include <kservice.h>
 
-class KCModuleProxy;
-class KCModuleInfo;
+class TDECModuleProxy;
+class TDECModuleInfo;
 
 /**
  * @ingroup kcmodule
@@ -126,7 +126,7 @@ public:
     /**
      * Add a module.
      *
-     * @param moduleinfo Pass a KCModuleInfo object which will be
+     * @param moduleinfo Pass a TDECModuleInfo object which will be
      *                   used for creating the module. It will be added
      *                   to the list of modules the dialog will show.
      *
@@ -140,7 +140,7 @@ public:
      *
      * @param args   List of arguments to pass to the module.
      **/
-    void addModule(const KCModuleInfo& moduleinfo, TQStringList
+    void addModule(const TDECModuleInfo& moduleinfo, TQStringList
             parentmodulenames = TQStringList(), bool withfallback=false, TQStringList args = TQStringList());
 
     /**
@@ -156,7 +156,7 @@ public:
 
 signals:
     /**
-     * Emitted after all KCModules have been told to save their configuration.
+     * Emitted after all TDECModules have been told to save their configuration.
      *
      * The applyClicked and okClicked signals are emitted before the
      * configuration is saved.
@@ -164,7 +164,7 @@ signals:
     void configCommitted();
 
     /**
-     * Emitted after the KCModules have been told to save their configuration.
+     * Emitted after the TDECModules have been told to save their configuration.
      * It is emitted once for every instance the KCMs that were changed belong
      * to.
      *
@@ -265,14 +265,14 @@ private:
 
     struct CreatedModule
     {
-        KCModuleProxy * kcm;
+        TDECModuleProxy * kcm;
         KService::Ptr service;
         /* KDE 4 Move to Private class */
     };
     typedef TQValueList<CreatedModule> ModuleList;
     ModuleList m_modules;
 
-    typedef TQMap<KService::Ptr, KCModuleProxy*> OrphanMap;
+    typedef TQMap<KService::Ptr, TDECModuleProxy*> OrphanMap;
     OrphanMap m_orphanModules;
 
     TQPtrDict<TQStringList> moduleParentComponents;
diff --git a/kutils/kplugininfo.cpp b/kutils/kplugininfo.cpp
index acdf57dc2..aec0a095c 100644
--- a/kutils/kplugininfo.cpp
+++ b/kutils/kplugininfo.cpp
@@ -60,7 +60,7 @@ class KPluginInfo::KPluginInfoPrivate
         bool enabledbydefault;
         bool pluginenabled;
 
-        KConfig * config;
+        TDEConfig * config;
         TQString configgroup;
         KService::Ptr service;
         TQValueList<KService::Ptr> kcmservices;
@@ -151,7 +151,7 @@ KPluginInfo::~KPluginInfo()
     delete d;
 }
 
-TQValueList<KPluginInfo*> KPluginInfo::fromServices( const KService::List & services, KConfig * config, const TQString & group )
+TQValueList<KPluginInfo*> KPluginInfo::fromServices( const KService::List & services, TDEConfig * config, const TQString & group )
 {
     TQValueList<KPluginInfo*> infolist;
     KPluginInfo * info;
@@ -165,7 +165,7 @@ TQValueList<KPluginInfo*> KPluginInfo::fromServices( const KService::List & serv
     return infolist;
 }
 
-TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KConfig * config, const TQString & group )
+TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, TDEConfig * config, const TQString & group )
 {
     TQValueList<KPluginInfo*> infolist;
     for( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it )
@@ -177,7 +177,7 @@ TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KC
     return infolist;
 }
 
-TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, KConfig * config, const TQString & group )
+TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, TDEConfig * config, const TQString & group )
 {
     TQStringList files = TDEGlobal::dirs()->findAllResources( "data", name +
             "/kpartplugins/*.desktop", true, false );
@@ -276,7 +276,7 @@ const TQValueList<KService::Ptr> & KPluginInfo::kcmServices() const
 {
     if ( !d->kcmservicesCached )
     {
-        d->kcmservices = KTrader::self()->query( "KCModule", "'" + d->pluginName +
+        d->kcmservices = KTrader::self()->query( "TDECModule", "'" + d->pluginName +
             "' in [X-TDE-ParentComponents]" );
         kdDebug( 703 ) << "found " << d->kcmservices.count() << " offers for " <<
             d->pluginName << endl;
@@ -287,13 +287,13 @@ const TQValueList<KService::Ptr> & KPluginInfo::kcmServices() const
     return d->kcmservices;
 }
 
-void KPluginInfo::setConfig( KConfig * config, const TQString & group )
+void KPluginInfo::setConfig( TDEConfig * config, const TQString & group )
 {
     d->config = config;
     d->configgroup = group;
 }
 
-KConfig * KPluginInfo::config() const
+TDEConfig * KPluginInfo::config() const
 {
     return d->config;
 }
@@ -316,14 +316,14 @@ TQVariant KPluginInfo::operator[]( const TQString & key ) const
     return property( key );
 }
 
-void KPluginInfo::save( KConfigGroup * config )
+void KPluginInfo::save( TDEConfigGroup * config )
 {
     kdDebug( 703 ) << k_funcinfo << endl;
     if( 0 == config )
     {
         if( 0 == d->config )
         {
-            kdWarning( 703 ) << "no KConfigGroup, cannot save" << endl;
+            kdWarning( 703 ) << "no TDEConfigGroup, cannot save" << endl;
             return;
         }
         d->config->setGroup( d->configgroup );
@@ -333,14 +333,14 @@ void KPluginInfo::save( KConfigGroup * config )
         config->writeEntry( d->pluginName + "Enabled", isPluginEnabled() );
 }
 
-void KPluginInfo::load( KConfigGroup * config )
+void KPluginInfo::load( TDEConfigGroup * config )
 {
     kdDebug( 703 ) << k_funcinfo << endl;
     if( 0 == config )
     {
         if( 0 == d->config )
         {
-            kdWarning( 703 ) << "no KConfigGroup, cannot load" << endl;
+            kdWarning( 703 ) << "no TDEConfigGroup, cannot load" << endl;
             return;
         }
         d->config->setGroup( d->configgroup );
diff --git a/kutils/kplugininfo.h b/kutils/kplugininfo.h
index bebd11cb6..0ba051d2c 100644
--- a/kutils/kplugininfo.h
+++ b/kutils/kplugininfo.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <kservice.h>
 
-class KConfigGroup;
+class TDEConfigGroup;
 
 /**
  * @ingroup main
@@ -120,7 +120,7 @@ class KUTILS_EXPORT KPluginInfo
          * KService objects. If you get a trader offer of the plugins you want
          * to use you can just pass them to this function.
          */
-        static KPluginInfo::List fromServices( const KService::List & services, KConfig * config = 0, const TQString & group = TQString::null );
+        static KPluginInfo::List fromServices( const KService::List & services, TDEConfig * config = 0, const TQString & group = TQString::null );
 
         /**
          * @return A list of KPluginInfo objects constructed from a list of
@@ -128,14 +128,14 @@ class KUTILS_EXPORT KPluginInfo
          * KStandardDirs::findAllResources() you pass the list of files to this
          * function.
          */
-        static KPluginInfo::List fromFiles( const TQStringList & files, KConfig * config = 0, const TQString & group = TQString::null );
+        static KPluginInfo::List fromFiles( const TQStringList & files, TDEConfig * config = 0, const TQString & group = TQString::null );
 
         /**
          * @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
          * TDEInstance object.
          */
-        static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null );
+        static KPluginInfo::List fromKPartsInstanceName( const TQString &, TDEConfig * config = 0, const TQString & group = TQString::null );
 
         /**
          * @return Whether the plugin should be hidden.
@@ -263,25 +263,25 @@ class KUTILS_EXPORT KPluginInfo
 
         /**
          * @return A list of Service pointers if the plugin installs one or more
-         *         KCModule
+         *         TDECModule
          */
         const TQValueList<KService::Ptr> & kcmServices() const;
 
         /**
-         * Set the KConfigGroup to use for load()ing and save()ing the
-         * configuration. This will be overridden by the KConfigGroup passed to
+         * Set the TDEConfigGroup to use for load()ing and save()ing the
+         * configuration. This will be overridden by the TDEConfigGroup passed to
          * save() or load() (if one is passed).
          */
-        void setConfig( KConfig * config, const TQString & group );
+        void setConfig( TDEConfig * config, const TQString & group );
 
         /**
-         * @return If the KPluginInfo object has a KConfig object set return
+         * @return If the KPluginInfo object has a TDEConfig object set return
          * it, else return 0.
          */
-        KConfig * config() const;
+        TDEConfig * config() const;
 
         /**
-         * @return The groupname used in the KConfig object for load()ing and
+         * @return The groupname used in the TDEConfig object for load()ing and
          * save()ing whether the plugin is enabled.
          */
         const TQString & configgroup() const;
@@ -289,18 +289,18 @@ class KUTILS_EXPORT KPluginInfo
         /**
          * Save state of the plugin - enabled or not. This function is provided
          * for reimplementation if you need to save somewhere else.
-         * @param config    The KConfigGroup holding the information whether
+         * @param config    The TDEConfigGroup holding the information whether
          *                  plugin is enabled.
          */
-        virtual void save( KConfigGroup * config = 0 );
+        virtual void save( TDEConfigGroup * config = 0 );
 
         /**
          * Load the state of the plugin - enabled or not. This function is provided
          * for reimplementation if you need to save somewhere else.
-         * @param config    The KConfigGroup holding the information whether
+         * @param config    The TDEConfigGroup holding the information whether
          *                  plugin is enabled.
          */
-        virtual void load( KConfigGroup * config = 0 );
+        virtual void load( TDEConfigGroup * config = 0 );
 
         /**
          * Restore defaults (enabled or not).
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 9dbf42c4a..7f07b7ed2 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -123,7 +123,7 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
 {
     KPluginSelectionWidgetPrivate( KPluginSelector * _kps,
                                    const TQString & _cat,
-                                   KConfigGroup * _config )
+                                   TDEConfigGroup * _config )
      : widgetstack( 0 )
         , kps( _kps )
         , config( _config )
@@ -146,14 +146,14 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
 
     TQWidgetStack * widgetstack;
     KPluginSelector * kps;
-    KConfigGroup * config;
+    TDEConfigGroup * config;
     KPluginListViewToolTip *tooltip;
 
-    TQDict<KCModuleInfo> pluginconfigmodules;
+    TQDict<TDECModuleInfo> pluginconfigmodules;
     TQMap<TQString, int> widgetIDs;
     TQMap<KPluginInfo*, bool> plugincheckedchanged;
     TQString catname;
-    TQValueList<KCModuleProxy*> modulelist;
+    TQValueList<TDECModuleProxy*> modulelist;
     TQPtrDict<TQStringList> moduleParentComponents;
 
     KPluginInfo * currentplugininfo;
@@ -165,7 +165,7 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
 KPluginSelectionWidget::KPluginSelectionWidget(
         const TQValueList<KPluginInfo*> & plugininfos, KPluginSelector * kps,
         TQWidget * parent, const TQString & catname, const TQString & category,
-        KConfigGroup * config, const char * name )
+        TDEConfigGroup * config, const char * name )
     : TQWidget( parent, name )
     , d( new KPluginSelectionWidgetPrivate( kps, catname, config ) )
 {
@@ -238,9 +238,9 @@ bool KPluginSelectionWidget::pluginIsLoaded( const TQString & pluginName ) const
 
 
 TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
-        const KCModuleInfo & moduleinfo )
+        const TDECModuleInfo & moduleinfo )
 {
-    KCModuleProxy * module = new KCModuleProxy( moduleinfo, false,
+    TDECModuleProxy * module = new TDECModuleProxy( moduleinfo, false,
             parent );
     if( !module->realModule() )
     {
@@ -281,7 +281,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch
         {
             if( !( *it )->noDisplay() )
             {
-                KCModuleInfo moduleinfo( *it );
+                TDECModuleInfo moduleinfo( *it );
                 TQWidget * module = insertKCM( tabwidget, moduleinfo );
                 tabwidget->addTab( module, moduleinfo.moduleName() );
             }
@@ -291,7 +291,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch
     {
         if( !plugininfo->kcmServices().front()->noDisplay() )
         {
-            KCModuleInfo moduleinfo(
+            TDECModuleInfo moduleinfo(
                     plugininfo->kcmServices().front() );
             TQWidget * module = insertKCM( d->widgetstack, moduleinfo );
             module->setEnabled( checked );
@@ -431,7 +431,7 @@ void KPluginSelectionWidget::load()
             d->currentchecked = info->isPluginEnabled();
     }
 
-    for( TQValueList<KCModuleProxy*>::Iterator it = d->modulelist.begin();
+    for( TQValueList<TDECModuleProxy*>::Iterator it = d->modulelist.begin();
             it != d->modulelist.end(); ++it )
         if( ( *it )->changed() )
             ( *it )->load();
@@ -454,7 +454,7 @@ void KPluginSelectionWidget::save()
         d->plugincheckedchanged[ info ] = false;
     }
     TQStringList updatedModules;
-    for( TQValueList<KCModuleProxy*>::Iterator it = d->modulelist.begin();
+    for( TQValueList<TDECModuleProxy*>::Iterator it = d->modulelist.begin();
             it != d->modulelist.end(); ++it )
         if( ( *it )->changed() )
         {
@@ -581,7 +581,7 @@ static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName
 }
 
 void KPluginSelector::addPlugins( const TQString & instanceName,
-        const TQString & catname, const TQString & category, KConfig * config )
+        const TQString & catname, const TQString & category, TDEConfig * config )
 {
     const TQValueList<KPluginInfo*> plugininfos = kpartsPluginInfos( instanceName );
     if ( plugininfos.isEmpty() )
@@ -590,14 +590,14 @@ void KPluginSelector::addPlugins( const TQString & instanceName,
     Q_ASSERT( config ); // please set config, or use addPlugins( instance, ... ) which takes care of it
     if ( !config ) // KDE4: ensure that config is always set; make it second in the arg list?
         config = new KSimpleConfig(  instanceName ); // memleak!
-    KConfigGroup * cfgGroup = new KConfigGroup( config, "KParts Plugins" );
+    TDEConfigGroup * cfgGroup = new TDEConfigGroup( config, "KParts Plugins" );
     kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl;
     addPluginsInternal( plugininfos, catname, category, cfgGroup );
 }
 
 void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugininfos,
                                           const TQString & catname, const TQString & category,
-                                          KConfigGroup* cfgGroup )
+                                          TDEConfigGroup* cfgGroup )
 {
     KPluginSelectionWidget * w;
     if( d->tabwidget )
@@ -619,7 +619,7 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin
 }
 
 void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString &
-        catname, const TQString & category, KConfig * config )
+        catname, const TQString & category, TDEConfig * config )
 {
     if ( !config )
         config = instance->config();
@@ -627,11 +627,11 @@ void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString &
 }
 
 void KPluginSelector::addPlugins( const TQValueList<KPluginInfo*> & plugininfos,
-        const TQString & catname, const TQString & category, KConfig * config )
+        const TQString & catname, const TQString & category, TDEConfig * config )
 {
     checkNeedForTabWidget();
-    // the KConfigGroup becomes owned by KPluginSelectionWidget
-    KConfigGroup * cfgGroup = new KConfigGroup( config ? config : TDEGlobal::config(), "Plugins" );
+    // the TDEConfigGroup becomes owned by KPluginSelectionWidget
+    TDEConfigGroup * cfgGroup = new TDEConfigGroup( config ? config : TDEGlobal::config(), "Plugins" );
     kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl;
     addPluginsInternal( plugininfos, catname, category, cfgGroup );
 }
@@ -696,10 +696,10 @@ void KPluginSelector::defaults()
     // tabwidget - defaults() will be called for all of them)
 
     TQWidget * pluginconfig = d->widgetstack->visibleWidget();
-    KCModuleProxy * kcm = ::tqqt_cast<KCModuleProxy*>(pluginconfig);
+    TDECModuleProxy * kcm = ::tqqt_cast<TDECModuleProxy*>(pluginconfig);
     if( kcm )
     {
-        kdDebug( 702 ) << "call KCModule::defaults() for the plugins KCM"
+        kdDebug( 702 ) << "call TDECModule::defaults() for the plugins KCM"
             << endl;
         kcm->defaults();
         return;
@@ -707,14 +707,14 @@ void KPluginSelector::defaults()
 
     // if we get here the visible Widget must be a tabwidget holding more than
     // one KCM
-    TQObjectList * kcms = pluginconfig->queryList( "KCModuleProxy",
+    TQObjectList * kcms = pluginconfig->queryList( "TDECModuleProxy",
             0, false, false );
     TQObjectListIt it( *kcms );
     TQObject * obj;
     while( ( obj = it.current() ) != 0 )
     {
         ++it;
-        ( ( KCModule* )obj )->defaults();
+        ( ( TDECModule* )obj )->defaults();
     }
     delete kcms;
     // FIXME: update changed state
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index 87026154e..4316f4880 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -28,8 +28,8 @@
 class TDEInstance;
 class KPluginInfo;
 class TQWidgetStack;
-class KConfig;
-class KConfigGroup;
+class TDEConfig;
+class TDEConfigGroup;
 
 /**
  * @ingroup main
@@ -89,10 +89,10 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          *                     with the Category key == @p category. If @p
          *                     category is not set the Category key is ignored
          *                     and all plugins are shown.
-         * @param config       The KConfig object that holds the state of the
+         * @param config       The TDEConfig object that holds the state of the
          *                     plugins being enabled or not. By default it should
          *                     be instance->config(). It is recommended to
-         *                     always pass a KConfig object if you use
+         *                     always pass a TDEConfig object if you use
          *                     KSettings::PluginPage since you never know from where the
          *                     page will be called (think global config app).
          *                     For example KViewCanvas passes KSimpleConfig(
@@ -101,7 +101,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
         void addPlugins( const TQString & instanceName,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
-                KConfig * config = 0 );
+                TDEConfig * config = 0 );
 
         /**
          * Add a list of KParts plugins. Convenience method for the one above.
@@ -110,7 +110,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
         void addPlugins( const TDEInstance * instance,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
-                KConfig * config = 0 );
+                TDEConfig * config = 0 );
 
         /**
          * Add a list of non-KParts plugins
@@ -128,10 +128,10 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          *                     with the Category key == @p category. If @p
          *                     category is not set the Category key is ignored
          *                     and all plugins are shown.
-         * @param config       The KConfig object that holds the state of the
+         * @param config       The TDEConfig object that holds the state of the
          *                     plugins being enabled or not. By default it will
          *                     use TDEGlobal::config(). It is recommended to
-         *                     always pass a KConfig object if you use
+         *                     always pass a TDEConfig object if you use
          *                     KSettings::PluginPage since you never know from where the
          *                     page will be called (think global config app).
          *                     For example KViewCanvas passes KSimpleConfig(
@@ -140,7 +140,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
         void addPlugins( const TQValueList<KPluginInfo*> & plugininfos,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
-                KConfig * config = 0 );
+                TDEConfig * config = 0 );
 
         /**
          * Set whether the area for showing the KCMs of the plugins should be
@@ -208,7 +208,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          */
 	void addPluginsInternal( const TQValueList<KPluginInfo*> plugininfos,
                                  const TQString & catname, const TQString & category,
-                                 KConfigGroup* cfgGroup );
+                                 TDEConfigGroup* cfgGroup );
 
 	class KPluginSelectorPrivate;
         KPluginSelectorPrivate * d;
diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h
index eb509a41e..c287ce555 100644
--- a/kutils/kpluginselector_p.h
+++ b/kutils/kpluginselector_p.h
@@ -24,10 +24,10 @@
 
 #include <tdelibs_export.h>
 
-class KConfigGroup;
+class TDEConfigGroup;
 class TQListViewItem;
 class KPluginInfo;
-class KCModuleInfo;
+class TDECModuleInfo;
 
 /**
  * This is a widget to configure what Plugins should be loaded. This widget is
@@ -53,7 +53,7 @@ class KPluginSelectionWidget : public TQWidget
          * @param parent       The parent widget.
          * @param catname      The translated name of the category.
          * @param category     The unstranslated category key name.
-         * @param config       Set the KConfigGroup object that holds the
+         * @param config       Set the TDEConfigGroup object that holds the
          *                     state of the plugins being enabled or not.
          * @param name         The name of the widget (passed to TQWidget)
          *
@@ -61,7 +61,7 @@ class KPluginSelectionWidget : public TQWidget
          */
         KPluginSelectionWidget( const TQValueList<KPluginInfo*> & plugininfos,
                 KPluginSelector * kps, TQWidget * parent, const TQString & catname,
-                const TQString & category, KConfigGroup * config = 0,
+                const TQString & category, TDEConfigGroup * config = 0,
                 const char * name = 0 );
 
         virtual ~KPluginSelectionWidget();
@@ -162,13 +162,13 @@ class KPluginSelectionWidget : public TQWidget
 
     private:
         /**
-         * Load a KCM from a KCModuleInfo. If successfull connect changed
+         * Load a KCM from a TDECModuleInfo. If successfull connect changed
          * signal and return the module. If not, create a label showing "Error",
          * show the loaderError and return the label.
          *
          * @internal
          */
-        TQWidget * insertKCM( TQWidget * parent, const KCModuleInfo & );
+        TQWidget * insertKCM( TQWidget * parent, const TDECModuleInfo & );
 
         /**
          * Embed the KCMs for the plugin into the widgetstack
diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox
index b9efd0dcb..88268f671 100644
--- a/kutils/ksettings/README.dox
+++ b/kutils/ksettings/README.dox
@@ -45,7 +45,7 @@ mechanisms.
 Every page is a KCM. This is what you need for creating a page:
 
 \code
-class MyAppConfig : public KCModule
+class MyAppConfig : public TDECModule
 {
   Q_OBJECT
 public:
@@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory(
     "kcm_myappconfig" ) );
 
 MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args )
-  : KCModule( MyAppConfigFactory::instance(), parent, args )
+  : TDECModule( MyAppConfigFactory::instance(), parent, args )
 {
   // create the pages GUI
   load();
@@ -76,9 +76,9 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args
 // implementations for the other methods
 \endcode
 
-For the KConfig object you can either use
+For the TDEConfig object you can either use
 TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ).
-I added a method to KSettings::Dispatcher that gives you the KConfig
+I added a method to KSettings::Dispatcher that gives you the TDEConfig
 object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName
 
 
@@ -94,7 +94,7 @@ An example file:
 Encoding=UTF-8
 Icon=myapp
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=myappconfig
@@ -115,10 +115,10 @@ Some explanation for those keys:
 - Icon is the icon that will be used in the listview/iconview for your page.
 - X-TDE-Library is the name of the library where the page is in. The library
   always needs to be prefixed with kcm_ but you don't write the prefix in the
-  desktop file. For more docu on this look for the KCModule docu.
+  desktop file. For more docu on this look for the TDECModule docu.
 - X-TDE-FactoryName is either the name of the Factory you used in the
   KGenericFactory call or the suffix of the create_ function that you created.
-  Again for more info look for the KCModule docu.
+  Again for more info look for the TDECModule docu.
 - 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
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index c64e2e64a..727ca1072 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -58,7 +58,7 @@ class PageNode
 		enum Type { KCM, Group, Root };
 		union Value
 		{
-			KCModuleInfo * kcm;
+			TDECModuleInfo * kcm;
 			GroupInfo * group;
 		};
 		Type m_type;
@@ -71,7 +71,7 @@ class PageNode
 		bool m_dirty;
 
 	protected:
-		PageNode( KCModuleInfo * info, PageNode * parent )
+		PageNode( TDECModuleInfo * info, PageNode * parent )
 			: m_type( KCM )
 			, m_parent( parent )
 			, m_visible( true )
@@ -291,7 +291,7 @@ class PageNode
 			return false;
 		}
 
-		bool insert( KCModuleInfo * info, const TQString & parentid )
+		bool insert( TDECModuleInfo * info, const TQString & parentid )
 		{
 			if( parentid.isNull() )
 			{
@@ -467,10 +467,10 @@ TQValueList<KService::Ptr> Dialog::parentComponentsServices(
 	constraint = "('" + constraint + "' in [X-TDE-ParentComponents])";
 
 	kdDebug( 700 ) << "constraint = " << constraint << endl;
-	return KTrader::self()->query( "KCModule", constraint );
+	return KTrader::self()->query( "TDECModule", constraint );
 }
 
-bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
+bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const
 {
 	// if the user of this class requested to hide disabled modules
 	// we check whether it should be enabled or not
@@ -491,9 +491,9 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
 		// we check if the parent component is a plugin
 		if( ! d->plugininfomap.contains( *pcit ) )
 		{
-			// if not the KCModule must be enabled
+			// if not the TDECModule must be enabled
 			enabled = true;
-			// we're done for this KCModuleInfo
+			// we're done for this TDECModuleInfo
 			break;
 		}
 		// if it is a plugin we check whether the plugin is enabled
@@ -502,7 +502,7 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
 		enabled = pinfo->isPluginEnabled();
 		kdDebug( 700 ) << "parent " << *pcit << " is "
 			<< ( enabled ? "enabled" : "disabled" ) << endl;
-		// if it is enabled we're done for this KCModuleInfo
+		// if it is enabled we're done for this TDECModuleInfo
 		if( enabled )
 			break;
 	}
@@ -543,12 +543,12 @@ void Dialog::createDialogFromServices()
 				it != setdlgaddon.end(); ++it )
 			parseGroupFile( *it );
 
-	// now we process the KCModule services
+	// now we process the TDECModule services
 	for( TQValueList<KService::Ptr>::ConstIterator it = d->services.begin();
 			it != d->services.end(); ++it )
 	{
-		// we create the KCModuleInfo
-		KCModuleInfo * info = new KCModuleInfo( *it );
+		// we create the TDECModuleInfo
+		TDECModuleInfo * info = new TDECModuleInfo( *it );
 		TQString parentid;
 		TQVariant tmp = info->service()->property( "X-TDE-CfgDlgHierarchy",
 			TQVariant::String );
@@ -577,10 +577,10 @@ void Dialog::createDialogFromServices()
 	// TODO: Don't show the reset button until the issue with the
 	// KPluginSelector::load() method is solved.
 	// Problem:
-	// KCMultiDialog::show() call KCModule::load() to reset all KCMs
+	// KCMultiDialog::show() call TDECModule::load() to reset all KCMs
 	// (KPluginSelector::load() resets all plugin selections and all plugin
 	// KCMs).
-	// The reset button calls KCModule::load(), too but in this case we want the
+	// The reset button calls TDECModule::load(), too but in this case we want the
 	// KPluginSelector to only reset the current visible plugin KCM and not
 	// touch the plugin selections.
 	// I have no idea how to check that in KPluginSelector::load()...
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index cd9b539ef..58115426c 100644
--- a/kutils/ksettings/dialog.h
+++ b/kutils/ksettings/dialog.h
@@ -26,7 +26,7 @@
 template<class T> class TQValueList;
 class KPluginInfo;
 class KCMultiDialog;
-class KCModuleInfo;
+class TDECModuleInfo;
 
 namespace KSettings
 {
@@ -188,7 +188,7 @@ class KUTILS_EXPORT Dialog : public TQObject
          * @internal
          * Check whether the plugin associated with this KCM is enabled.
          */
-        bool isPluginForKCMEnabled( KCModuleInfo * ) const;
+        bool isPluginForKCMEnabled( TDECModuleInfo * ) const;
 
         TQValueList<KService::Ptr> instanceServices() const;
         TQValueList<KService::Ptr> parentComponentsServices(
@@ -204,7 +204,7 @@ class KUTILS_EXPORT Dialog : public TQObject
          * If this module is put into a TreeList hierarchy this will return a
          * list of the names of the parent modules.
          */
-        TQStringList parentModuleNames( KCModuleInfo * );
+        TQStringList parentModuleNames( TDECModuleInfo * );
 
         /**
          * @internal
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index eb9acf0bc..590ca7e3c 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -83,7 +83,7 @@ void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, cons
     connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) );
 }
 
-KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
+TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
 {
     kdDebug( 701 ) << k_funcinfo << endl;
     if( m_instanceInfo.contains( instanceName ) )
@@ -113,7 +113,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName )
     // check if the instanceName is valid:
     if( ! m_instanceInfo.contains( instanceName ) )
         return;
-    // first we reparse the config of the instance so that the KConfig object
+    // first we reparse the config of the instance so that the TDEConfig object
     // will be up to date
     m_instanceInfo[ instanceName ].instance->config()->reparseConfiguration();
     TQSignal * sig = m_instanceInfo[ instanceName ].signal;
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index c04a41b99..fa0c9e6c9 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -29,7 +29,7 @@ class TQSignal;
 class TQStrList;
 template<class T> class KStaticDeleter;
 class TDEInstance;
-class KConfig;
+class TDEConfig;
 
 namespace KSettings
 {
@@ -39,7 +39,7 @@ namespace KSettings
  * @short Dispatch change notifications from the KCMs to the program.
  *
  * Since your program does not have direct control over the KCMs that get loaded
- * into the KConfigureDialog you need a way to get notified. This is what you
+ * into the TDEConfigureDialog you need a way to get notified. This is what you
  * do:
  * \code
  * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) );
@@ -74,9 +74,9 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot );
 
         /**
-         * @return the KConfig object that belongs to the instanceName
+         * @return the TDEConfig object that belongs to the instanceName
          */
-        KConfig * configForInstanceName( const TQCString & instanceName );
+        TDEConfig * configForInstanceName( const TQCString & instanceName );
 
         /**
          * @return a list of all the instance names that are currently
@@ -100,10 +100,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         void reparseConfiguration( const TQCString & instanceName );
 
         /**
-         * When this slot is called the KConfig objects of all the registered
-         * instances are sync()ed. This is usefull when some other KConfig
+         * When this slot is called the TDEConfig objects of all the registered
+         * instances are sync()ed. This is usefull when some other TDEConfig
          * objects will read/write from/to the same config file, so that you
-         * can first write out the current state of the KConfig objects.
+         * can first write out the current state of the TDEConfig objects.
          */
         void syncConfiguration();
 
diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp
index 4a94d21d4..c7208dc69 100644
--- a/kutils/ksettings/pluginpage.cpp
+++ b/kutils/ksettings/pluginpage.cpp
@@ -38,7 +38,7 @@ class PluginPage::PluginPagePrivate
 };
 
     PluginPage::PluginPage( TQWidget * parent, const char * name, const TQStringList & args )
-    : KCModule( parent, name, args )
+    : TDECModule( parent, name, args )
     , d( new PluginPagePrivate )
 {
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
@@ -47,7 +47,7 @@ class PluginPage::PluginPagePrivate
 }
 
     PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
-    : KCModule( instance, parent, args )
+    : TDECModule( instance, parent, args )
     , d( new PluginPagePrivate )
 {
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h
index 16cfbc572..2ba4f2142 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/kutils/ksettings/pluginpage.h
@@ -31,7 +31,7 @@ namespace KSettings
 /**
  * @ingroup settings
  * @ingroup plugin
- * @short Convenience KCModule for creating a plugins config page.
+ * @short Convenience TDECModule for creating a plugins config page.
  *
  * This class makes it very easy to create a plugins configuration page to your
  * program. All you need to do is create a class that is derived from
@@ -55,7 +55,7 @@ namespace KSettings
    Encoding=UTF-8
    Icon=plugin
    Type=Service
-   ServiceTypes=KCModule
+   ServiceTypes=TDECModule
 
    X-TDE-ModuleType=Library
    X-TDE-Library=myapppluginconfig
@@ -70,18 +70,18 @@ namespace KSettings
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
  */
-class KUTILS_EXPORT PluginPage : public KCModule
+class KUTILS_EXPORT PluginPage : public TDECModule
 {
     Q_OBJECT
     public:
         /**
-         * Standart KCModule constructor. Automatically creates the the
+         * Standart TDECModule constructor. Automatically creates the the
          * KPluginSelector widget.
          */
         PluginPage( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() );
 
         /**
-         * Standart KCModule constructor. Automatically creates the the
+         * Standart TDECModule constructor. Automatically creates the the
          * KPluginSelector widget.
          */
         PluginPage( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
@@ -103,7 +103,7 @@ class KUTILS_EXPORT PluginPage : public KCModule
         virtual void load();
 
         /**
-         * Save the state of the plugins to KConfig objects
+         * Save the state of the plugins to TDEConfig objects
          */
         virtual void save();
         virtual void defaults();