Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

29 files changed, 399 insertions, 399 deletions

diff --git a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 31f3f5ee9..2f8e7eee3 100644
--- a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -13,8 +13,8 @@
     *************************************************************************
 */
 
-#include <qfile.h>
-#include <qstring.h>
+#include <tqfile.h>
+#include <tqstring.h>
 #include <kdebug.h>
 #include <kunittest/module.h>
 #include "kconfigcompiler_test.h"
@@ -44,7 +44,7 @@ static CompilerTestSet testCases =
 
 static CompilerTestSet willFailCases =
 {
-	// where is that QDir comming from?
+	// where is that TQDir comming from?
 	//"test9.cpp", NULL
 	NULL
 };
@@ -61,7 +61,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	// Known to pass test cases
 	while (testCases[ i ])
 	{
-		performCompare(QString::fromLatin1(testCases[ i ]));
+		performCompare(TQString::fromLatin1(testCases[ i ]));
 		++i;
 	}
 
@@ -69,20 +69,20 @@ void KConfigCompiler_Test::testExpectedOutput()
 	i= 0;
 	while (willFailCases[ i ])
 	{
-		performCompare(QString::fromLatin1(willFailCases[ i ]), true);
+		performCompare(TQString::fromLatin1(willFailCases[ i ]), true);
 		++i;
 	}
 }
 
-void KConfigCompiler_Test::performCompare(const QString &fileName, bool fail)
+void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
 {
-	QFile file(fileName);
-	QFile fileRef(QString::fromLatin1(SRCDIR) + QString::fromLatin1("/") + fileName + QString::fromLatin1(".ref"));
+	TQFile file(fileName);
+	TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
 	
 	if ( file.open(IO_ReadOnly) && fileRef.open(IO_ReadOnly) )
 	{
-		QString content = file.readAll();
-		QString contentRef = fileRef.readAll();
+		TQString content = file.readAll();
+		TQString contentRef = fileRef.readAll();
 		
 		if (!fail)
 			CHECK( content, contentRef);
diff --git a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h
index 8ccea83fa..5521ef982 100644
--- a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h
+++ b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.h
@@ -28,7 +28,7 @@ public:
 public slots:
 	void testExpectedOutput();
 private:
-	void performCompare(const QString &fileName, bool fail=false);
+	void performCompare(const TQString &fileName, bool fail=false);
 };
 
 #endif
diff --git a/kdecore/kconfig_compiler/tests/myprefs.h b/kdecore/kconfig_compiler/tests/myprefs.h
index 263c409d2..ebef89c08 100644
--- a/kdecore/kconfig_compiler/tests/myprefs.h
+++ b/kdecore/kconfig_compiler/tests/myprefs.h
@@ -3,5 +3,5 @@
 class MyPrefs : public KConfigSkeleton
 {
   public:
-    MyPrefs( const QString &a ) : KConfigSkeleton( a ) {}
+    MyPrefs( const TQString &a ) : KConfigSkeleton( a ) {}
 };
diff --git a/kdecore/kconfig_compiler/tests/test1.cpp.ref b/kdecore/kconfig_compiler/tests/test1.cpp.ref
index e4c9f86d8..b3050921e 100644
--- a/kdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test1.cpp.ref
@@ -3,67 +3,67 @@
 
 #include "test1.h"
 
-Test1::Test1(  const QString & transport, const QString & folder )
-  : KConfigSkeleton( QString::fromLatin1( "examplerc" ) )
+Test1::Test1(  const TQString & transport, const TQString & folder )
+  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
-  setCurrentGroup( QString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
+  setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
 
   KConfigSkeleton::ItemBool  *itemOneOption;
-  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "OneOption" ), mOneOption, true );
-  addItem( itemOneOption, QString::fromLatin1( "OneOption" ) );
+  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+  addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
   KConfigSkeleton::ItemInt  *itemAnotherOption;
-  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
-  addItem( itemAnotherOption, QString::fromLatin1( "AnotherOption" ) );
-  QValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
+  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+  addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
+  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "One" );
+    choice.name = TQString::fromLatin1( "One" );
     valuesListOption.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "Two" );
+    choice.name = TQString::fromLatin1( "Two" );
     valuesListOption.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "Three" );
+    choice.name = TQString::fromLatin1( "Three" );
     valuesListOption.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemListOption;
-  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
-  addItem( itemListOption, QString::fromLatin1( "ListOption" ) );
+  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+  addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
 
-  setCurrentGroup( QString::fromLatin1( "MyOptions" ) );
+  setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
 
   KConfigSkeleton::ItemString  *itemMyString;
-  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "MyString" ), mMyString, QString::fromLatin1( "Default String" ) );
-  addItem( itemMyString, QString::fromLatin1( "MyString" ) );
+  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+  addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
   KConfigSkeleton::ItemPath  *itemMyPath;
-  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), QString::fromLatin1( "MyPath" ), mMyPath, QDir::homeDirPath()+QString::fromLatin1(".hidden_file") );
-  addItem( itemMyPath, QString::fromLatin1( "MyPath" ) );
+  itemMyPath = new KConfigSkeleton::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(), QString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
-  addItem( itemAnotherOption2, QString::fromLatin1( "AnotherOption2" ) );
-  QStringList defaultMyStringList;
-  defaultMyStringList.append( QString::fromUtf8( "up" ) );
-  defaultMyStringList.append( QString::fromUtf8( "down" ) );
+  itemAnotherOption2 = new KConfigSkeleton::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(), QString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, QString::fromLatin1( "MyStringList" ) );
-  QStringList defaultMyStringListHidden;
-  defaultMyStringListHidden.append( QString::fromUtf8( "up" ) );
-  defaultMyStringListHidden.append( QString::fromUtf8( "down" ) );
+  itemMyStringList = new KConfigSkeleton::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(), QString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
-  addItem( itemMyStringListHidden, QString::fromLatin1( "MyStringListHidden" ) );
+  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+  addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
   KConfigSkeleton::ItemInt  *itemMyNumber;
-  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
-  addItem( itemMyNumber, QString::fromLatin1( "MyNumber" ) );
+  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+  addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
 }
 
 Test1::~Test1()
diff --git a/kdecore/kconfig_compiler/tests/test1.h.ref b/kdecore/kconfig_compiler/tests/test1.h.ref
index e08ccee8a..cc2d99c69 100644
--- a/kdecore/kconfig_compiler/tests/test1.h.ref
+++ b/kdecore/kconfig_compiler/tests/test1.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-#include <qdir.h>
+#include <tqdir.h>
 class Test1 : public KConfigSkeleton
 {
   public:
@@ -16,7 +16,7 @@ class Test1 : public KConfigSkeleton
       enum type { One, Two, Three, COUNT };
     };
 
-    Test1( const QString & transport, const QString & folder );
+    Test1( const TQString & transport, const TQString & folder );
     ~Test1();
 
     /**
@@ -24,7 +24,7 @@ class Test1 : public KConfigSkeleton
     */
     void setOneOption( bool v )
     {
-      if (!isImmutable( QString::fromLatin1( "OneOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "OneOption" ) ))
         mOneOption = v;
     }
 
@@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton
     */
     void setAnotherOption( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "AnotherOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) ))
         mAnotherOption = v;
     }
 
@@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton
     */
     void setListOption( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "ListOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "ListOption" ) ))
         mListOption = v;
     }
 
@@ -73,16 +73,16 @@ class Test1 : public KConfigSkeleton
     /**
       Set This is a string
     */
-    void setMyString( const QString & v )
+    void setMyString( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyString" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyString" ) ))
         mMyString = v;
     }
 
     /**
       Get This is a string
     */
-    QString myString() const
+    TQString myString() const
     {
       return mMyString;
     }
@@ -90,16 +90,16 @@ class Test1 : public KConfigSkeleton
     /**
       Set This is a path
     */
-    void setMyPath( const QString & v )
+    void setMyPath( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyPath" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPath" ) ))
         mMyPath = v;
     }
 
     /**
       Get This is a path
     */
-    QString myPath() const
+    TQString myPath() const
     {
       return mMyPath;
     }
@@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton
     */
     void setAnotherOption2( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "AnotherOption2" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) ))
         mAnotherOption2 = v;
     }
 
@@ -124,16 +124,16 @@ class Test1 : public KConfigSkeleton
     /**
       Set MyStringList
     */
-    void setMyStringList( const QStringList & v )
+    void setMyStringList( const TQStringList & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyStringList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
         mMyStringList = v;
     }
 
     /**
       Get MyStringList
     */
-    QStringList myStringList() const
+    TQStringList myStringList() const
     {
       return mMyStringList;
     }
@@ -141,16 +141,16 @@ class Test1 : public KConfigSkeleton
     /**
       Set MyStringListHidden
     */
-    void setMyStringListHidden( const QStringList & v )
+    void setMyStringListHidden( const TQStringList & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyStringListHidden" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) ))
         mMyStringListHidden = v;
     }
 
     /**
       Get MyStringListHidden
     */
-    QStringList myStringListHidden() const
+    TQStringList myStringListHidden() const
     {
       return mMyStringListHidden;
     }
@@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyNumber( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyNumber" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyNumber" ) ))
         mMyNumber = v;
     }
 
@@ -173,8 +173,8 @@ class Test1 : public KConfigSkeleton
     }
 
   protected:
-    QString mParamtransport;
-    QString mParamfolder;
+    TQString mParamtransport;
+    TQString mParamfolder;
 
     // General-$(folder)
     bool mOneOption;
@@ -182,11 +182,11 @@ class Test1 : public KConfigSkeleton
     int mListOption;
 
     // MyOptions
-    QString mMyString;
-    QString mMyPath;
+    TQString mMyString;
+    TQString mMyPath;
     int mAnotherOption2;
-    QStringList mMyStringList;
-    QStringList mMyStringListHidden;
+    TQStringList mMyStringList;
+    TQStringList mMyStringListHidden;
     int mMyNumber;
 
   private:
diff --git a/kdecore/kconfig_compiler/tests/test1main.cpp b/kdecore/kconfig_compiler/tests/test1main.cpp
index f55f54195..976a7bbd6 100644
--- a/kdecore/kconfig_compiler/tests/test1main.cpp
+++ b/kdecore/kconfig_compiler/tests/test1main.cpp
@@ -24,6 +24,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 int main( int, char*[] )
 {
   KInstance i("test");
-  Test1 *t = new Test1( QString::null, QString::null );
+  Test1 *t = new Test1( TQString::null, TQString::null );
   delete t;
 }
diff --git a/kdecore/kconfig_compiler/tests/test2.cpp.ref b/kdecore/kconfig_compiler/tests/test2.cpp.ref
index d2197856e..2d56f7545 100644
--- a/kdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test2.cpp.ref
@@ -6,90 +6,90 @@
 #include <klocale.h>
 
 Test2::Test2(  )
-  : MyPrefs( QString::fromLatin1( "korganizerrc" ) )
+  : MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
 {
-  setCurrentGroup( QString::fromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new KConfigSkeleton::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, QString::fromLatin1( "AutoSave" ) );
-  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
   mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
-  addItem( mAutoSaveIntervalItem, QString::fromLatin1( "AutoSaveInterval" ) );
-  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
+  addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
   mConfirmItem->setLabel( i18n("Confirm deletes") );
-  addItem( mConfirmItem, QString::fromLatin1( "Confirm" ) );
-  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "Archive File" ), mArchiveFile );
+  addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
+  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
   mArchiveFileItem->setLabel( i18n("Archive File") );
-  addItem( mArchiveFileItem, QString::fromLatin1( "ArchiveFile" ) );
-  QValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
+  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "standardDestination" );
+    choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "askDestination" );
+    choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "argl1" );
+    choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "argl2" );
+    choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "argl3" );
+    choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
   mDestinationItem->setLabel( i18n("New Events/Todos Should") );
-  addItem( mDestinationItem, QString::fromLatin1( "Destination" ) );
+  addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Views" ) );
+  setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Hour Size" ), mHourSize, 10 );
+  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
   mHourSizeItem->setLabel( i18n("Hour Size") );
-  addItem( mHourSizeItem, QString::fromLatin1( "HourSize" ) );
-  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+  addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
+  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
   mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
-  addItem( mSelectionStartsEditorItem, QString::fromLatin1( "SelectionStartsEditor" ) );
+  addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
-  setCurrentGroup( QString::fromLatin1( "KOrganizer Plugins" ) );
+  setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
 
-  QStringList defaultSelectedPlugins;
-  defaultSelectedPlugins.append( QString::fromUtf8( "holidays" ) );
-  defaultSelectedPlugins.append( QString::fromUtf8( "webexport" ) );
+  TQStringList defaultSelectedPlugins;
+  defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
+  defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), QString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
   mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
-  addItem( mSelectedPluginsItem, QString::fromLatin1( "SelectedPlugins" ) );
+  addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Colors" ) );
+  setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "Highlight Color" ), mHighlightColor, QColor( 100, 100, 255 ) );
+  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
   mHighlightColorItem->setLabel( i18n("Highlight color") );
-  addItem( mHighlightColorItem, QString::fromLatin1( "HighlightColor" ) );
-  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, QColor( 255, 255, 255 ) );
+  addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
   mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
-  addItem( mAgendaBgColorItem, QString::fromLatin1( "AgendaBgColor" ) );
+  addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Fonts" ) );
+  setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), QString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
+  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
   mTimeBarFontItem->setLabel( i18n("Time bar") );
-  addItem( mTimeBarFontItem, QString::fromLatin1( "TimeBarFont" ) );
+  addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
 
 Test2::~Test2()
diff --git a/kdecore/kconfig_compiler/tests/test2.h.ref b/kdecore/kconfig_compiler/tests/test2.h.ref
index 4e8b5ec1f..6c0a74d66 100644
--- a/kdecore/kconfig_compiler/tests/test2.h.ref
+++ b/kdecore/kconfig_compiler/tests/test2.h.ref
@@ -21,7 +21,7 @@ class Test2 : public MyPrefs
     */
     void setAutoSave( bool v )
     {
-      if (!isImmutable( QString::fromLatin1( "AutoSave" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         mAutoSave = v;
     }
 
@@ -46,7 +46,7 @@ class Test2 : public MyPrefs
     */
     void setAutoSaveInterval( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "AutoSaveInterval" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
         mAutoSaveInterval = v;
     }
 
@@ -71,7 +71,7 @@ class Test2 : public MyPrefs
     */
     void setConfirm( bool v )
     {
-      if (!isImmutable( QString::fromLatin1( "Confirm" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Confirm" ) ))
         mConfirm = v;
     }
 
@@ -94,16 +94,16 @@ class Test2 : public MyPrefs
     /**
       Set Archive File
     */
-    void setArchiveFile( const QString & v )
+    void setArchiveFile( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "ArchiveFile" ) ))
+      if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
         mArchiveFile = v;
     }
 
     /**
       Get Archive File
     */
-    QString archiveFile() const
+    TQString archiveFile() const
     {
       return mArchiveFile;
     }
@@ -121,7 +121,7 @@ class Test2 : public MyPrefs
     */
     void setDestination( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "Destination" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Destination" ) ))
         mDestination = v;
     }
 
@@ -146,7 +146,7 @@ class Test2 : public MyPrefs
     */
     void setHourSize( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "HourSize" ) ))
+      if (!isImmutable( TQString::fromLatin1( "HourSize" ) ))
         mHourSize = v;
     }
 
@@ -171,7 +171,7 @@ class Test2 : public MyPrefs
     */
     void setSelectionStartsEditor( bool v )
     {
-      if (!isImmutable( QString::fromLatin1( "SelectionStartsEditor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
         mSelectionStartsEditor = v;
     }
 
@@ -194,16 +194,16 @@ class Test2 : public MyPrefs
     /**
       Set SelectedPlugins
     */
-    void setSelectedPlugins( const QStringList & v )
+    void setSelectedPlugins( const TQStringList & v )
     {
-      if (!isImmutable( QString::fromLatin1( "SelectedPlugins" ) ))
+      if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
         mSelectedPlugins = v;
     }
 
     /**
       Get SelectedPlugins
     */
-    QStringList selectedPlugins() const
+    TQStringList selectedPlugins() const
     {
       return mSelectedPlugins;
     }
@@ -219,16 +219,16 @@ class Test2 : public MyPrefs
     /**
       Set Highlight color
     */
-    void setHighlightColor( const QColor & v )
+    void setHighlightColor( const TQColor & v )
     {
-      if (!isImmutable( QString::fromLatin1( "HighlightColor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
         mHighlightColor = v;
     }
 
     /**
       Get Highlight color
     */
-    QColor highlightColor() const
+    TQColor highlightColor() const
     {
       return mHighlightColor;
     }
@@ -244,16 +244,16 @@ class Test2 : public MyPrefs
     /**
       Set Agenda view background color
     */
-    void setAgendaBgColor( const QColor & v )
+    void setAgendaBgColor( const TQColor & v )
     {
-      if (!isImmutable( QString::fromLatin1( "AgendaBgColor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
         mAgendaBgColor = v;
     }
 
     /**
       Get Agenda view background color
     */
-    QColor agendaBgColor() const
+    TQColor agendaBgColor() const
     {
       return mAgendaBgColor;
     }
@@ -269,16 +269,16 @@ class Test2 : public MyPrefs
     /**
       Set Time bar
     */
-    void setTimeBarFont( const QFont & v )
+    void setTimeBarFont( const TQFont & v )
     {
-      if (!isImmutable( QString::fromLatin1( "TimeBarFont" ) ))
+      if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
         mTimeBarFont = v;
     }
 
     /**
       Get Time bar
     */
-    QFont timeBarFont() const
+    TQFont timeBarFont() const
     {
       return mTimeBarFont;
     }
@@ -298,7 +298,7 @@ class Test2 : public MyPrefs
     bool mAutoSave;
     int mAutoSaveInterval;
     bool mConfirm;
-    QString mArchiveFile;
+    TQString mArchiveFile;
     int mDestination;
 
     // Views
@@ -306,14 +306,14 @@ class Test2 : public MyPrefs
     bool mSelectionStartsEditor;
 
     // KOrganizer Plugins
-    QStringList mSelectedPlugins;
+    TQStringList mSelectedPlugins;
 
     // Colors
-    QColor mHighlightColor;
-    QColor mAgendaBgColor;
+    TQColor mHighlightColor;
+    TQColor mAgendaBgColor;
 
     // Fonts
-    QFont mTimeBarFont;
+    TQFont mTimeBarFont;
 
   private:
     ItemBool *mAutoSaveItem;
diff --git a/kdecore/kconfig_compiler/tests/test3.cpp.ref b/kdecore/kconfig_compiler/tests/test3.cpp.ref
index a9435f2cf..11fe6b38f 100644
--- a/kdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test3.cpp.ref
@@ -6,21 +6,21 @@
 using namespace TestNameSpace;
 
 Test3::Test3(  )
-  : KConfigSkeleton( QString::fromLatin1( "test3rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
 {
-  setCurrentGroup( QString::fromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Auto Save" ), mAutoSave, false );
-  addItem( mAutoSaveItem, QString::fromLatin1( "AutoSave" ) );
+  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Blah" ) );
+  setCurrentGroup( TQString::fromLatin1( "Blah" ) );
 
-  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Blubb" ), mBlubb, 10 );
-  addItem( mBlubbItem, QString::fromLatin1( "Blubb" ) );
-  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "BlahBlah" ), mBlahBlah, QString::fromLatin1( "a string" ) );
-  addItem( mBlahBlahItem, QString::fromLatin1( "BlahBlah" ) );
-  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), QString::fromLatin1( "MyPassword" ), mMyPassword );
-  addItem( mMyPasswordItem, QString::fromLatin1( "MyPassword" ) );
+  mBlubbItem = new KConfigSkeleton::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" ) );
+  addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
+  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+  addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
 }
 
 Test3::~Test3()
diff --git a/kdecore/kconfig_compiler/tests/test3.h.ref b/kdecore/kconfig_compiler/tests/test3.h.ref
index 4742a0ec1..75b1b0929 100644
--- a/kdecore/kconfig_compiler/tests/test3.h.ref
+++ b/kdecore/kconfig_compiler/tests/test3.h.ref
@@ -20,7 +20,7 @@ class Test3 : public KConfigSkeleton
     */
     void setAutoSave( bool v )
     {
-      if (!isImmutable( QString::fromLatin1( "AutoSave" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         mAutoSave = v;
     }
 
@@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton
     */
     void setBlubb( int v )
     {
-      if (!isImmutable( QString::fromLatin1( "Blubb" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Blubb" ) ))
         mBlubb = v;
     }
 
@@ -68,16 +68,16 @@ class Test3 : public KConfigSkeleton
     /**
       Set BlahBlah
     */
-    void setBlahBlah( const QString & v )
+    void setBlahBlah( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "BlahBlah" ) ))
+      if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) ))
         mBlahBlah = v;
     }
 
     /**
       Get BlahBlah
     */
-    QString blahBlah() const
+    TQString blahBlah() const
     {
       return mBlahBlah;
     }
@@ -93,16 +93,16 @@ class Test3 : public KConfigSkeleton
     /**
       Set MyPassword
     */
-    void setMyPassword( const QString & v )
+    void setMyPassword( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyPassword" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPassword" ) ))
         mMyPassword = v;
     }
 
     /**
       Get MyPassword
     */
-    QString myPassword() const
+    TQString myPassword() const
     {
       return mMyPassword;
     }
@@ -122,8 +122,8 @@ class Test3 : public KConfigSkeleton
 
     // Blah
     int mBlubb;
-    QString mBlahBlah;
-    QString mMyPassword;
+    TQString mBlahBlah;
+    TQString mMyPassword;
 
   private:
     ItemBool *mAutoSaveItem;
diff --git a/kdecore/kconfig_compiler/tests/test4.cpp.ref b/kdecore/kconfig_compiler/tests/test4.cpp.ref
index d50c98b26..6918a8c8a 100644
--- a/kdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test4.cpp.ref
@@ -21,57 +21,57 @@ Test4 *Test4::self()
 const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
 
 Test4::Test4(  )
-  : KConfigSkeleton( QString::fromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
-  setCurrentGroup( QString::fromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
+TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
   KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], QString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], QString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], QString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], QString::fromLatin1( "Color3" ) );
-  QValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  itemColor[0] = new KConfigSkeleton::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] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new KConfigSkeleton::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] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
+  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "Encrypt" );
+    choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "Decrypt" );
+    choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "CrashNBurn" );
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "PumpNDump" );
+    choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
-  addItem( itemMouseAction[0], QString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
-  addItem( itemMouseAction[1], QString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
-  addItem( itemMouseAction[2], QString::fromLatin1( "MouseActionleft" ) );
+  itemMouseAction[0] = new KConfigSkeleton::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 );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new KConfigSkeleton::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(), QString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, QString::fromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, QString::fromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test4::~Test4()
diff --git a/kdecore/kconfig_compiler/tests/test4.h.ref b/kdecore/kconfig_compiler/tests/test4.h.ref
index b7ae85287..d11dd3aee 100644
--- a/kdecore/kconfig_compiler/tests/test4.h.ref
+++ b/kdecore/kconfig_compiler/tests/test4.h.ref
@@ -28,9 +28,9 @@ class Test4 : public KConfigSkeleton
       Set Block colors.
     */
     static
-    void setColor( int i, const QColor & v )
+    void setColor( int i, const TQColor & v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "Color%1" ).arg( i ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
         self()->mColor[i] = v;
     }
 
@@ -38,7 +38,7 @@ class Test4 : public KConfigSkeleton
       Get Block colors.
     */
     static
-    QColor color( int i )
+    TQColor color( int i )
     {
       return self()->mColor[i];
     }
@@ -49,7 +49,7 @@ class Test4 : public KConfigSkeleton
     static
     void setMouseAction( int i, int v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "MouseAction%1" ).arg( QString::fromLatin1( EnumButton::enumToString[i] ) ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButton::enumToString[i] ) ) ))
         self()->mMouseAction[i] = v;
     }
 
@@ -66,9 +66,9 @@ class Test4 : public KConfigSkeleton
       Set foo bar
     */
     static
-    void setFooBar( const QString & v )
+    void setFooBar( const TQString & v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "FooBar" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
         self()->mFooBar = v;
     }
 
@@ -76,7 +76,7 @@ class Test4 : public KConfigSkeleton
       Get foo bar
     */
     static
-    QString fooBar()
+    TQString fooBar()
     {
       return self()->mFooBar;
     }
@@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!self()->isImmutable( QString::fromLatin1( "Age" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
         self()->mAge = v;
     }
 
@@ -123,9 +123,9 @@ class Test4 : public KConfigSkeleton
 
 
     // Foo
-    QColor mColor[4];
+    TQColor mColor[4];
     int mMouseAction[3];
-    QString mFooBar;
+    TQString mFooBar;
     int mAge;
 
   private:
diff --git a/kdecore/kconfig_compiler/tests/test5.cpp.ref b/kdecore/kconfig_compiler/tests/test5.cpp.ref
index e6dc13f85..8373eb3f6 100644
--- a/kdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test5.cpp.ref
@@ -21,57 +21,57 @@ Test5 *Test5::self()
 const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
 
 Test5::Test5(  )
-  : KConfigSkeleton( QString::fromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
-  setCurrentGroup( QString::fromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-QColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
+TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
   KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], QString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], QString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], QString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], QString::fromLatin1( "Color3" ) );
-  QValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  itemColor[0] = new KConfigSkeleton::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] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new KConfigSkeleton::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] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
+  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "Encrypt" );
+    choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "Decrypt" );
+    choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "CrashNBurn" );
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "PumpNDump" );
+    choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
-  addItem( itemMouseAction[0], QString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
-  addItem( itemMouseAction[1], QString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
-  addItem( itemMouseAction[2], QString::fromLatin1( "MouseActionleft" ) );
+  itemMouseAction[0] = new KConfigSkeleton::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 );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new KConfigSkeleton::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(), QString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, QString::fromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, QString::fromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test5::~Test5()
diff --git a/kdecore/kconfig_compiler/tests/test5.h.ref b/kdecore/kconfig_compiler/tests/test5.h.ref
index 1a61d3913..efb9b448a 100644
--- a/kdecore/kconfig_compiler/tests/test5.h.ref
+++ b/kdecore/kconfig_compiler/tests/test5.h.ref
@@ -20,9 +20,9 @@ class Test5 : public KConfigSkeleton
       Set Block colors.
     */
     static
-    void setColor( int i, const QColor & v )
+    void setColor( int i, const TQColor & v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "Color%1" ).arg( i ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
         self()->mColor[i] = v;
     }
 
@@ -30,7 +30,7 @@ class Test5 : public KConfigSkeleton
       Get Block colors.
     */
     static
-    QColor color( int i )
+    TQColor color( int i )
     {
       return self()->mColor[i];
     }
@@ -41,7 +41,7 @@ class Test5 : public KConfigSkeleton
     static
     void setMouseAction( int i, int v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "MouseAction%1" ).arg( QString::fromLatin1( EnumButtonToString[i] ) ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) ))
         self()->mMouseAction[i] = v;
     }
 
@@ -58,9 +58,9 @@ class Test5 : public KConfigSkeleton
       Set foo bar
     */
     static
-    void setFooBar( const QString & v )
+    void setFooBar( const TQString & v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "FooBar" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
         self()->mFooBar = v;
     }
 
@@ -68,7 +68,7 @@ class Test5 : public KConfigSkeleton
       Get foo bar
     */
     static
-    QString fooBar()
+    TQString fooBar()
     {
       return self()->mFooBar;
     }
@@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!self()->isImmutable( QString::fromLatin1( "Age" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
         self()->mAge = v;
     }
 
@@ -115,9 +115,9 @@ class Test5 : public KConfigSkeleton
 
 
     // Foo
-    QColor mColor[4];
+    TQColor mColor[4];
     int mMouseAction[3];
-    QString mFooBar;
+    TQString mFooBar;
     int mAge;
 
   private:
diff --git a/kdecore/kconfig_compiler/tests/test6.cpp.ref b/kdecore/kconfig_compiler/tests/test6.cpp.ref
index 21fea85f6..51b96d4c4 100644
--- a/kdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test6.cpp.ref
@@ -3,26 +3,26 @@
 
 #include "test6.h"
 
-Test6::Test6(  const QString & Number )
-  : KConfigSkeleton( QString::fromLatin1( "test4rc" ) )
+Test6::Test6(  const TQString & Number )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
   , mParamNumber(Number)
 {
-  setCurrentGroup( QString::fromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
   KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, QColor( "red" ) );
-  addItem( itemColor, QString::fromLatin1( "Color" ) );
+  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, QString::fromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, QString::fromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test6::~Test6()
diff --git a/kdecore/kconfig_compiler/tests/test6.h.ref b/kdecore/kconfig_compiler/tests/test6.h.ref
index 75fcfd04f..6743d6064 100644
--- a/kdecore/kconfig_compiler/tests/test6.h.ref
+++ b/kdecore/kconfig_compiler/tests/test6.h.ref
@@ -10,22 +10,22 @@ class Test6 : public KConfigSkeleton
 {
   public:
 
-    Test6( const QString & Number );
+    Test6( const TQString & Number );
     ~Test6();
 
     /**
       Set Block colors.
     */
-    void setColor( const QColor & v )
+    void setColor( const TQColor & v )
     {
-      if (!isImmutable( QString::fromLatin1( "Color" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Color" ) ))
         mColor = v;
     }
 
     /**
       Get Block colors.
     */
-    QColor color() const
+    TQColor color() const
     {
       return mColor;
     }
@@ -33,16 +33,16 @@ class Test6 : public KConfigSkeleton
     /**
       Set foo bar
     */
-    void setFooBar( const QString & v )
+    void setFooBar( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "FooBar" ) ))
+      if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
         mFooBar = v;
     }
 
     /**
       Get foo bar
     */
-    QString fooBar() const
+    TQString fooBar() const
     {
       return mFooBar;
     }
@@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!isImmutable( QString::fromLatin1( "Age" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Age" ) ))
         mAge = v;
     }
 
@@ -77,13 +77,13 @@ class Test6 : public KConfigSkeleton
     }
 
   protected:
-    QString mParamNumber;
+    TQString mParamNumber;
 
     // Foo
-    QColor mColor;
+    TQColor mColor;
 
     // Bar$(Number)
-    QString mFooBar;
+    TQString mFooBar;
     int mAge;
 
   private:
diff --git a/kdecore/kconfig_compiler/tests/test6main.cpp b/kdecore/kconfig_compiler/tests/test6main.cpp
index a891c097a..27dff57ff 100644
--- a/kdecore/kconfig_compiler/tests/test6main.cpp
+++ b/kdecore/kconfig_compiler/tests/test6main.cpp
@@ -25,6 +25,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 int main( int, char*[] )
 {
   KInstance i("test");
-  Test6 *t = new Test6(QString::null);
+  Test6 *t = new Test6(TQString::null);
   delete t;
 }
diff --git a/kdecore/kconfig_compiler/tests/test7.cpp.ref b/kdecore/kconfig_compiler/tests/test7.cpp.ref
index 8292e31d1..91a22e036 100644
--- a/kdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test7.cpp.ref
@@ -4,25 +4,25 @@
 #include "test7.h"
 
 Test7::Test7(  int Number )
-  : KConfigSkeleton( QString::fromLatin1( "test7rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
   , mParamNumber(Number)
 {
-  setCurrentGroup( QString::fromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
   KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, QColor( "red" ) );
-  addItem( itemColor, QString::fromLatin1( "Color" ) );
+  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, QString::fromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, QString::fromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test7::~Test7()
diff --git a/kdecore/kconfig_compiler/tests/test7.h.ref b/kdecore/kconfig_compiler/tests/test7.h.ref
index e8983907d..8f8808da1 100644
--- a/kdecore/kconfig_compiler/tests/test7.h.ref
+++ b/kdecore/kconfig_compiler/tests/test7.h.ref
@@ -16,16 +16,16 @@ class Test7 : public KConfigSkeleton
     /**
       Set Block colors.
     */
-    void setColor( const QColor & v )
+    void setColor( const TQColor & v )
     {
-      if (!isImmutable( QString::fromLatin1( "Color" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Color" ) ))
         mColor = v;
     }
 
     /**
       Get Block colors.
     */
-    QColor color() const
+    TQColor color() const
     {
       return mColor;
     }
@@ -33,16 +33,16 @@ class Test7 : public KConfigSkeleton
     /**
       Set foo bar
     */
-    void setFooBar( const QString & v )
+    void setFooBar( const TQString & v )
     {
-      if (!isImmutable( QString::fromLatin1( "FooBar" ) ))
+      if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
         mFooBar = v;
     }
 
     /**
       Get foo bar
     */
-    QString fooBar() const
+    TQString fooBar() const
     {
       return mFooBar;
     }
@@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!isImmutable( QString::fromLatin1( "Age" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Age" ) ))
         mAge = v;
     }
 
@@ -80,10 +80,10 @@ class Test7 : public KConfigSkeleton
     int mParamNumber;
 
     // Foo
-    QColor mColor;
+    TQColor mColor;
 
     // Bar$(Number)
-    QString mFooBar;
+    TQString mFooBar;
     int mAge;
 
   private:
diff --git a/kdecore/kconfig_compiler/tests/test8a.cpp.ref b/kdecore/kconfig_compiler/tests/test8a.cpp.ref
index 868b63438..f89b7c133 100644
--- a/kdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -6,14 +6,14 @@
 Test8a::Test8a(  KSharedConfig::Ptr config  )
   : KConfigSkeleton( config )
 {
-  setCurrentGroup( QString::fromLatin1( "Group" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group" ) );
 
   KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), QString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
-  addItem( itemFont, QString::fromLatin1( "Font" ) );
+  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
+  addItem( itemFont, TQString::fromLatin1( "Font" ) );
   KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), QString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
-  addItem( itemTitleFont, QString::fromLatin1( "TitleFont" ) );
+  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
+  addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
 }
 
 Test8a::~Test8a()
diff --git a/kdecore/kconfig_compiler/tests/test8a.h.ref b/kdecore/kconfig_compiler/tests/test8a.h.ref
index 6d4f2a00d..2e947c437 100644
--- a/kdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/kdecore/kconfig_compiler/tests/test8a.h.ref
@@ -17,16 +17,16 @@ class Test8a : public KConfigSkeleton
     /**
       Set Font
     */
-    void setFont( const QFont & v )
+    void setFont( const TQFont & v )
     {
-      if (!isImmutable( QString::fromLatin1( "Font" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Font" ) ))
         mFont = v;
     }
 
     /**
       Get Font
     */
-    QFont font() const
+    TQFont font() const
     {
       return mFont;
     }
@@ -34,16 +34,16 @@ class Test8a : public KConfigSkeleton
     /**
       Set TitleFont
     */
-    void setTitleFont( const QFont & v )
+    void setTitleFont( const TQFont & v )
     {
-      if (!isImmutable( QString::fromLatin1( "TitleFont" ) ))
+      if (!isImmutable( TQString::fromLatin1( "TitleFont" ) ))
         mTitleFont = v;
     }
 
     /**
       Get TitleFont
     */
-    QFont titleFont() const
+    TQFont titleFont() const
     {
       return mTitleFont;
     }
@@ -51,8 +51,8 @@ class Test8a : public KConfigSkeleton
   protected:
 
     // Group
-    QFont mFont;
-    QFont mTitleFont;
+    TQFont mFont;
+    TQFont mTitleFont;
 
   private:
 };
diff --git a/kdecore/kconfig_compiler/tests/test8b.cpp.ref b/kdecore/kconfig_compiler/tests/test8b.cpp.ref
index 101f2ab6a..e29e3c4e7 100644
--- a/kdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test8b.cpp.ref
@@ -22,20 +22,20 @@ Test8b::Test8b(  )
   : Test8a()
 {
   mSelf = this;
-  setCurrentGroup( QString::fromLatin1( "Group8b1" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
 
   KConfigSkeleton::ItemUInt  *itemSomething;
-  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), QString::fromLatin1( "Something" ), mSomething, 60 );
-  addItem( itemSomething, QString::fromLatin1( "Something" ) );
+  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+  addItem( itemSomething, TQString::fromLatin1( "Something" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Group8b2" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
 
   KConfigSkeleton::ItemBool  *itemFooBoo;
-  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "FooBoo" ), mFooBoo, false );
-  addItem( itemFooBoo, QString::fromLatin1( "FooBoo" ) );
+  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+  addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
   KConfigSkeleton::ItemUInt  *itemPort;
-  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), QString::fromLatin1( "Port" ), mPort, 1000 );
-  addItem( itemPort, QString::fromLatin1( "Port" ) );
+  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+  addItem( itemPort, TQString::fromLatin1( "Port" ) );
 }
 
 Test8b::~Test8b()
diff --git a/kdecore/kconfig_compiler/tests/test8b.h.ref b/kdecore/kconfig_compiler/tests/test8b.h.ref
index 0ee51e3f8..4ca0d5c7f 100644
--- a/kdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/kdecore/kconfig_compiler/tests/test8b.h.ref
@@ -21,7 +21,7 @@ class Test8b : public Test8a
     static
     void setSomething( uint v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "Something" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Something" ) ))
         self()->mSomething = v;
     }
 
@@ -40,7 +40,7 @@ class Test8b : public Test8a
     static
     void setFooBoo( bool v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "FooBoo" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) ))
         self()->mFooBoo = v;
     }
 
@@ -59,7 +59,7 @@ class Test8b : public Test8a
     static
     void setPort( uint v )
     {
-      if (!self()->isImmutable( QString::fromLatin1( "Port" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Port" ) ))
         self()->mPort = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test8main.cpp b/kdecore/kconfig_compiler/tests/test8main.cpp
index 912631f7a..b3c242f68 100644
--- a/kdecore/kconfig_compiler/tests/test8main.cpp
+++ b/kdecore/kconfig_compiler/tests/test8main.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 int main( int, char*[] )
 {
   KInstance i("test");
-  Test8a *config1 = new Test8a( KSharedConfig::openConfig( QString::null ) );
+  Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
   Test8a *config2 = new Test8a();
   Test8b::self();
   delete config1;
diff --git a/kdecore/kconfig_compiler/tests/test9.cpp.ref b/kdecore/kconfig_compiler/tests/test9.cpp.ref
index 309c1ddbe..c5d57e4d1 100644
--- a/kdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test9.cpp.ref
@@ -3,30 +3,30 @@
 
 #include "test9.h"
 
-Test9::Test9(  const QString & transport, const QString & folder )
-  : KConfigSkeleton( QString::fromLatin1( "examplerc" ) )
+Test9::Test9(  const TQString & transport, const TQString & folder )
+  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
-  setCurrentGroup( QString::fromLatin1( "MyOptionsXX" ) );
+  setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) );
 
-  QStringList defaultMyStringList;
-  defaultMyStringList.append( QString::fromUtf8( "up" ) );
-  defaultMyStringList.append( QString::fromUtf8( "down" ) );
+  TQStringList defaultMyStringList;
+  defaultMyStringList.append( TQString::fromUtf8( "up" ) );
+  defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), QString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, QString::fromLatin1( "MyStringList" ) );
-  QStringList defaultMyPathList;
-  defaultMyPathList.append( QString::fromUtf8( "/home" ) );
-  defaultMyPathList.append( QString::fromUtf8( "~" ) );
+  itemMyStringList = new KConfigSkeleton::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(), QString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
-  addItem( itemMyPathList, QString::fromLatin1( "MyPathList" ) );
+  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+  addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
   KConfigSkeleton::ItemPathList  *itemMyPathsList2;
-  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), QString::fromLatin1( "MyPathsList2" ), mMyPathsList2, QStringList(QString::fromLatin1("/usr/bin")) += QDir::homeDirPath() );
-  addItem( itemMyPathsList2, QString::fromLatin1( "MyPathsList2" ) );
+  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+  addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
 }
 
 Test9::~Test9()
diff --git a/kdecore/kconfig_compiler/tests/test9.h.ref b/kdecore/kconfig_compiler/tests/test9.h.ref
index 4f3e241fc..66a629b48 100644
--- a/kdecore/kconfig_compiler/tests/test9.h.ref
+++ b/kdecore/kconfig_compiler/tests/test9.h.ref
@@ -6,27 +6,27 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-#include <qdir.h>
+#include <tqdir.h>
 class Test9 : public KConfigSkeleton
 {
   public:
 
-    Test9( const QString & transport, const QString & folder );
+    Test9( const TQString & transport, const TQString & folder );
     ~Test9();
 
     /**
       Set MyStringList
     */
-    void setMyStringList( const QStringList & v )
+    void setMyStringList( const TQStringList & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyStringList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
         mMyStringList = v;
     }
 
     /**
       Get MyStringList
     */
-    QStringList myStringList() const
+    TQStringList myStringList() const
     {
       return mMyStringList;
     }
@@ -34,16 +34,16 @@ class Test9 : public KConfigSkeleton
     /**
       Set This is a list of paths
     */
-    void setMyPathList( const QStringList & v )
+    void setMyPathList( const TQStringList & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyPathList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPathList" ) ))
         mMyPathList = v;
     }
 
     /**
       Get This is a list of paths
     */
-    QStringList myPathList() const
+    TQStringList myPathList() const
     {
       return mMyPathList;
     }
@@ -51,29 +51,29 @@ class Test9 : public KConfigSkeleton
     /**
       Set This is an additional test for PathList
     */
-    void setMyPathsList2( const QStringList & v )
+    void setMyPathsList2( const TQStringList & v )
     {
-      if (!isImmutable( QString::fromLatin1( "MyPathsList2" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) ))
         mMyPathsList2 = v;
     }
 
     /**
       Get This is an additional test for PathList
     */
-    QStringList myPathsList2() const
+    TQStringList myPathsList2() const
     {
       return mMyPathsList2;
     }
 
   protected:
   public:
-    QString mParamtransport;
-    QString mParamfolder;
+    TQString mParamtransport;
+    TQString mParamfolder;
 
     // MyOptionsXX
-    QStringList mMyStringList;
-    QStringList mMyPathList;
-    QStringList mMyPathsList2;
+    TQStringList mMyStringList;
+    TQStringList mMyPathList;
+    TQStringList mMyPathsList2;
 
   private:
 };
diff --git a/kdecore/kconfig_compiler/tests/test9main.cpp b/kdecore/kconfig_compiler/tests/test9main.cpp
index 3802cd339..12e16e0d4 100644
--- a/kdecore/kconfig_compiler/tests/test9main.cpp
+++ b/kdecore/kconfig_compiler/tests/test9main.cpp
@@ -21,18 +21,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "test9.h"
 #include "kinstance.h"
 #include <kdebug.h>
-#include <qdir.h>
+#include <tqdir.h>
 
 int main( int, char*[] )
 {
   KInstance i("test");
-  Test9 *t = new Test9( QString::null, QString::null );
+  Test9 *t = new Test9( TQString::null, TQString::null );
 
-  QStringList myPathsList2 = t->myPathsList2();
+  TQStringList myPathsList2 = t->myPathsList2();
   kdWarning() << myPathsList2 << endl;
 
   // add another path
-  QStringList newlist = QDir::homeDirPath() + QString::fromLatin1("/.kde");
+  TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde");
   myPathsList2 = myPathsList2 + newlist;
   kdWarning() << myPathsList2 << endl;
 
diff --git a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
index e36c50dd0..7b5f55f03 100644
--- a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
@@ -15,7 +15,7 @@ class TestDPointerPrivate
     bool autoSave;
     int autoSaveInterval;
     bool confirm;
-    QString archiveFile;
+    TQString archiveFile;
     int destination;
 
     // Views
@@ -23,14 +23,14 @@ class TestDPointerPrivate
     bool selectionStartsEditor;
 
     // KOrganizer Plugins
-    QStringList selectedPlugins;
+    TQStringList selectedPlugins;
 
     // Colors
-    QColor highlightColor;
-    QColor agendaBgColor;
+    TQColor highlightColor;
+    TQColor agendaBgColor;
 
     // Fonts
-    QFont timeBarFont;
+    TQFont timeBarFont;
 
     // items
     KConfigSkeleton::ItemBool *autoSaveItem;
@@ -60,97 +60,97 @@ TestDPointer *TestDPointer::self()
 }
 
 TestDPointer::TestDPointer(  )
-  : KConfigSkeleton( QString::fromLatin1( "korganizerrc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
 {
   d = new TestDPointerPrivate;
   mSelf = this;
-  setCurrentGroup( QString::fromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Auto Save" ), d->autoSave, false );
+  d->autoSaveItem = new KConfigSkeleton::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, QString::fromLatin1( "AutoSave" ) );
-  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+  addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
   d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
-  addItem( d->autoSaveIntervalItem, QString::fromLatin1( "AutoSaveInterval" ) );
-  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
+  addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
   d->confirmItem->setLabel( i18n("Confirm deletes") );
-  addItem( d->confirmItem, QString::fromLatin1( "Confirm" ) );
-  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "Archive File" ), d->archiveFile );
+  addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
+  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
   d->archiveFileItem->setLabel( i18n("Archive File") );
-  addItem( d->archiveFileItem, QString::fromLatin1( "ArchiveFile" ) );
-  QValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
+  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "standardDestination" );
+    choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "askDestination" );
+    choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "argl1" );
+    choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "argl2" );
+    choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = QString::fromLatin1( "argl3" );
+    choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), QString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
   d->destinationItem->setLabel( i18n("New Events/Todos Should") );
-  addItem( d->destinationItem, QString::fromLatin1( "Destination" ) );
+  addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Views" ) );
+  setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
+  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
   d->hourSizeItem->setLabel( i18n("Hour Size") );
-  addItem( d->hourSizeItem, QString::fromLatin1( "HourSize" ) );
-  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+  addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
+  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
   d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
-  addItem( d->selectionStartsEditorItem, QString::fromLatin1( "SelectionStartsEditor" ) );
+  addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
-  setCurrentGroup( QString::fromLatin1( "KOrganizer Plugins" ) );
+  setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
 
-  QStringList defaultSelectedPlugins;
-  defaultSelectedPlugins.append( QString::fromUtf8( "holidays" ) );
-  defaultSelectedPlugins.append( QString::fromUtf8( "webexport" ) );
+  TQStringList defaultSelectedPlugins;
+  defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
+  defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), QString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
   d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
-  addItem( d->selectedPluginsItem, QString::fromLatin1( "SelectedPlugins" ) );
+  addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Colors" ) );
+  setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "Highlight Color" ), d->highlightColor, QColor( 100, 100, 255 ) );
+  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
   d->highlightColorItem->setLabel( i18n("Highlight color") );
-  addItem( d->highlightColorItem, QString::fromLatin1( "HighlightColor" ) );
-  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, QColor( 255, 255, 255 ) );
+  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->setLabel( i18n("Agenda view background color") );
-  addItem( d->agendaBgColorItem, QString::fromLatin1( "AgendaBgColor" ) );
+  addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
-  setCurrentGroup( QString::fromLatin1( "Fonts" ) );
+  setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), QString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
+  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
   d->timeBarFontItem->setLabel( i18n("Time bar") );
-  addItem( d->timeBarFontItem, QString::fromLatin1( "TimeBarFont" ) );
+  addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
 
 void TestDPointer::setAutoSave( bool v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "AutoSave" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         self()->d->autoSave = v;
 }
 
@@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
 
 void TestDPointer::setAutoSaveInterval( int v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "AutoSaveInterval" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
         self()->d->autoSaveInterval = v;
 }
 
@@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
 
 void TestDPointer::setConfirm( bool v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "Confirm" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) ))
         self()->d->confirm = v;
 }
 
@@ -199,13 +199,13 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
   return d->confirmItem;
 }
 
-void TestDPointer::setArchiveFile( const QString & v )
+void TestDPointer::setArchiveFile( const TQString & v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "ArchiveFile" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
         self()->d->archiveFile = v;
 }
 
-QString TestDPointer::archiveFile()
+TQString TestDPointer::archiveFile()
 {
   return self()->d->archiveFile;
 }
@@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
 
 void TestDPointer::setDestination( int v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "Destination" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) ))
         self()->d->destination = v;
 }
 
@@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
 
 void TestDPointer::setHourSize( int v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "HourSize" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) ))
         self()->d->hourSize = v;
 }
 
@@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
 
 void TestDPointer::setSelectionStartsEditor( bool v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "SelectionStartsEditor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
         self()->d->selectionStartsEditor = v;
 }
 
@@ -267,13 +267,13 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
   return d->selectionStartsEditorItem;
 }
 
-void TestDPointer::setSelectedPlugins( const QStringList & v )
+void TestDPointer::setSelectedPlugins( const TQStringList & v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "SelectedPlugins" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
         self()->d->selectedPlugins = v;
 }
 
-QStringList TestDPointer::selectedPlugins()
+TQStringList TestDPointer::selectedPlugins()
 {
   return self()->d->selectedPlugins;
 }
@@ -284,13 +284,13 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
   return d->selectedPluginsItem;
 }
 
-void TestDPointer::setHighlightColor( const QColor & v )
+void TestDPointer::setHighlightColor( const TQColor & v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "HighlightColor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
         self()->d->highlightColor = v;
 }
 
-QColor TestDPointer::highlightColor()
+TQColor TestDPointer::highlightColor()
 {
   return self()->d->highlightColor;
 }
@@ -301,13 +301,13 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
   return d->highlightColorItem;
 }
 
-void TestDPointer::setAgendaBgColor( const QColor & v )
+void TestDPointer::setAgendaBgColor( const TQColor & v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "AgendaBgColor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
         self()->d->agendaBgColor = v;
 }
 
-QColor TestDPointer::agendaBgColor()
+TQColor TestDPointer::agendaBgColor()
 {
   return self()->d->agendaBgColor;
 }
@@ -318,13 +318,13 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
   return d->agendaBgColorItem;
 }
 
-void TestDPointer::setTimeBarFont( const QFont & v )
+void TestDPointer::setTimeBarFont( const TQFont & v )
 {
-      if (!self()->isImmutable( QString::fromLatin1( "TimeBarFont" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
         self()->d->timeBarFont = v;
 }
 
-QFont TestDPointer::timeBarFont()
+TQFont TestDPointer::timeBarFont()
 {
   return self()->d->timeBarFont;
 }
diff --git a/kdecore/kconfig_compiler/tests/test_dpointer.h.ref b/kdecore/kconfig_compiler/tests/test_dpointer.h.ref
index a8568fc9b..81f281e83 100644
--- a/kdecore/kconfig_compiler/tests/test_dpointer.h.ref
+++ b/kdecore/kconfig_compiler/tests/test_dpointer.h.ref
@@ -75,13 +75,13 @@ class TestDPointer : public KConfigSkeleton
       Set Archive File
     */
     static
-    void setArchiveFile( const QString & v );
+    void setArchiveFile( const TQString & v );
 
     /**
       Get Archive File
     */
     static
-    QString archiveFile();
+    TQString archiveFile();
 
     /**
       Get Item object corresponding to ArchiveFile()
@@ -143,13 +143,13 @@ class TestDPointer : public KConfigSkeleton
       Set SelectedPlugins
     */
     static
-    void setSelectedPlugins( const QStringList & v );
+    void setSelectedPlugins( const TQStringList & v );
 
     /**
       Get SelectedPlugins
     */
     static
-    QStringList selectedPlugins();
+    TQStringList selectedPlugins();
 
     /**
       Get Item object corresponding to SelectedPlugins()
@@ -160,13 +160,13 @@ class TestDPointer : public KConfigSkeleton
       Set Highlight color
     */
     static
-    void setHighlightColor( const QColor & v );
+    void setHighlightColor( const TQColor & v );
 
     /**
       Get Highlight color
     */
     static
-    QColor highlightColor();
+    TQColor highlightColor();
 
     /**
       Get Item object corresponding to HighlightColor()
@@ -177,13 +177,13 @@ class TestDPointer : public KConfigSkeleton
       Set Agenda view background color
     */
     static
-    void setAgendaBgColor( const QColor & v );
+    void setAgendaBgColor( const TQColor & v );
 
     /**
       Get Agenda view background color
     */
     static
-    QColor agendaBgColor();
+    TQColor agendaBgColor();
 
     /**
       Get Item object corresponding to AgendaBgColor()
@@ -194,13 +194,13 @@ class TestDPointer : public KConfigSkeleton
       Set Time bar
     */
     static
-    void setTimeBarFont( const QFont & v );
+    void setTimeBarFont( const TQFont & v );
 
     /**
       Get Time bar
     */
     static
-    QFont timeBarFont();
+    TQFont timeBarFont();
 
     /**
       Get Item object corresponding to TimeBarFont()