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

26 files changed, 180 insertions, 180 deletions

diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 2f8e7eee3..143838908 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -1,5 +1,5 @@
 /*
-    Tests for KConfig Compiler
+    Tests for TDEConfig Compiler
 
     Copyright (c) 2005      by Duncan Mac-Vicar       <duncan@kde.org>
 
@@ -21,8 +21,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "KConfigXT")
-KUNITTEST_MODULE_REGISTER_TESTER( KConfigCompiler_Test )
+KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "TDEConfigXT")
+KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
 
 typedef const char * CompilerTestSet[];
 
@@ -50,12 +50,12 @@ static CompilerTestSet willFailCases =
 };
 
 
-void KConfigCompiler_Test::allTests()
+void TDEConfigCompiler_Test::allTests()
 {
 	testExpectedOutput();
 }
 
-void KConfigCompiler_Test::testExpectedOutput()
+void TDEConfigCompiler_Test::testExpectedOutput()
 {
 	uint i = 0;
 	// Known to pass test cases
@@ -74,7 +74,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	}
 }
 
-void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
+void TDEConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
 {
 	TQFile file(fileName);
 	TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
index 36b33cd47..1eba78b97 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
@@ -1,5 +1,5 @@
 /*
-    Tests for KConfig Compiler
+    Tests for TDEConfig Compiler
 
     Copyright (c) 2005      by Duncan Mac-Vicar       <duncan@kde.org>
 
@@ -21,7 +21,7 @@
 class TQString;
 
 // change to SlotTester when it works
-class KConfigCompiler_Test : public KUnitTest::Tester
+class TDEConfigCompiler_Test : public KUnitTest::Tester
 {
 public:
 	void allTests();
diff --git a/tdecore/kconfig_compiler/tests/myprefs.h b/tdecore/kconfig_compiler/tests/myprefs.h
index ebef89c08..020dc6bfa 100644
--- a/tdecore/kconfig_compiler/tests/myprefs.h
+++ b/tdecore/kconfig_compiler/tests/myprefs.h
@@ -1,7 +1,7 @@
 #include <kconfigskeleton.h>
 
-class MyPrefs : public KConfigSkeleton
+class MyPrefs : public TDEConfigSkeleton
 {
   public:
-    MyPrefs( const TQString &a ) : KConfigSkeleton( a ) {}
+    MyPrefs( const TQString &a ) : TDEConfigSkeleton( a ) {}
 };
diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/kconfig_compiler/tests/test1.cpp.ref
index b3050921e..d0b6b76f1 100644
--- a/tdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test1.cpp.ref
@@ -4,65 +4,65 @@
 #include "test1.h"
 
 Test1::Test1(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
   setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
 
-  KConfigSkeleton::ItemBool  *itemOneOption;
-  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+  TDEConfigSkeleton::ItemBool  *itemOneOption;
+  itemOneOption = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
   addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
-  KConfigSkeleton::ItemInt  *itemAnotherOption;
-  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+  TDEConfigSkeleton::ItemInt  *itemAnotherOption;
+  itemAnotherOption = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
   addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesListOption;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "One" );
     valuesListOption.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Two" );
     valuesListOption.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Three" );
     valuesListOption.append( choice );
   }
-  KConfigSkeleton::ItemEnum  *itemListOption;
-  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+  TDEConfigSkeleton::ItemEnum  *itemListOption;
+  itemListOption = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
   addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
 
   setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
 
-  KConfigSkeleton::ItemString  *itemMyString;
-  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+  TDEConfigSkeleton::ItemString  *itemMyString;
+  itemMyString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
   addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
-  KConfigSkeleton::ItemPath  *itemMyPath;
-  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
+  TDEConfigSkeleton::ItemPath  *itemMyPath;
+  itemMyPath = new TDEConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
   addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
-  KConfigSkeleton::ItemInt  *itemAnotherOption2;
-  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
+  TDEConfigSkeleton::ItemInt  *itemAnotherOption2;
+  itemAnotherOption2 = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
   addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
   TQStringList defaultMyStringList;
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringList;
+  itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
   addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyStringListHidden;
   defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
   defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringListHidden;
-  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringListHidden;
+  itemMyStringListHidden = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
   addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
-  KConfigSkeleton::ItemInt  *itemMyNumber;
-  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+  TDEConfigSkeleton::ItemInt  *itemMyNumber;
+  itemMyNumber = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
   addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/kconfig_compiler/tests/test1.h.ref
index cc2d99c69..584dcb7ff 100644
--- a/tdecore/kconfig_compiler/tests/test1.h.ref
+++ b/tdecore/kconfig_compiler/tests/test1.h.ref
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 
 #include <tqdir.h>
-class Test1 : public KConfigSkeleton
+class Test1 : public TDEConfigSkeleton
 {
   public:
     class EnumListOption
diff --git a/tdecore/kconfig_compiler/tests/test1.kcfgc b/tdecore/kconfig_compiler/tests/test1.kcfgc
index 3b74d7c51..ecab7b851 100644
--- a/tdecore/kconfig_compiler/tests/test1.kcfgc
+++ b/tdecore/kconfig_compiler/tests/test1.kcfgc
@@ -3,7 +3,7 @@ ClassName=Test1
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/kconfig_compiler/tests/test2.cpp.ref
index 2d56f7545..fe7b8af80 100644
--- a/tdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test2.cpp.ref
@@ -10,59 +10,59 @@ Test2::Test2(  )
 {
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
   addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+  mAutoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
   mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
   addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
-  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
+  mConfirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
   mConfirmItem->setLabel( i18n("Confirm deletes") );
   addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
-  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
+  mArchiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
   mArchiveFileItem->setLabel( i18n("Archive File") );
   addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+  mDestinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
   mDestinationItem->setLabel( i18n("New Events/Todos Should") );
   addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
+  mHourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
   mHourSizeItem->setLabel( i18n("Hour Size") );
   addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
-  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+  mSelectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
   mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
   addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
@@ -72,22 +72,22 @@ Test2::Test2(  )
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+  mSelectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
   mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
   addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
+  mHighlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
   mHighlightColorItem->setLabel( i18n("Highlight color") );
   addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
-  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
+  mAgendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
   mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
   addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
+  mTimeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
   mTimeBarFontItem->setLabel( i18n("Time bar") );
   addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref
index 11fe6b38f..3bd0eb8c9 100644
--- a/tdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test3.cpp.ref
@@ -6,20 +6,20 @@
 using namespace TestNameSpace;
 
 Test3::Test3(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
 {
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Blah" ) );
 
-  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
+  mBlubbItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
   addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
-  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
+  mBlahBlahItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
   addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
-  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+  mMyPasswordItem = new TDEConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
   addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/kconfig_compiler/tests/test3.h.ref
index 75b1b0929..4c35a138a 100644
--- a/tdecore/kconfig_compiler/tests/test3.h.ref
+++ b/tdecore/kconfig_compiler/tests/test3.h.ref
@@ -8,7 +8,7 @@
 
 namespace TestNameSpace {
 
-class Test3 : public KConfigSkeleton
+class Test3 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref
index 6918a8c8a..c6b29bec2 100644
--- a/tdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test4.cpp.ref
@@ -21,54 +21,54 @@ Test4 *Test4::self()
 const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
 
 Test4::Test4(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
-  KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  TDEConfigSkeleton::ItemColor  *itemColor[4];
+  itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
   addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
   addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
   addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
   addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
-  KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
+  TDEConfigSkeleton::ItemEnum  *itemMouseAction[3];
+  itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
   addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
+  itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
   addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
+  itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
   addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/kconfig_compiler/tests/test4.h.ref
index d11dd3aee..9457413a1 100644
--- a/tdecore/kconfig_compiler/tests/test4.h.ref
+++ b/tdecore/kconfig_compiler/tests/test4.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test4 : public KConfigSkeleton
+class Test4 : public TDEConfigSkeleton
 {
   public:
     class EnumMouseAction
@@ -115,7 +115,7 @@ class Test4 : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test4();
diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref
index 8373eb3f6..9e295bc0e 100644
--- a/tdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test5.cpp.ref
@@ -21,54 +21,54 @@ Test5 *Test5::self()
 const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
 
 Test5::Test5(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
-  KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  TDEConfigSkeleton::ItemColor  *itemColor[4];
+  itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
   addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
   addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
   addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
   addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
-  KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
+  TDEConfigSkeleton::ItemEnum  *itemMouseAction[3];
+  itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
   addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
+  itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
   addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
+  itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
   addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/kconfig_compiler/tests/test5.h.ref
index efb9b448a..274da4761 100644
--- a/tdecore/kconfig_compiler/tests/test5.h.ref
+++ b/tdecore/kconfig_compiler/tests/test5.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test5 : public KConfigSkeleton
+class Test5 : public TDEConfigSkeleton
 {
   public:
     enum { Encrypt, Decrypt, CrashNBurn, PumpNDump };
@@ -107,7 +107,7 @@ class Test5 : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test5();
diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref
index 51b96d4c4..fc19613a9 100644
--- a/tdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test6.cpp.ref
@@ -4,22 +4,22 @@
 #include "test6.h"
 
 Test6::Test6(  const TQString & Number )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
   , mParamNumber(Number)
 {
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-  KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  TDEConfigSkeleton::ItemColor  *itemColor;
+  itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
   addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/kconfig_compiler/tests/test6.h.ref
index 6743d6064..eee776b5a 100644
--- a/tdecore/kconfig_compiler/tests/test6.h.ref
+++ b/tdecore/kconfig_compiler/tests/test6.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test6 : public KConfigSkeleton
+class Test6 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref
index 91a22e036..81f7de10e 100644
--- a/tdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test7.cpp.ref
@@ -4,22 +4,22 @@
 #include "test7.h"
 
 Test7::Test7(  int Number )
-  : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
   , mParamNumber(Number)
 {
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-  KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  TDEConfigSkeleton::ItemColor  *itemColor;
+  itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
   addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/kconfig_compiler/tests/test7.h.ref
index 8f8808da1..fb6dd6c77 100644
--- a/tdecore/kconfig_compiler/tests/test7.h.ref
+++ b/tdecore/kconfig_compiler/tests/test7.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test7 : public KConfigSkeleton
+class Test7 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
index 413e75c9c..c0267452d 100644
--- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -4,15 +4,15 @@
 #include "test8a.h"
 
 Test8a::Test8a(  KSharedConfig::Ptr config  )
-  : KConfigSkeleton( config )
+  : TDEConfigSkeleton( config )
 {
   setCurrentGroup( TQString::fromLatin1( "Group" ) );
 
-  KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() );
+  TDEConfigSkeleton::ItemFont  *itemFont;
+  itemFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() );
   addItem( itemFont, TQString::fromLatin1( "Font" ) );
-  KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() );
+  TDEConfigSkeleton::ItemFont  *itemTitleFont;
+  itemTitleFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() );
   addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref
index 0ab182a04..747c6dd58 100644
--- a/tdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.h.ref
@@ -7,7 +7,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test8a : public KConfigSkeleton
+class Test8a : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/kconfig_compiler/tests/test8b.cpp.ref
index e29e3c4e7..6a0a16b48 100644
--- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8b.cpp.ref
@@ -24,17 +24,17 @@ Test8b::Test8b(  )
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
 
-  KConfigSkeleton::ItemUInt  *itemSomething;
-  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+  TDEConfigSkeleton::ItemUInt  *itemSomething;
+  itemSomething = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
   addItem( itemSomething, TQString::fromLatin1( "Something" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
 
-  KConfigSkeleton::ItemBool  *itemFooBoo;
-  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+  TDEConfigSkeleton::ItemBool  *itemFooBoo;
+  itemFooBoo = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
   addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
-  KConfigSkeleton::ItemUInt  *itemPort;
-  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+  TDEConfigSkeleton::ItemUInt  *itemPort;
+  itemPort = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
   addItem( itemPort, TQString::fromLatin1( "Port" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/kconfig_compiler/tests/test8b.h.ref
index 4ca0d5c7f..052746bfb 100644
--- a/tdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8b.h.ref
@@ -75,7 +75,7 @@ class Test8b : public Test8a
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test8b();
diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/kconfig_compiler/tests/test9.cpp.ref
index c5d57e4d1..f6765fb42 100644
--- a/tdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test9.cpp.ref
@@ -4,7 +4,7 @@
 #include "test9.h"
 
 Test9::Test9(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
@@ -14,18 +14,18 @@ Test9::Test9(  const TQString & transport, const TQString & folder )
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringList;
+  itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
   addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyPathList;
   defaultMyPathList.append( TQString::fromUtf8( "/home" ) );
   defaultMyPathList.append( TQString::fromUtf8( "~" ) );
 
-  KConfigSkeleton::ItemPathList  *itemMyPathList;
-  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+  TDEConfigSkeleton::ItemPathList  *itemMyPathList;
+  itemMyPathList = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
   addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
-  KConfigSkeleton::ItemPathList  *itemMyPathsList2;
-  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+  TDEConfigSkeleton::ItemPathList  *itemMyPathsList2;
+  itemMyPathsList2 = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
   addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/kconfig_compiler/tests/test9.h.ref
index 66a629b48..99d94c957 100644
--- a/tdecore/kconfig_compiler/tests/test9.h.ref
+++ b/tdecore/kconfig_compiler/tests/test9.h.ref
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 
 #include <tqdir.h>
-class Test9 : public KConfigSkeleton
+class Test9 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test9.kcfgc b/tdecore/kconfig_compiler/tests/test9.kcfgc
index 8f124fc25..0a88064b6 100644
--- a/tdecore/kconfig_compiler/tests/test9.kcfgc
+++ b/tdecore/kconfig_compiler/tests/test9.kcfgc
@@ -3,7 +3,7 @@ ClassName=Test9
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
index 7b5f55f03..3aad5b689 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
@@ -33,17 +33,17 @@ class TestDPointerPrivate
     TQFont timeBarFont;
 
     // items
-    KConfigSkeleton::ItemBool *autoSaveItem;
-    KConfigSkeleton::ItemInt *autoSaveIntervalItem;
-    KConfigSkeleton::ItemBool *confirmItem;
-    KConfigSkeleton::ItemString *archiveFileItem;
-    KConfigSkeleton::ItemEnum *destinationItem;
-    KConfigSkeleton::ItemInt *hourSizeItem;
-    KConfigSkeleton::ItemBool *selectionStartsEditorItem;
-    KConfigSkeleton::ItemStringList *selectedPluginsItem;
-    KConfigSkeleton::ItemColor *highlightColorItem;
-    KConfigSkeleton::ItemColor *agendaBgColorItem;
-    KConfigSkeleton::ItemFont *timeBarFontItem;
+    TDEConfigSkeleton::ItemBool *autoSaveItem;
+    TDEConfigSkeleton::ItemInt *autoSaveIntervalItem;
+    TDEConfigSkeleton::ItemBool *confirmItem;
+    TDEConfigSkeleton::ItemString *archiveFileItem;
+    TDEConfigSkeleton::ItemEnum *destinationItem;
+    TDEConfigSkeleton::ItemInt *hourSizeItem;
+    TDEConfigSkeleton::ItemBool *selectionStartsEditorItem;
+    TDEConfigSkeleton::ItemStringList *selectedPluginsItem;
+    TDEConfigSkeleton::ItemColor *highlightColorItem;
+    TDEConfigSkeleton::ItemColor *agendaBgColorItem;
+    TDEConfigSkeleton::ItemFont *timeBarFontItem;
 };
 
 TestDPointer *TestDPointer::mSelf = 0;
@@ -60,65 +60,65 @@ TestDPointer *TestDPointer::self()
 }
 
 TestDPointer::TestDPointer(  )
-  : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
 {
   d = new TestDPointerPrivate;
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
+  d->autoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
   d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
   addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+  d->autoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
   d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
   addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
-  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
+  d->confirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
   d->confirmItem->setLabel( i18n("Confirm deletes") );
   addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
-  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
+  d->archiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
   d->archiveFileItem->setLabel( i18n("Archive File") );
   addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+  d->destinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
   d->destinationItem->setLabel( i18n("New Events/Todos Should") );
   addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
+  d->hourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
   d->hourSizeItem->setLabel( i18n("Hour Size") );
   addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
-  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+  d->selectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
   d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
   addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
@@ -128,22 +128,22 @@ TestDPointer::TestDPointer(  )
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+  d->selectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
   d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
   addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
+  d->highlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
   d->highlightColorItem->setLabel( i18n("Highlight color") );
   addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
-  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
+  d->agendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
   d->agendaBgColorItem->setLabel( i18n("Agenda view background color") );
   addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
+  d->timeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
   d->timeBarFontItem->setLabel( i18n("Time bar") );
   addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
@@ -160,7 +160,7 @@ bool TestDPointer::autoSave()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
 {
   return d->autoSaveItem;
 }
@@ -177,7 +177,7 @@ int TestDPointer::autoSaveInterval()
 }
 
 
-KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
+TDEConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
 {
   return d->autoSaveIntervalItem;
 }
@@ -194,7 +194,7 @@ bool TestDPointer::confirm()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::confirmItem()
 {
   return d->confirmItem;
 }
@@ -211,7 +211,7 @@ TQString TestDPointer::archiveFile()
 }
 
 
-KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
+TDEConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
 {
   return d->archiveFileItem;
 }
@@ -228,7 +228,7 @@ int TestDPointer::destination()
 }
 
 
-KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
+TDEConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
 {
   return d->destinationItem;
 }
@@ -245,7 +245,7 @@ int TestDPointer::hourSize()
 }
 
 
-KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
+TDEConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
 {
   return d->hourSizeItem;
 }
@@ -262,7 +262,7 @@ bool TestDPointer::selectionStartsEditor()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
 {
   return d->selectionStartsEditorItem;
 }
@@ -279,7 +279,7 @@ TQStringList TestDPointer::selectedPlugins()
 }
 
 
-KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
+TDEConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
 {
   return d->selectedPluginsItem;
 }
@@ -296,7 +296,7 @@ TQColor TestDPointer::highlightColor()
 }
 
 
-KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
+TDEConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
 {
   return d->highlightColorItem;
 }
@@ -313,7 +313,7 @@ TQColor TestDPointer::agendaBgColor()
 }
 
 
-KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
+TDEConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
 {
   return d->agendaBgColorItem;
 }
@@ -330,7 +330,7 @@ TQFont TestDPointer::timeBarFont()
 }
 
 
-KConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
+TDEConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
 {
   return d->timeBarFontItem;
 }
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref b/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
index 81f281e83..d9b7b94c1 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
+++ b/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
@@ -8,7 +8,7 @@
 
 class TestDPointerPrivate;
 
-class TestDPointer : public KConfigSkeleton
+class TestDPointer : public TDEConfigSkeleton
 {
   public:
     class EnumDestination
@@ -210,7 +210,7 @@ class TestDPointer : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     TestDPointer();