TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


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

1722 files changed, 19785 insertions, 19249 deletions

diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index e44a15be..d91d165c 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -21,8 +21,8 @@
 #include "adaproject_part.h"
 #include "adaglobaloptionsdlg.h"
 
-AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
-    :AdaProjectOptionsDlgBase(parent,name,fl), m_part(part)
+AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl)
+    :AdaProjectOptionsDlgBase(tqparent,name,fl), m_part(part)
 {
     delete config_label;
     delete config_combo;
@@ -44,7 +44,7 @@ AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent,
     if (offers.isEmpty())
         options_button->setEnabled(false);
 
-    currentCompiler = TQString::null;
+    currentCompiler = TQString();
 
     /*kdDebug() << ServiceComboBox::defaultCompiler() << endl;
     kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl;
diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h
index 1a186ce9..e72a1941 100644
--- a/buildtools/ada/adaglobaloptionsdlg.h
+++ b/buildtools/ada/adaglobaloptionsdlg.h
@@ -20,9 +20,10 @@ class AdaProjectPart;
 class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~AdaGlobalOptionsDlg();
 
 public slots:
diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui
index 72e99f74..d6219031 100644
--- a/buildtools/ada/adaproject_optionsdlgbase.ui
+++ b/buildtools/ada/adaproject_optionsdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AdaProjectOptionsDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AdaProjectOptionsDlgBase</cstring>
     </property>
@@ -32,14 +32,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>160</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="5">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>configuration_layout</cstring>
             </property>
@@ -48,7 +48,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>config_label</cstring>
                     </property>
@@ -64,7 +64,7 @@
                         <string>Configuration:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>config_combo</cstring>
                     </property>
@@ -90,14 +90,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>8</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addconfig_button</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <string>Add</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeconfig_button</cstring>
                     </property>
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QPushButton" row="6" column="4">
+        <widget class="TQPushButton" row="6" column="4">
             <property name="name">
                 <cstring>options_button</cstring>
             </property>
@@ -144,7 +144,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>30</width>
                     <height>32767</height>
@@ -154,7 +154,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>options_label</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <cstring>compiler_box</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>compiler_label</cstring>
             </property>
@@ -192,22 +192,22 @@
                 <cstring>compiler_box</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>exec_edit</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="6" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="6" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>options_edit</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="3">
+        <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>compiler_box</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>exec_label</cstring>
             </property>
@@ -250,7 +250,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -267,7 +267,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -278,7 +278,7 @@
             <property name="name">
                 <cstring>mainSourceUrl</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>26</height>
@@ -288,7 +288,7 @@
                 <enum>WheelFocus</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="9" column="0">
+        <widget class="TQLabel" row="9" column="0">
             <property name="name">
                 <cstring>mainSourceLabel</cstring>
             </property>
@@ -317,7 +317,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -334,14 +334,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>400</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="7" column="3" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="7" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>defaultopts_button</cstring>
             </property>
@@ -447,7 +447,7 @@
     <tabstop>addconfig_button</tabstop>
     <tabstop>removeconfig_button</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">compiler_box_activated(const QString&amp;)</slot>
     <slot access="protected">addconfig_button_clicked()</slot>
     <slot access="protected">configRemoved()</slot>
@@ -457,14 +457,14 @@
     <slot access="protected">configAdded()</slot>
     <slot access="protected">setDirty()</slot>
     <slot access="protected">setDefaultOptions()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>qwidget.h</includehint>
+    <includehint>tqwidget.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index f226809d..d747eb00 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -46,8 +46,8 @@ typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
 static const KDevPluginInfo data("kdevadaproject");
 K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
 
-AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
+AdaProjectPart::AdaProjectPart(TQObject *tqparent, const char *name, const TQStringList& )
+    :KDevBuildTool(&data, tqparent, name ? name : "AdaProjectPart" )
 {
     setInstance(AdaProjectFactory::instance());
     setXMLFile("kdevadaproject.rc");
@@ -139,7 +139,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec
     do {
         dir.setPath(s.pop());
         kdDebug() << "AdaProjectPart::openProject examining: " << dir.path() << endl;
-        const QFileInfoList *dirEntries = dir.entryInfoList();
+        const TQFileInfoList *dirEntries = dir.entryInfoList();
 	if( !dirEntries )
 	    break;
 
@@ -249,7 +249,7 @@ TQString AdaProjectPart::mainSource() const
 void AdaProjectPart::setMainSource(TQString fullPath)
 {
     TQString olddir = activeDirectory();
-    m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
+    m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
     emit activeDirectoryChanged( olddir, activeDirectory() );
 }
 
@@ -266,7 +266,7 @@ TQString AdaProjectPart::projectName() const
 TQString AdaProjectPart::activeDirectory() const
 {
     TQFileInfo fi(mainSource());
-    return fi.dirPath(true).replace(TQRegExp(projectDirectory()),"");
+    return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),"");
 }
 
 TQString AdaProjectPart::buildDirectory() const
@@ -281,11 +281,11 @@ void AdaProjectPart::listOfFiles(TQStringList &result, TQString path) const
     if (!d.exists())
         return;
 
-    const QFileInfoList *entries = d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden);
+    const TQFileInfoList *entries = d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden);
     if( !entries )
         return;
 
-    QFileInfoListIterator it( *entries );
+    TQFileInfoListIterator it( *entries );
     while( const TQFileInfo* fileInfo = it.current() )
     {
         ++it;
@@ -420,7 +420,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage));
+                                   "The diagnostics are:\n%2").tqarg(service->name()).tqarg(errorMessage));
         exit(1);
     }
 
diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h
index b62cf204..d92205df 100644
--- a/buildtools/ada/adaproject_part.h
+++ b/buildtools/ada/adaproject_part.h
@@ -20,8 +20,9 @@ class KDevCompilerOptions;
 class AdaProjectPart : public KDevBuildTool
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    AdaProjectPart(TQObject *parent, const char *name, const TQStringList &);
+    AdaProjectPart(TQObject *tqparent, const char *name, const TQStringList &);
     ~AdaProjectPart();
 
     virtual void openProject(const TQString &dirName, const TQString &projectName);
diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h
index 5e7038f2..e527cd0d 100644
--- a/buildtools/ada/adaproject_widget.h
+++ b/buildtools/ada/adaproject_widget.h
@@ -7,9 +7,10 @@
 class KDevProject;
 class AdaProjectPart;
 
-class AdaProjectWidget : public QWidget
+class AdaProjectWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
     
 public:
 		  
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index ee08da6d..f00a0bb1 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -24,10 +24,10 @@
 #include "adaproject_part.h"
 #include "adaprojectoptionsdlg.h"
 
-AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
-    : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part)
+AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl)
+    : AdaProjectOptionsDlgBase(tqparent,name, fl), m_part(part)
 {
-    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
 
     offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
 
@@ -42,7 +42,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren
     dirty = false;
 
     TQDomDocument &dom = *(m_part->projectDom());
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"));
 }
 
@@ -94,7 +94,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config )
                         ServiceComboBox::currentText(compiler_box, service_names));
     DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text());
     DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text());
-    DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
+    DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
 }
 
 void AdaProjectOptionsDlg::readConfig( TQString config )
@@ -128,8 +128,8 @@ void AdaProjectOptionsDlg::readConfig( TQString config )
 
 void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config)
 {
-    bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
-    bool canRemove = allConfigs.contains(config) && config != "default";
+    bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
+    bool canRemove = allConfigs.tqcontains(config) && config != "default";
     addconfig_button->setEnabled(canAdd);
     removeconfig_button->setEnabled(canRemove);
 }
@@ -137,7 +137,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config)
 
 void AdaProjectOptionsDlg::configChanged(const TQString &config)
 {
-    if (config == currentConfig || !allConfigs.contains(config))
+    if (config == currentConfig || !allConfigs.tqcontains(config))
         return;
 
     if (!currentConfig.isNull() && dirty)
@@ -178,7 +178,7 @@ void AdaProjectOptionsDlg::configRemoved()
     config_combo->clear();
     config_combo->insertStringList(allConfigs);
 
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged("default");
 }
 
diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h
index 5e40547d..e9f404f0 100644
--- a/buildtools/ada/adaprojectoptionsdlg.h
+++ b/buildtools/ada/adaprojectoptionsdlg.h
@@ -19,9 +19,10 @@ class KDevCompilerOptions;
 class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~AdaProjectOptionsDlg();
 
 public slots:
diff --git a/buildtools/ada/service.cpp b/buildtools/ada/service.cpp
index 97b4f2f5..27a7a691 100644
--- a/buildtools/ada/service.cpp
+++ b/buildtools/ada/service.cpp
@@ -32,7 +32,7 @@ void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList<KSer
 TQString ServiceComboBox::currentText(TQComboBox *combo, const TQStringList &names)
 {
     if (combo->currentItem() == -1)
-        return TQString::null;
+        return TQString();
     return names[combo->currentItem()];
 }
 
diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui
index fa78e97f..e7ba954d 100644
--- a/buildtools/ant/antoptionswidget.ui
+++ b/buildtools/ant/antoptionswidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AntOptionsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AntOptionsWidget</cstring>
     </property>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>86</height>
@@ -63,14 +63,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>86</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <cstring>BuildXML</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -92,21 +92,21 @@
                 <cstring>Verbosity</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
             <property name="text">
                 <string>&amp;Properties:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>Properties</cstring>
             </property>
         </widget>
-        <widget class="QTable" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQTable" row="2" column="1" rowspan="1" colspan="2">
             <column>
                 <property name="text">
                     <string>Property</string>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>240</width>
                     <height>16</height>
@@ -162,8 +162,8 @@
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index d6f66b46..84ad0a5e 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -45,8 +45,8 @@ AntOptions::AntOptions()
 }
 
 
-AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
+AntProjectPart::AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevBuildTool(&data, tqparent, name ? name : "AntProjectPart")
 {
   setInstance(AntProjectFactory::instance());
 
@@ -117,7 +117,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec
 
 void AntProjectPart::populateProject()
 {
-  TQApplication::setOverrideCursor(Qt::waitCursor);
+  TQApplication::setOverrideCursor(TQt::waitCursor);
 
   TQValueStack<TQString> s;
   int prefixlen = m_projectDirectory.length()+1;
@@ -128,7 +128,7 @@ void AntProjectPart::populateProject()
   {
     dir.setPath(s.pop());
     kdDebug() << "Examining: " << dir.path() << endl;
-    const QFileInfoList *dirEntries = dir.entryInfoList();
+    const TQFileInfoList *dirEntries = dir.entryInfoList();
     TQPtrListIterator<TQFileInfo> it(*dirEntries);
     for (; it.current(); ++it)
     {
@@ -229,7 +229,7 @@ TQString AntProjectPart::runDirectory() const
     if ( directoryRadioString == "custom" )
         return DomUtil::readEntry(dom, "/kdevantproject/run/customdirectory");
 
-    int pos = DomMainProgram.findRev('/');
+    int pos = DomMainProgram.tqfindRev('/');
     if (pos != -1)
         return buildDirectory() + "/" + DomMainProgram.left(pos);
 
@@ -458,7 +458,7 @@ void AntProjectPart::ant(const TQString &target)
   if (!m_classPath.count() == 0)
     cp = "CLASSPATH="+m_classPath.join(":");
 
-  makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options));
+  makeFrontend()->queueCommand(m_projectDirectory, cmd.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options));
 }
 
 
@@ -529,11 +529,11 @@ void AntProjectPart::optionsAccepted()
   for (int i=0; i<m_antOptionsWidget->Properties->numRows(); ++i)
   {
     TQString key = m_antOptionsWidget->Properties->text(i,0);
-    m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1));
+    m_antOptions.m_properties.tqreplace(key, m_antOptionsWidget->Properties->text(i,1));
     kdDebug() << "PROP: " << key << "  = " << m_antOptionsWidget->Properties->text(i,1);
 
     TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0);
-    m_antOptions.m_defineProperties.replace(key, item->isChecked());
+    m_antOptions.m_defineProperties.tqreplace(key, item->isChecked());
   }
 
   m_classPath = m_classPathWidget->ClassPath->items();
@@ -554,7 +554,7 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
     return;
 
   m_contextFileName = url.fileName();
-  bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) );
+  bool inProject = project()->allFiles().tqcontains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) );
   TQString popupstr = TQFileInfo(m_contextFileName).fileName();
   if (m_contextFileName.startsWith(projectDirectory()+ "/"))
     m_contextFileName.remove(0, projectDirectory().length()+1);
@@ -562,15 +562,15 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
   popup->insertSeparator();
   if (inProject)
   {
-    int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr),
+    int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr),
                        this, TQT_SLOT(slotRemoveFromProject()) );
-    popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
+    popup->tqsetWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
   }
   else
   {
-    int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr),
+    int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr),
                        this, TQT_SLOT(slotAddToProject()) );
-    popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
+    popup->tqsetWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
   }
 }
 
diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h
index 87cbb6dd..411579e2 100644
--- a/buildtools/ant/antprojectpart.h
+++ b/buildtools/ant/antprojectpart.h
@@ -43,10 +43,11 @@ public:
 class AntProjectPart : public KDevBuildTool
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 	  
-  AntProjectPart(TQObject *parent, const char *name, const TQStringList &args);
+  AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &args);
   ~AntProjectPart();
     TQStringList distFiles() const;
 
diff --git a/buildtools/ant/classpathwidget.ui b/buildtools/ant/classpathwidget.ui
index 8bfde971..52ef6fc5 100644
--- a/buildtools/ant/classpathwidget.ui
+++ b/buildtools/ant/classpathwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ClassPathWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ClassPathWidget</cstring>
     </property>
@@ -30,8 +30,8 @@
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp
index f0cd3693..d70dc2d5 100644
--- a/buildtools/autotools/addapplicationdlg.cpp
+++ b/buildtools/autotools/addapplicationdlg.cpp
@@ -33,8 +33,8 @@
 
 
 AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, SubprojectItem *spitem,
-                                           TQWidget *parent, const char *name)
-    : AddApplicationDialogBase(parent, name, true)
+                                           TQWidget *tqparent, const char *name)
+    : AddApplicationDialogBase(tqparent, name, true)
 {
     filename_edit->setText(".desktop");
     filename_edit->home(false);
diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h
index 4ab74ef2..05314582 100644
--- a/buildtools/autotools/addapplicationdlg.h
+++ b/buildtools/autotools/addapplicationdlg.h
@@ -22,10 +22,11 @@ class TargetItem;
 class AddApplicationDialog : public AddApplicationDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddApplicationDialog( AutoProjectWidget *widget, SubprojectItem *spitem,
-	                      TQWidget *parent = 0, const char *name = 0 );
+	                      TQWidget *tqparent = 0, const char *name = 0 );
 	~AddApplicationDialog();
 
 protected:
diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui
index 5e6def81..3380dc4c 100644
--- a/buildtools/autotools/addapplicationdlgbase.ui
+++ b/buildtools/autotools/addapplicationdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddApplicationDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>add_application_dialog</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox7</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="2" column="1">
+                <widget class="TQCheckBox" row="2" column="1">
                     <property name="name">
                         <cstring>terminal_box</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         <cstring>filename_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="3">
+                <widget class="TQLayoutWidget" row="1" column="3">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -62,11 +62,11 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>icon_button</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>24</width>
                                     <height>24</height>
@@ -89,7 +89,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -98,7 +98,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QComboBox" row="0" column="3">
+                <widget class="TQComboBox" row="0" column="3">
                     <property name="name">
                         <cstring>executable_combo</cstring>
                     </property>
@@ -111,7 +111,7 @@
                         <cstring>name_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="2" column="3">
+                <widget class="TQComboBox" row="2" column="3">
                     <item>
                         <property name="text">
                             <string>Application</string>
@@ -181,7 +181,7 @@
                         <cstring>section_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>name_label_2</cstring>
                     </property>
@@ -192,14 +192,14 @@
                     <property name="text">
                         <string>E&amp;xecutable:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>executable_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>icon_label</cstring>
                     </property>
@@ -210,14 +210,14 @@
                     <property name="text">
                         <string>&amp;Icon:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>icon_button</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="2">
+                <widget class="TQLabel" row="2" column="2">
                     <property name="name">
                         <cstring>section_label</cstring>
                     </property>
@@ -228,14 +228,14 @@
                     <property name="text">
                         <string>&amp;Section:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>section_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>filename_label</cstring>
                     </property>
@@ -246,14 +246,14 @@
                     <property name="text">
                         <string>&amp;File name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>filename_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>name_label</cstring>
                     </property>
@@ -264,14 +264,14 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>name_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>comment_label</cstring>
                     </property>
@@ -282,7 +282,7 @@
                     <property name="text">
                         <string>Co&amp;mment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -301,14 +301,14 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox6</cstring>
             </property>
@@ -319,7 +319,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -330,7 +330,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QListView">
+                        <widget class="TQListView">
                             <column>
                                 <property name="text">
                                     <string></string>
@@ -349,7 +349,7 @@
                                 <enum>LastColumn</enum>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout3</cstring>
                             </property>
@@ -370,14 +370,14 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>add_button</cstring>
                                     </property>
@@ -385,7 +385,7 @@
                                         <string>&lt;-</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>remove_button</cstring>
                                     </property>
@@ -403,7 +403,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -412,7 +412,7 @@
                                 </spacer>
                             </vbox>
                         </widget>
-                        <widget class="QListView">
+                        <widget class="TQListView">
                             <column>
                                 <property name="text">
                                     <string></string>
@@ -435,7 +435,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -456,14 +456,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okbutton</cstring>
                     </property>
@@ -477,7 +477,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -542,11 +542,11 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">addTypeClicked()</slot>
     <slot access="protected">iconClicked()</slot>
     <slot access="protected">removeTypeClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 912edc52..19d400fb 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -34,8 +34,8 @@
 
 #include "addexistingdirectoriesdlg.h"
 
-AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent, const char* name, bool modal, WFlags fl )
-  : AddExistingDlgBase ( parent, name, modal, fl )
+AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+  : AddExistingDlgBase ( tqparent, name, modal, fl )
 {
 	setIcon ( SmallIcon ( "fileimport.png" ) );
 
@@ -186,7 +186,7 @@ void AddExistingDirectoriesDialog::slotOk()
         TQString name = *it;
 
         // Adjust SUBDIRS variable in containing Makefile.am
-        if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
+        if (m_spitem->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
         {
             TQFile subdirsfile( m_spitem->path + "/subdirs" );
             if ( subdirsfile.open( IO_WriteOnly | IO_Append ) )
@@ -196,7 +196,7 @@ void AddExistingDirectoriesDialog::slotOk()
                 subdirsfile.close();
             }
         }
-        else if (m_spitem->variables["SUBDIRS"].find("$(AUTODIRS)") != -1)
+        else if (m_spitem->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1)
         {
         }
         else
@@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk()
             m_widget->getSubprojectView()->parse( newitem );
         } else {
             if (!f.open(IO_WriteOnly)) {
-//                KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
+//                KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
                 continue;
             }
             TQTextStream stream(&f);
@@ -243,7 +243,7 @@ void AddExistingDirectoriesDialog::slotOk()
         if ( !m_part->isKDE() ) {
             TQString projroot = m_part->projectDirectory() + "/";
             TQString subdirectory = dir.path();
-            TQString relpath = subdirectory.replace(0, projroot.length(),"");
+            TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
 
             TQString configureFile = m_part->getAutoConfFile(projroot);
 
@@ -270,7 +270,7 @@ void AddExistingDirectoriesDialog::slotAddSelected()
         TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url());
         if (relPath[relPath.length()-1] == '/')
             relPath = relPath.left(relPath.length()-1);
-        if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) )
+        if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().tqcontains( relPath )) )
         {
             m_importList.append ( ( *it ) );
         }
@@ -288,7 +288,7 @@ void AddExistingDirectoriesDialog::slotAddAll()
         TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url());
         if (relPath[relPath.length()-1] == '/')
             relPath = relPath.left(relPath.length()-1);
-        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) )
+        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) )
  		{
 			m_importList.append ( ( *it ) );
 		}
@@ -363,7 +363,7 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev )
         TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it);
         if (relPath[relPath.length()-1] == '/')
             relPath = relPath.left(relPath.length()-1);
-        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) )
+        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) )
  		{
 			type = KMimeType::findByURL ( ( *it ) );
 
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h
index 3b8853ee..1db1f328 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.h
+++ b/buildtools/autotools/addexistingdirectoriesdlg.h
@@ -36,10 +36,11 @@ class KImportIconView;
 class AddExistingDirectoriesDialog : public AddExistingDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget,
-	                               SubprojectItem* spitem, TQWidget* parent = 0, 
+	                               SubprojectItem* spitem, TQWidget* tqparent = 0, 
 	                               const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~AddExistingDirectoriesDialog();
 
diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui
index cf73ee21..e70d5479 100644
--- a/buildtools/autotools/addexistingdlgbase.ui
+++ b/buildtools/autotools/addexistingdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>AddExistingDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddExistingDlgBase</cstring>
     </property>
@@ -27,9 +27,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,14 +45,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>317</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -81,7 +81,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>infoGroupBox</cstring>
             </property>
@@ -93,7 +93,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -112,7 +112,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>infoLayout1</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>directoryStaticLabel</cstring>
                             </property>
@@ -143,7 +143,7 @@
                                 <string>Directory:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>targetStaticLabel</cstring>
                             </property>
@@ -165,7 +165,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>infoLayout2</cstring>
                     </property>
@@ -192,7 +192,7 @@
                                 <string>[DIRECTORY]</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>targetLabel</cstring>
                             </property>
@@ -204,7 +204,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QSplitter" row="1" column="0">
+        <widget class="TQSplitter" row="1" column="0">
             <property name="name">
                 <cstring>splitter2</cstring>
             </property>
@@ -219,17 +219,17 @@
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="QLayoutWidget">
+            <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout12</cstring>
+                    <cstring>tqlayout12</cstring>
                 </property>
                 <vbox>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout10</cstring>
+                            <cstring>tqlayout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -245,14 +245,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>84</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>addAllButton</cstring>
                                 </property>
@@ -263,7 +263,7 @@
                                     <string>Import by creating symbolic links (recommended)</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>addSelectedButton</cstring>
                                 </property>
@@ -284,7 +284,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>84</width>
                                         <height>20</height>
@@ -293,17 +293,17 @@
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>sourceGroupBox</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>240</width>
                                 <height>250</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -323,17 +323,17 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QLayoutWidget">
+            <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout13</cstring>
+                    <cstring>tqlayout13</cstring>
                 </property>
                 <vbox>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -349,14 +349,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>removeAllButton</cstring>
                                 </property>
@@ -367,7 +367,7 @@
                                     <string>Removes all added files.</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>removeSelectedButton</cstring>
                                 </property>
@@ -388,7 +388,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -397,17 +397,17 @@
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>destGroupBox</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>140</width>
                                 <height>100</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -450,8 +450,8 @@
     <include location="global" impldecl="in implementation">kprogress.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>ksqueezedtextlabel.h</includehint>
diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp
index 6d3224df..519acb33 100644
--- a/buildtools/autotools/addexistingfilesdlg.cpp
+++ b/buildtools/autotools/addexistingfilesdlg.cpp
@@ -49,15 +49,15 @@
 #include "addexistingfilesdlg.h"
 
 /*
- *  Constructs a AddExistingFilesDialog which is a child of 'parent', with the
+ *  Constructs a AddExistingFilesDialog which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 
-AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl )
-        : AddExistingDlgBase ( parent, name, modal, fl )
+AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+        : AddExistingDlgBase ( tqparent, name, modal, fl )
 {
 	m_spitem = spitem;
 	m_titem = titem;
@@ -110,7 +110,7 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj
  */
 AddExistingFilesDialog::~AddExistingFilesDialog()
 {
-    // no need to delete child widgets, Qt does it all for me
+    // no need to delete child widgets, TQt does it all for me
 }
 
 
@@ -234,7 +234,7 @@ void AddExistingFilesDialog::slotOk()
 	progressBar->show();
 	progressBar->setFormat ( i18n ( "Importing... %p%" ) );
 
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	KFileItemListIterator items ( *importView->items() );
 
diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h
index aa00a99e..6cf69364 100644
--- a/buildtools/autotools/addexistingfilesdlg.h
+++ b/buildtools/autotools/addexistingfilesdlg.h
@@ -39,10 +39,11 @@ class KFileItem;
 class AddExistingFilesDialog : public AddExistingDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, 
-	                        SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0,
+	                        SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent = 0,
 	                        const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~AddExistingFilesDialog();
 
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 56df4998..407e5109 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -40,8 +40,8 @@
 
 AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget,
 							SubprojectItem *spitem, TargetItem *item,
-							TQWidget *parent, const char *name)
-	: AddFileDlgBase(parent, name, true)
+							TQWidget *tqparent, const char *name)
+	: AddFileDlgBase(tqparent, name, true)
 {
 	connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) );
 	connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) );
@@ -68,7 +68,7 @@ AddFileDialog::~AddFileDialog()
 void AddFileDialog::accept()
 {
 	TQString name = fileEdit->text();
-	if (name.find('/') != -1) {
+	if (name.tqfind('/') != -1) {
 		KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on."));
 		return;
 	}
diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h
index 867c88cc..e4a6ead4 100644
--- a/buildtools/autotools/addfiledlg.h
+++ b/buildtools/autotools/addfiledlg.h
@@ -27,11 +27,12 @@ class TargetItem;
 class AddFileDialog : public AddFileDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddFileDialog( AutoProjectPart *part, AutoProjectWidget *widget,
 	               SubprojectItem *spitem, TargetItem *item,
-	               TQWidget *parent = 0, const char *name = 0 );
+	               TQWidget *tqparent = 0, const char *name = 0 );
 	~AddFileDialog();
 
 protected:
diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui
index dc8e38b2..2c73254d 100644
--- a/buildtools/autotools/addfiledlgbase.ui
+++ b/buildtools/autotools/addfiledlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddFileDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddFileDlgBase</cstring>
     </property>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -39,7 +39,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>targetBox</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>targetLayout</cstring>
                     </property>
@@ -75,7 +75,7 @@
                                 <string>[TARGET DIRECTORY]</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="1">
+                        <widget class="TQLabel" row="1" column="1">
                             <property name="name">
                                 <cstring>targetLabel</cstring>
                             </property>
@@ -83,7 +83,7 @@
                                 <string>[TARGET NAME]</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>directoryStaticLabel</cstring>
                             </property>
@@ -103,7 +103,7 @@
                                 <string>Directory:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>targetStaticLabel</cstring>
                             </property>
@@ -127,7 +127,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
@@ -150,14 +150,14 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
                         </size>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="1">
+                <widget class="TQCheckBox" row="1" column="1">
                     <property name="name">
                         <cstring>templateCheckBox</cstring>
                     </property>
@@ -176,7 +176,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>fileStaticLabel</cstring>
                     </property>
@@ -188,7 +188,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -217,14 +217,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
                 <cstring>buttonLayout</cstring>
             </property>
@@ -245,14 +245,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>createButton</cstring>
                     </property>
@@ -263,7 +263,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -280,8 +280,8 @@
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp
index 5531c656..79aaab0e 100644
--- a/buildtools/autotools/addicondlg.cpp
+++ b/buildtools/autotools/addicondlg.cpp
@@ -39,8 +39,8 @@ const char *size_map[] = {
 
 AddIconDialog::AddIconDialog(AutoProjectPart *part, AutoProjectWidget *widget,
                              SubprojectItem *spitem, TargetItem *titem,
-                             TQWidget *parent, const char *name)
-    : AddIconDialogBase(parent, name, true)
+                             TQWidget *tqparent, const char *name)
+    : AddIconDialogBase(tqparent, name, true)
 {
     type_combo->insertItem(i18n("Application"));
     type_combo->insertItem(i18n("Action"));
@@ -105,7 +105,7 @@ void AddIconDialog::accept()
     m_target->sources.append(fitem);
     m_target->insertItem(fitem);
 
-    m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit"));
+    m_part->startMakeCommand(destdir, TQString::tqfromLatin1("force-reedit"));
 	
 	m_widget->emitAddedFile(destpath);
 
diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h
index 8ab8437f..94dd8306 100644
--- a/buildtools/autotools/addicondlg.h
+++ b/buildtools/autotools/addicondlg.h
@@ -23,11 +23,12 @@ class TargetItem;
 class AddIconDialog : public AddIconDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddIconDialog( AutoProjectPart *part, AutoProjectWidget *widget,
 	               SubprojectItem *spitem, TargetItem *titem,
-	               TQWidget *parent = 0, const char *name = 0 );
+	               TQWidget *tqparent = 0, const char *name = 0 );
 	~AddIconDialog();
 
 
diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui
index 7fec5097..ad087c56 100644
--- a/buildtools/autotools/addicondlgbase.ui
+++ b/buildtools/autotools/addicondlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddIconDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>add_icon_dialog</cstring>
     </property>
@@ -23,7 +23,7 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>type_label</cstring>
             </property>
@@ -34,14 +34,14 @@
             <property name="text">
                 <string>&amp;Type:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>type_combo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>size_label</cstring>
             </property>
@@ -52,19 +52,19 @@
             <property name="text">
                 <string>&amp;Size:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>size_combo</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>size_combo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>filename_label</cstring>
             </property>
@@ -75,14 +75,14 @@
             <property name="text">
                 <string>File name:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>filename_edit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>name_label</cstring>
             </property>
@@ -93,7 +93,7 @@
             <property name="text">
                 <string>&amp;Name:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -114,7 +114,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -136,14 +136,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okbutton</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -178,12 +178,12 @@
                 <string>unknown</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>type_combo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="1">
+        <widget class="TQLabel" row="4" column="1">
             <property name="name">
                 <cstring>filename_edit</cstring>
             </property>
@@ -212,7 +212,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -260,14 +260,14 @@
     <tabstop>okbutton</tabstop>
     <tabstop>cancelbutton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>somethingChanged()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 
 </UI>
 
diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp
index c4570d8f..105c1457 100644
--- a/buildtools/autotools/addprefixdlg.cpp
+++ b/buildtools/autotools/addprefixdlg.cpp
@@ -21,8 +21,8 @@
 #include <kdeversion.h>
 
 AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& pathEdit,
-        TQWidget *parent, const char *name)
-    : TQDialog(parent, name, true)
+        TQWidget *tqparent, const char *name)
+    : TQDialog(tqparent, name, true)
 {
     setCaption(i18n("Add Prefix"));
 
@@ -39,10 +39,10 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
     path_edit->setMinimumWidth(fm.width('X')*35);
     connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) );
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    layout->addLayout(grid);
+    tqlayout->addLayout(grid);
     grid->addWidget(name_label, 0, 0);
     grid->addWidget(name_edit, 0, 1);
     grid->addWidget(path_label, 1, 0);
@@ -50,7 +50,7 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    layout->addWidget(frame, 0);
+    tqlayout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -59,8 +59,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
     slotPrefixChanged();
 }
 
diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h
index 43630ab4..48dc09b4 100644
--- a/buildtools/autotools/addprefixdlg.h
+++ b/buildtools/autotools/addprefixdlg.h
@@ -16,13 +16,14 @@
 #include <klineedit.h>
 class TQPushButton;
 
-class AddPrefixDialog : public QDialog
+class AddPrefixDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddPrefixDialog( const TQString& nameEdit = "", const TQString& pathEdit = "",
-	                 TQWidget *parent = 0, const char *name = 0 );
+	                 TQWidget *tqparent = 0, const char *name = 0 );
 	~AddPrefixDialog();
 
 	TQString name() const
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index dde34053..a53b2551 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -32,8 +32,8 @@
 
 
 AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *spitem,
-                                   TQWidget *parent, const char *name)
-    : AddServiceDialogBase(parent, name, true)
+                                   TQWidget *tqparent, const char *name)
+    : AddServiceDialogBase(tqparent, name, true)
 {
     filename_edit->setText(".desktop");
     filename_edit->home(false);
@@ -77,7 +77,7 @@ void AddServiceDialog::updateProperties()
             TQStringList stprops = type->propertyDefNames();
             TQStringList::ConstIterator stit;
             for (stit = stprops.begin(); stit != stprops.end(); ++stit)
-                if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment"
+                if (props.tqfind(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment"
                     && (*stit) != "Icon")
                     props.append(*stit);
         }
@@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item)
     TQString prop = item->text(0);
     TQString value = item->text(1);
     bool ok;
-    value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this);
+    value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this);
     if (!ok)
         return;
 
diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h
index 84469e0c..7799a184 100644
--- a/buildtools/autotools/addservicedlg.h
+++ b/buildtools/autotools/addservicedlg.h
@@ -22,10 +22,11 @@ class TargetItem;
 class AddServiceDialog : public AddServiceDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddServiceDialog( AutoProjectWidget *widget, SubprojectItem *spitem,
-	                  TQWidget *parent = 0, const char *name = 0 );
+	                  TQWidget *tqparent = 0, const char *name = 0 );
 	~AddServiceDialog();
 
 protected:
diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui
index 050f8066..99370d6e 100644
--- a/buildtools/autotools/addservicedlgbase.ui
+++ b/buildtools/autotools/addservicedlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddServiceDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>add_service_dialog</cstring>
     </property>
@@ -23,7 +23,7 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -43,7 +43,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>icon_label</cstring>
                     </property>
@@ -54,14 +54,14 @@
                     <property name="text">
                         <string>&amp;Icon:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>icon_button</cstring>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="3">
+                <widget class="TQLayoutWidget" row="1" column="3">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -73,11 +73,11 @@
                             <number>0</number>
                         </property>
 
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>icon_button</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>24</width>
                                     <height>24</height>
@@ -100,7 +100,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -119,7 +119,7 @@
                         <cstring>name_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="3">
+                <widget class="TQComboBox" row="0" column="3">
                     <property name="name">
                         <cstring>library_combo</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>library_label</cstring>
                     </property>
@@ -138,14 +138,14 @@
                     <property name="text">
                         <string>&amp;Library:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>library_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>filename_label</cstring>
                     </property>
@@ -156,14 +156,14 @@
                     <property name="text">
                         <string>&amp;File name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>filename_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>name_label</cstring>
                     </property>
@@ -174,14 +174,14 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>name_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>comment_label</cstring>
                     </property>
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>Co&amp;mment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -201,7 +201,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -213,7 +213,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -225,7 +225,7 @@
                             <number>0</number>
                         </property>
 
-                        <widget class="QListView">
+                        <widget class="TQListView">
                             <column>
                                 <property name="text">
                                     <string></string>
@@ -252,7 +252,7 @@
                                 <enum>LastColumn</enum>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout3</cstring>
                             </property>
@@ -274,14 +274,14 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>add_button</cstring>
                                     </property>
@@ -289,7 +289,7 @@
                                         <string>&lt;-</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>remove_button</cstring>
                                     </property>
@@ -307,7 +307,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -316,7 +316,7 @@
                                 </spacer>
                             </vbox>
                         </widget>
-                        <widget class="QListView">
+                        <widget class="TQListView">
                             <column>
                                 <property name="text">
                                     <string></string>
@@ -345,7 +345,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QListView" row="1" column="1">
+                <widget class="TQListView" row="1" column="1">
                     <column>
                         <property name="text">
                             <string>Property</string>
@@ -386,7 +386,7 @@
                         <enum>AllColumns</enum>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>properties_label</cstring>
                     </property>
@@ -405,7 +405,7 @@
                     <property name="text">
                         <string>&amp;Properties:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -414,7 +414,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -436,14 +436,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okbutton</cstring>
                     </property>
@@ -457,7 +457,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -493,15 +493,15 @@
     </connection>
     <connection>
         <sender>properties_listview</sender>
-        <signal>doubleClicked(QListViewItem*)</signal>
+        <signal>doubleClicked(TQListViewItem*)</signal>
         <receiver>add_service_dialog</receiver>
-        <slot>propertyExecuted(QListViewItem*)</slot>
+        <slot>propertyExecuted(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>properties_listview</sender>
-        <signal>returnPressed(QListViewItem*)</signal>
+        <signal>returnPressed(TQListViewItem*)</signal>
         <receiver>add_service_dialog</receiver>
-        <slot>propertyExecuted(QListViewItem*)</slot>
+        <slot>propertyExecuted(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>icon_button</sender>
@@ -530,15 +530,15 @@
     <tabstop>okbutton</tabstop>
     <tabstop>cancelbutton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">iconClicked()</slot>
     <slot access="protected">addTypeClicked()</slot>
-    <slot access="protected">propertyExecuted(QListViewItem*)</slot>
+    <slot access="protected">propertyExecuted(TQListViewItem*)</slot>
     <slot access="protected">removeTypeClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index 9aeef695..bb0e5527 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -32,8 +32,8 @@
 
 
 AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectView *view,
-                                         SubprojectItem *item, TQWidget *parent, const char *name)
-    : AddSubprojectDlgBase(parent, name, true)
+                                         SubprojectItem *item, TQWidget *tqparent, const char *name)
+    : AddSubprojectDlgBase(tqparent, name, true)
 {
     setIcon(SmallIcon("folder_new.png"));
 
@@ -82,31 +82,31 @@ void AddSubprojectDialog::accept()
     TQFileInfo file( dir, name );
 
     if( file.exists() && !file.isDir() ) {
-        KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name));
+        KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name));
         TQDialog::accept();
         return;
     } else if( file.isDir() ) {
         if( KMessageBox::warningContinueCancel(this,
                i18n("A subdirectory %1 already exists. "
-                    "Do you wish to add it as a subproject?").arg(name))
+                    "Do you wish to add it as a subproject?").tqarg(name))
             == KMessageBox::Cancel ){
             TQDialog::accept();
             return;
 	}
     } else if (!dir.mkdir(name)) {
-        KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name));
+        KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name));
         TQDialog::accept();
         return;
     }
 
     if(!dir.cd(name)) {
-       KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name));
+       KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name));
        TQDialog::accept();
        return;
     }
 
     // Adjust SUBDIRS variable in containing Makefile.am
-    if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
+    if (m_subProject->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
     {
         TQFile subdirsfile( m_subProject->path + "/subdirs" );
         if ( subdirsfile.open( IO_WriteOnly | IO_Append ) )
@@ -116,7 +116,7 @@ void AddSubprojectDialog::accept()
             subdirsfile.close();
         }
     }
-    else if (m_subProject->variables["SUBDIRS"].find("$(AUTODIRS)") != -1)
+    else if (m_subProject->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1)
     {
     }
     else
@@ -148,7 +148,7 @@ void AddSubprojectDialog::accept()
         m_subprojectView->parse( newitem );
     } else {
         if (!f.open(IO_WriteOnly)) {
-            KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
+            KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
             return;
         }
         TQTextStream stream(&f);
@@ -162,7 +162,7 @@ void AddSubprojectDialog::accept()
     if ( !m_part->isKDE() ) {
         TQString projroot = m_part->projectDirectory() + "/";
         TQString subdirectory = dir.path();
-        TQString relpath = subdirectory.replace(0, projroot.length(),"");
+        TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
 
         TQString configureFile = m_part->getAutoConfFile(projroot);
 
diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h
index c1d3b7bf..9ccd1373 100644
--- a/buildtools/autotools/addsubprojectdlg.h
+++ b/buildtools/autotools/addsubprojectdlg.h
@@ -25,10 +25,11 @@ class SubprojectItem;
 class AddSubprojectDialog : public AddSubprojectDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddSubprojectDialog( AutoProjectPart *part, AutoSubprojectView *widget,
-	                     SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 );
+	                     SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 );
 	~AddSubprojectDialog();
 
 private:
diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui
index b4c762b1..73851ee4 100644
--- a/buildtools/autotools/addsubprojectdlgbase.ui
+++ b/buildtools/autotools/addsubprojectdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddSubprojectDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddSubprojectDlgBase</cstring>
     </property>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -39,7 +39,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout3</cstring>
                     </property>
@@ -61,7 +61,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>spStaticLabel</cstring>
                             </property>
@@ -73,7 +73,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -102,7 +102,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -123,14 +123,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>buttonLayout</cstring>
             </property>
@@ -151,14 +151,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>createButton</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -190,8 +190,8 @@
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp
index 5ca96c45..8a0c400c 100644
--- a/buildtools/autotools/addtargetdlg.cpp
+++ b/buildtools/autotools/addtargetdlg.cpp
@@ -29,8 +29,8 @@
 
 
 AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item,
-								TQWidget *parent, const char *name)
-	: AddTargetDialogBase(parent, name, true)
+								TQWidget *tqparent, const char *name)
+	: AddTargetDialogBase(tqparent, name, true)
 {
 	m_subproject = item;
 	m_widget = widget;
@@ -54,7 +54,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item
 
 	setIcon ( SmallIcon ( "targetnew_kdevelop.png" ) );
 
-	canonicalLabel->setText ( TQString::null );
+	canonicalLabel->setText ( TQString() );
 }
 
 
@@ -165,13 +165,13 @@ void AddTargetDialog::accept()
 #endif
 
 	if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() )
-	    name.prepend( TQString::fromLatin1("lib") );
+	    name.prepend( TQString::tqfromLatin1("lib") );
 
 	if( primary == "LTLIBRARIES" && !name.endsWith(".la") )
-	    name.append( TQString::fromLatin1(".la") );
+	    name.append( TQString::tqfromLatin1(".la") );
 
 	if ( primary == "LIBRARIES" && !name.endsWith(".a") )
-	    name.append ( TQString::fromLatin1(".a") );
+	    name.append ( TQString::tqfromLatin1(".a") );
 
 	TQPtrListIterator<TargetItem> it(m_subproject->targets);
 	for (; it.current(); ++it)
diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h
index 8c44aef4..f05cdb94 100644
--- a/buildtools/autotools/addtargetdlg.h
+++ b/buildtools/autotools/addtargetdlg.h
@@ -22,10 +22,11 @@ class SubprojectItem;
 class AddTargetDialog : public AddTargetDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AddTargetDialog( AutoProjectWidget *widget, SubprojectItem *item,
-	                 TQWidget *parent = 0, const char *name = 0 );
+	                 TQWidget *tqparent = 0, const char *name = 0 );
 	~AddTargetDialog();
 
 protected slots:
diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui
index 25687563..f8b8d689 100644
--- a/buildtools/autotools/addtargetdlgbase.ui
+++ b/buildtools/autotools/addtargetdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddTargetDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>add_target_dialog</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>primary_label</cstring>
                     </property>
@@ -44,19 +44,19 @@
                     <property name="text">
                         <string>&amp;Primary:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>primary_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>primary_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>prefix_label</cstring>
                     </property>
@@ -67,19 +67,19 @@
                     <property name="text">
                         <string>Pre&amp;fix:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>prefix_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>prefix_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>filename_label</cstring>
                     </property>
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string>File &amp;name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -112,7 +112,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>246</width>
                             <height>20</height>
@@ -127,7 +127,7 @@
                         <string>[CANONICALIZED NAME]</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="2">
+                <widget class="TQLabel" row="2" column="2">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -155,14 +155,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>ldflags_group</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>allstatic_box</cstring>
                     </property>
@@ -181,7 +181,7 @@
                         <string>Do not link against shared libraries (-all-static)</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>avoidversion_box</cstring>
                     </property>
@@ -189,7 +189,7 @@
                         <string>Do not assign version numbers to libraries (-avoid-version)</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>module_box</cstring>
                     </property>
@@ -197,7 +197,7 @@
                         <string>Create a library that can be dynamically loaded (-module)</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>noundefined_box</cstring>
                     </property>
@@ -205,7 +205,7 @@
                         <string>Library does not depend on external symbols (-no-undefined)</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout11_2</cstring>
                     </property>
@@ -216,7 +216,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>ldflagsother_label</cstring>
                             </property>
@@ -240,7 +240,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -261,14 +261,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okbutton</cstring>
                     </property>
@@ -282,7 +282,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -337,11 +337,11 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">primaryChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
 </includehints>
diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp
index 559e1369..6057bb65 100644
--- a/buildtools/autotools/addtranslationdlg.cpp
+++ b/buildtools/autotools/addtranslationdlg.cpp
@@ -31,8 +31,8 @@
 #include "autoprojectpart.h"
 
 
-AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *parent, const char *name)
-    : TQDialog(parent, name, true)
+AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *tqparent, const char *name)
+    : TQDialog(tqparent, name, true)
 {
     setCaption(i18n("Add Translation"));
 
@@ -42,12 +42,12 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
     (void) new TQLabel(i18n("Language:"), hbox);
     lang_combo = new TQComboBox(hbox);
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->addWidget(hbox);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->addWidget(hbox);
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    layout->addWidget(frame, 0);
+    tqlayout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -56,8 +56,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
     ok_button->setDefault(true);
     connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
 
     TQStringList rawlist, list;
     rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da"
@@ -101,7 +101,7 @@ void AddTranslationDialog::accept()
     f.close();
 
     dir = m_part->buildDirectory() + "/po";
-    m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit"));
+    m_part->startMakeCommand(dir, TQString::tqfromLatin1("force-reedit"));
 
     TQDialog::accept();
 }
diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h
index 762c9790..5fb8b288 100644
--- a/buildtools/autotools/addtranslationdlg.h
+++ b/buildtools/autotools/addtranslationdlg.h
@@ -18,12 +18,13 @@ class TQComboBox;
 class AutoProjectPart;
 
 
-class AddTranslationDialog : public QDialog
+class AddTranslationDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AddTranslationDialog( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 );
+	AddTranslationDialog( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 );
 	~AddTranslationDialog();
 
 private:
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index d3cf3864..7002b7c8 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -15,7 +15,7 @@
 
 #include "autodetailsview.h"
 
-/** Qt */
+/** TQt */
 #include <tqregexp.h>
 #include <tqlistview.h>
 #include <tqwidget.h>
@@ -57,8 +57,8 @@
 
 #include "subclassesdlg.h"
 
-AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name)
-  : AutoProjectViewBase(parent, name)
+AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name)
+  : AutoProjectViewBase(tqparent, name)
 {
 	m_widget = widget;
 	m_part = part;
@@ -71,7 +71,7 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par
 	m_listView->setAllColumnsShowFocus( true );
 	m_listView->setRootIsDecorated( true );
 	m_listView->setResizeMode( TQListView::LastColumn );
-	m_listView->addColumn( TQString::null );
+	m_listView->addColumn( TQString() );
 	m_listView->header()->hide();
 	targetOptionsAction->setEnabled( false );
 	addNewFileAction->setEnabled( false );
@@ -126,7 +126,7 @@ void AutoDetailsView::slotSelectionChanged( TQListViewItem* item )
 
 		if ( pvitem->type() == ProjectItem::File )
 		{
-			titem = static_cast <TargetItem*> ( pvitem->parent() );
+			titem = static_cast <TargetItem*> ( pvitem->tqparent() );
 
 			TQString primary = titem->primary;
 			if ( primary == "PROGRAMS" || primary == "LIBRARIES" ||
@@ -177,7 +177,7 @@ void AutoDetailsView::initActions()
 	KActionCollection * actions = new KActionCollection( this );
 
 	targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0,
-	                                   this, TQT_SLOT( slotTargetOptions() ), actions,
+	                                           TQT_TQOBJECT(this), TQT_SLOT( slotTargetOptions() ), actions,
 	                                   "target options" );
 	targetOptionsAction->setWhatsThis(i18n("<b>Options</b><p>Target options dialog that "
 	                                       "provides settings for linker flags and lists "
@@ -188,7 +188,7 @@ void AutoDetailsView::initActions()
 
 	TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) );
 	addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0,
-	                                this, TQT_SLOT( slotAddNewFile() ), actions,
+	                                        TQT_TQOBJECT(this), TQT_SLOT( slotAddNewFile() ), actions,
 	                                "add new file" );
 	addNewFileAction->setWhatsThis(i18n("<b>Create new file</b><p>Creates a new file and "
 	                                    "adds it to a currently selected target."));
@@ -197,7 +197,7 @@ void AutoDetailsView::initActions()
 
 	TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) );
 	addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0,
-	                                     this, TQT_SLOT( slotAddExistingFile() ), actions,
+	                                             TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingFile() ), actions,
 	                                     "add existing file" );
 	addExistingFileAction->setWhatsThis(i18n("<b>Add existing files</b><p>Adds existing "
 	                                         "file to a currently selected target. Header "
@@ -208,12 +208,12 @@ void AutoDetailsView::initActions()
 	addExistingFileAction->setEnabled( false );
 
 	addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_kdevelop", 0,
-	                             this, TQT_SLOT( slotAddIcon() ), actions, "add icon" );
+	                             TQT_TQOBJECT(this), TQT_SLOT( slotAddIcon() ), actions, "add icon" );
 	addIconAction->setWhatsThis(i18n("<b>Add icon</b><p>Adds an icon to a KDEICON target."));
 
 	TQToolTip::add( m_button4, tr2i18n( "Build Target"));
 	buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0,
-	                                 this, TQT_SLOT( slotBuildTarget() ), actions,
+	                                         TQT_TQOBJECT(this), TQT_SLOT( slotBuildTarget() ), actions,
 	                                 "build target" );
 	buildTargetAction->setWhatsThis(i18n("<b>Build target</b><p>Constructs a series of "
 	                                     "make commands to build the selected target. "
@@ -223,7 +223,7 @@ void AutoDetailsView::initActions()
 
 	TQToolTip::add( m_button5, tr2i18n( "Execute Target..."));
 	executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0,
-	                                   this, TQT_SLOT( slotExecuteTarget() ), actions,
+	                                           TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions,
 	                                   "execute target" );
 	executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target "
 	                                       "and tries to build in case it is not built."));
@@ -231,7 +231,7 @@ void AutoDetailsView::initActions()
 	executeTargetAction->setEnabled( false );
 
 	setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0,
-	                                     this, TQT_SLOT( slotSetActiveTarget() ), actions,
+	                                     TQT_TQOBJECT(this), TQT_SLOT( slotSetActiveTarget() ), actions,
 	                                     "set active target" );
 	setActiveTargetAction->setWhatsThis(i18n("<b>Make target active</b><p>Marks the "
 	                                         "currently selected target as 'active'. New "
@@ -241,7 +241,7 @@ void AutoDetailsView::initActions()
 	                                         "command builds it."));
 
 	TQToolTip::add( m_button3, tr2i18n( "Remove"));
-	removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, this,
+	removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, TQT_TQOBJECT(this),
 	                                  TQT_SLOT( slotRemoveDetail() ), actions,
 	                                  "remove detail" );
 	removeDetailAction->setWhatsThis(i18n("<b>Remove</b><p>Shows a list of targets "
@@ -269,7 +269,7 @@ TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString&
 			return (*it).second;
 	}
 
-	return TQString::null;
+	return TQString();
 }
 
 void AutoDetailsView::slotTargetOptions()
@@ -298,7 +298,7 @@ void AutoDetailsView::slotAddNewFile()
 	if (createFileSupport)
 	{
 		KDevCreateFile::CreatedFile crFile =
-			createFileSupport->createNewFile(TQString::null,
+			createFileSupport->createNewFile(TQString(),
 			                                 m_widget->selectedSubproject()->path);
 /*		if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK)
         {
@@ -365,7 +365,7 @@ void AutoDetailsView::slotBuildTarget()
 	TargetItem* titem = 0;
 
 	if ( pvitem->type() == ProjectItem::File )
-		titem = static_cast <TargetItem*> ( pvitem->parent() );
+		titem = static_cast <TargetItem*> ( pvitem->tqparent() );
 	else
 		titem = static_cast <TargetItem*> ( m_listView->selectedItem() );
 
@@ -383,7 +383,7 @@ void AutoDetailsView::slotExecuteTarget()
 	TargetItem* titem = 0;
 
 	if ( pvitem->type() == ProjectItem::File )
-		titem = static_cast <TargetItem*> ( pvitem->parent() );
+		titem = static_cast <TargetItem*> ( pvitem->tqparent() );
 	else
 		titem = static_cast <TargetItem*> ( m_listView->selectedItem() );
 
@@ -409,7 +409,7 @@ void AutoDetailsView::slotRemoveDetail()
 		if ( !fitem )
 			return;
 
-		TargetItem *titem = static_cast<TargetItem*>( fitem->parent() );
+		TargetItem *titem = static_cast<TargetItem*>( fitem->tqparent() );
 
 		RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(),
 		                      titem, fitem->text( 0 ), this, "remove file dialog" );
@@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		else
 			caption = titem->name;
 
-		KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this );
+		KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this );
 
 		if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES"
 		        || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" )
@@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 			return;
 		}
 
-		KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this );
+		KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this );
 
 		removeDetailAction->plug( &popup );
 		KURL::List urls;
@@ -563,7 +563,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 
 		int idSubclassWidget = popup.insertItem(SmallIconSet("qmake_subclass"),
 		                                        i18n("Subclassing Wizard...") );
-		popup.setWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches "
+		popup.tqsetWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches "
 		                                          "<b>Subclassing</b> wizard. "
 		                                          "It allows to create a subclass from the "
 		                                          "class defined in .ui file. "
@@ -572,22 +572,22 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		                                          "class."));
 		int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"),
 		                                      i18n("List of Subclasses..."));
-		popup.setWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows "
+		popup.tqsetWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows "
 		                                        "subclasses list editor. "
 		                                        "There is possibility to add or remove "
 		                                        "subclasses from the list."));
 		int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"),
 		                                           i18n("Edit ui-Subclass..."));
-		popup.setWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches "
+		popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches "
 		                                             "<b>Subclassing</b> wizard and prompts "
 		                                             "to implement missing in childclass "
 		                                             "slots and functions."));
 		int idViewUIH = popup.insertItem(SmallIconSet("qmake_ui_h"),
 		                                 i18n("Open ui.h File"));
-		popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
+		popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
 		                                   "associated with the selected .ui."));
 
-		if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true)
+		if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true)
 		{
             popup.removeItem(idUISubclasses);
 			popup.removeItem(idViewUIH);
@@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 					list << DomUtil::Pair(srcfile_relpath,uifile_relpath);
 					DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing",
 					                            "subclass", "sourcefile", "uifile", list);
-					newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),"");
+					newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),"");
 				}
 				m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing",
 				                                            "subclass","sourcefile", "uifile");
@@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		{
 			TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name;
 
-			if (noext.findRev('.')>-1)
-				noext = noext.left(noext.findRev('.'));
+			if (noext.tqfindRev('.')>-1)
+				noext = noext.left(noext.tqfindRev('.'));
 
 			TQStringList dummy;
 			TQString uifile = fitem->uiFileLink;
 
-			if (uifile.findRev('/')>-1)
+			if (uifile.tqfindRev('/')>-1)
 			{
 				TQStringList uisplit = TQStringList::split('/',uifile);
 				uifile=uisplit[uisplit.count()-1];
diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h
index 60f10738..0c649b95 100644
--- a/buildtools/autotools/autodetailsview.h
+++ b/buildtools/autotools/autodetailsview.h
@@ -32,9 +32,10 @@ class AutoDetailsView : protected AutoProjectViewBase
 	friend class RemoveFileDialog;
 	friend class FileItem;
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name );
+	AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name );
 	virtual ~AutoDetailsView();
 
 	TQString getUiFileLink( const TQString &path, const TQString& filename );
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index 865e82d0..3fb0bffd 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -27,22 +27,22 @@
 * Class ProjectItem
 */
 
-ProjectItem::ProjectItem( Type type, TQListView *parent, const TQString &text )
-		: TQListViewItem( parent, text ), typ( type )
+ProjectItem::ProjectItem( Type type, TQListView *tqparent, const TQString &text )
+		: TQListViewItem( tqparent, text ), typ( type )
 {
 	bld = false;
 }
 
 
-ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text )
-		: TQListViewItem( parent, text ), typ( type )
+ProjectItem::ProjectItem( Type type, ProjectItem *tqparent, const TQString &text )
+		: TQListViewItem( tqparent, text ), typ( type )
 {
 	bld = false;
 }
 
 
 void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                             int column, int width, int alignment )
+                             int column, int width, int tqalignment )
 {
 	if ( isBold() )
 	{
@@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
 		font.setBold( true );
 		p->setFont( font );
 	}
-	TQListViewItem::paintCell( p, cg, column, width, alignment );
+	TQListViewItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 
@@ -58,15 +58,15 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
 * Class SubprojectItem
 */
 
-SubprojectItem::SubprojectItem( TQListView *parent, const TQString &text )
-		: ProjectItem( Subproject, parent, text )
+SubprojectItem::SubprojectItem( TQListView *tqparent, const TQString &text )
+		: ProjectItem( Subproject, tqparent, text )
 {
 	init();
 }
 
 
-SubprojectItem::SubprojectItem( SubprojectItem *parent, const TQString &text )
-		: ProjectItem( Subproject, parent, text )
+SubprojectItem::SubprojectItem( SubprojectItem *tqparent, const TQString &text )
+		: ProjectItem( Subproject, tqparent, text )
 {
 	init();
 }
@@ -84,7 +84,7 @@ TQString SubprojectItem::relativePath()
     TQString relpath = subdir;
 
     SubprojectItem *it = this;
-    while ( (it= dynamic_cast<SubprojectItem*>(it->parent())) )
+    while ( (it= dynamic_cast<SubprojectItem*>(it->tqparent())) )
     {
         relpath.prepend(it->subdir + "/");
     }
@@ -130,7 +130,7 @@ if(!is_subst)
 return;
 
 	bool ok;
-	TQString text = QInputDialog::getText(
+	TQString text = TQInputDialog::getText(
 	                   i18n("Edit Substitution"), i18n("Substitution:"), TQLineEdit::Normal,
 	                   name, &ok );
 	if ( ok && !text.isEmpty() )
@@ -152,7 +152,7 @@ return;
 
 void FileItem::changeMakefileEntry(const TQString& new_name)
 {
-	TargetItem* target = dynamic_cast<TargetItem*>(parent());
+	TargetItem* target = dynamic_cast<TargetItem*>(tqparent());
 
 	TQMap<TQString,TQString> replaceMap;
 
@@ -167,7 +167,7 @@ void FileItem::changeMakefileEntry(const TQString& new_name)
  		if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() )
 		{
 			TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]);
-			TQStringList::iterator it = sources.find(name);
+			TQStringList::iterator it = sources.tqfind(name);
 			(*it) = new_name;
 			subProject->variables[varname] = sources.join(" ");
 			replaceMap.insert(varname, subProject->variables[varname]);
diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h
index 008fecc4..5f61fef0 100644
--- a/buildtools/autotools/autolistviewitems.h
+++ b/buildtools/autotools/autolistviewitems.h
@@ -26,16 +26,16 @@ class AutoProjectPart;
 /**
 * Base class for all items appearing in ProjectOverview and ProjectDetails.
 */
-class ProjectItem : public QListViewItem
+class ProjectItem : public TQListViewItem
 {
 public:
 	enum Type { Subproject, Target, File };
 
-	ProjectItem( Type type, TQListView *parent, const TQString &text );
-	ProjectItem( Type type, ProjectItem *parent, const TQString &text );
+	ProjectItem( Type type, TQListView *tqparent, const TQString &text );
+	ProjectItem( Type type, ProjectItem *tqparent, const TQString &text );
 
 	void paintCell( TQPainter *p, const TQColorGroup &cg,
-	                int column, int width, int alignment );
+	                int column, int width, int tqalignment );
 	void setBold( bool b )
 	{
 		bld = b;
@@ -62,8 +62,8 @@ private:
 class SubprojectItem : public ProjectItem
 {
 public:
-	SubprojectItem( TQListView *parent, const TQString &text );
-	SubprojectItem( SubprojectItem *parent, const TQString &text );
+	SubprojectItem( TQListView *tqparent, const TQString &text );
+	SubprojectItem( SubprojectItem *tqparent, const TQString &text );
 
 	/** name of the directory */
 	TQString subdir;
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 38604ee0..a2c500a4 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -65,8 +65,8 @@ static const KDevPluginInfo data("kdevautoproject");
 
 K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
 
-AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
-    : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
+AutoProjectPart::AutoProjectPart(TQObject *tqparent, const char *name, const TQStringList &args)
+    : KDevBuildTool(&data, tqparent, name ? name : "AutoProjectPart")
     , m_lastCompilationFailed(false)
 {
     setInstance(AutoProjectFactory::instance());
@@ -407,16 +407,16 @@ TQString AutoProjectPart::mainProgram() const
             KMessageBox::error( m_widget, i18n("There is no active target.\n"
                                 "Unable to determine the main program."), i18n("No active target found") );
             kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
-            return TQString::null;
+            return TQString();
         }
 
         if ( titem->primary != "PROGRAMS" ) {
             KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
                                 "Unable to determine the main program.  If you want this\n"
                                 "to be the active target, set a main program under\n"
-                                "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
+                                "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
             kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
-            return TQString::null;
+            return TQString();
         }
 
         TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() );
@@ -525,7 +525,7 @@ void AutoProjectPart::addFiles ( const TQStringList& fileList )
 
     for ( it = fileList.begin(); it != fileList.end(); ++it )
     {
-        int pos = ( *it ).findRev('/');
+        int pos = ( *it ).tqfindRev('/');
         if (pos != -1)
         {
             directory = ( *it ).left(pos);
@@ -597,7 +597,7 @@ TQString AutoProjectPart::currentBuildConfig() const
     TQDomDocument &dom = *projectDom();
 
     TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration");
-    if (config.isEmpty() || !allBuildConfigs().contains(config))
+    if (config.isEmpty() || !allBuildConfigs().tqcontains(config))
         config = "default";
 
     return config;
@@ -643,20 +643,20 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
         {
             int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n"
                                                "and no configure script for this project.\n"
-                                               "Run automake & friends and configure first?").arg(buildDirectory()), TQString::null, i18n("Run Them"), i18n("Do Not Run"));
+                                               "Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
             if (r == KMessageBox::No)
-                return TQString::null;
+                return TQString();
             preCommand = makefileCvsCommand();
             if (preCommand.isNull())
-                return TQString::null;
+                return TQString();
             preCommand += " && ";
             preCommand += configureCommand() + " && ";
         }
         else
         {
-            int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString::null, i18n("Run configure"), i18n("Do Not Run"));
+            int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
             if (r == KMessageBox::No)
-                return TQString::null;
+                return TQString();
             preCommand = configureCommand() + " && ";
         }
     }
@@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
     kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl;
     if (prio != 0)
     {
-        nice = TQString("nice -n%1 ").arg(prio);
+        nice = TQString("nice -n%1 ").tqarg(prio);
     }
 
     if (cmdline.isEmpty())
@@ -732,13 +732,13 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
             // These are the internal libraries
             dependency.remove("$(top_builddir)/");
 
-            if( !alreadyScheduledDeps.contains(*l2it) )
+            if( !alreadyScheduledDeps.tqcontains(*l2it) )
             {
                 alreadyScheduledDeps << *l2it;
                 tdir = buildDirectory();
                 if (!tdir.endsWith("/") && !tdir.isEmpty())
                     tdir += "/";
-                int pos = dependency.findRev('/');
+                int pos = dependency.tqfindRev('/');
                 if (pos == -1)
                 {
                     tname = dependency;
@@ -782,7 +782,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
                 tdir = buildDirectory();
                 if (!tdir.endsWith("/") && !tdir.isEmpty())
                     tdir += "/";
-                int pos = dependency.findRev('/');
+                int pos = dependency.tqfindRev('/');
                 if (pos == -1)
                 {
                     tname = dependency;
@@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
                     tdir += dependency.left(pos+1);
                     tname = dependency.mid(pos+1);
                 }
-                KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") );
+                KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") );
                 return false;
             }
         }
@@ -812,7 +812,7 @@ void AutoProjectPart::slotBuild()
         m_needMakefileCvs = false;
     }
 
-    startMakeCommand(buildDirectory(), TQString::fromLatin1(""));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1(""));
 }
 
 
@@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const
     cmdline += "/configure\"";
     TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary");
     if (!cc.isEmpty())
-        cmdline.prepend(TQString("CC=%1 ").arg(cc));
+        cmdline.prepend(TQString("CC=%1 ").tqarg(cc));
     TQString cflags = DomUtil::readEntry(dom, prefix + "cflags");
     if (!cflags.isEmpty())
-        cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags));
+        cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags));
     TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary");
     if (!cxx.isEmpty())
-        cmdline.prepend(TQString("CXX=%1 ").arg(cxx));
+        cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx));
     TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags");
     if (!cxxflags.isEmpty())
-        cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags));
+        cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags));
     TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary");
     if (!f77.isEmpty())
-        cmdline.prepend(TQString("F77=%1 ").arg(f77));
+        cmdline.prepend(TQString("F77=%1 ").tqarg(f77));
     TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags");
     if (!fflags.isEmpty())
-        cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags));
+        cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags));
     TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags");
     if (!cppflags.isEmpty())
-        cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags));
+        cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags));
     TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags");
     if (!ldflags.isEmpty())
-        cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags));
+        cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags));
 
     TQString configargs = DomUtil::readEntry(dom, prefix + "configargs");
     if (!configargs.isEmpty()) {
@@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const
     TQString nice;
     kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl;
     if (prio != 0) {
-        nice = TQString("nice -n%1 ").arg(prio);
+        nice = TQString("nice -n%1 ").tqarg(prio);
     }
 
     if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs"))
@@ -1009,7 +1009,7 @@ TQString AutoProjectPart::makefileCvsCommand() const
     else {
         KMessageBox::sorry(m_widget, i18n("There is neither a Makefile.cvs file nor an "
                                           "autogen.sh script in the project directory."));
-        return TQString::null;
+        return TQString();
     }
 
     cmdline.prepend(nice);
@@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs()
 
 void AutoProjectPart::slotInstall()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("install"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"));
 }
 
 
@@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu()
     slotBuild();
 
     // After that issue "make install" with the root user
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true);
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true);
 }
 
 
 void AutoProjectPart::slotClean()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("clean"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("clean"));
 }
 
 
 void AutoProjectPart::slotDistClean()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("distclean"));
 }
 
 
 void AutoProjectPart::slotMakeMessages()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("package-messages"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("package-messages"));
 }
 
 
@@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute()
         if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autokdesu", false) ){
             //slotInstallWithKdesu assumes that it hasn't just been build...
             kdDebug(9020) << "slotExecute: before startMakeCommand" << endl;
-            _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true);
+            _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true);
         }
         else{
             kdDebug(9020) << "slotExecute: before slotInstall" << endl;
@@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem)
         KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
                                 "Unable to determine the main program. If you want this\n"
                                 "to be the active target, set a main program under\n"
-                                "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
+                                "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
         kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
         program += titem->name;
     }else
@@ -1282,7 +1282,7 @@ void AutoProjectPart::slotBuildConfigAboutToShow()
 {
     TQStringList l = allBuildConfigs();
     buildConfigAction->setItems(l);
-    buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig()));
+    buildConfigAction->setCurrentItem(l.tqfindIndex(currentBuildConfig()));
 }
 
 void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el )
@@ -1316,7 +1316,7 @@ void AutoProjectPart::slotCommandFinished( const TQString& command )
     if( m_buildCommand != command )
         return;
 
-    m_buildCommand = TQString::null;
+    m_buildCommand = TQString();
 
     m_timestamp.clear();
     TQStringList fileList = allFiles();
@@ -1356,7 +1356,7 @@ bool AutoProjectPart::isDirty()
         TQString fileName = *it;
         ++it;
 
-        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName );
+        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName );
         TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified();
         if( it == m_timestamp.end() || *it != t ){
             return true;
@@ -1386,7 +1386,7 @@ TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir )
     kdDebug(9020) << "Dir " << currDir << endl;
     TQStringList fileList;
 
-    if( !currDir.contains( "/..") && !currDir.contains("/.") )
+    if( !currDir.tqcontains( "/..") && !currDir.tqcontains("/.") )
     {
         TQDir dir(currDir);
         TQStringList dirList = dir.entryList(TQDir::Dirs );
diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h
index 706eacae..16be5886 100644
--- a/buildtools/autotools/autoprojectpart.h
+++ b/buildtools/autotools/autoprojectpart.h
@@ -34,9 +34,10 @@ class ConfigWidgetProxy;
 class AutoProjectPart : public KDevBuildTool
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AutoProjectPart( TQObject *parent, const char *name, const TQStringList &args );
+	AutoProjectPart( TQObject *tqparent, const char *name, const TQStringList &args );
 	virtual ~AutoProjectPart();
 
 	/**
@@ -132,7 +133,7 @@ private:
 	bool m_needMakefileCvs;
 	bool m_lastCompilationFailed;
 	bool m_isKDE;
-	QPair<TQDir, TargetItem*> m_executeTargetAfterBuild;
+	TQPair<TQDir, TargetItem*> m_executeTargetAfterBuild;
 	TQString m_runProg;
 
 	ConfigWidgetProxy * _configProxy;
diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui
index ad5142ba..0285c110 100644
--- a/buildtools/autotools/autoprojectviewbase.ui
+++ b/buildtools/autotools/autoprojectviewbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>AutoProjectViewBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AutoProjectViewBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="margin">
             <number>4</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -30,7 +30,7 @@
                 <property name="spacing">
                     <number>2</number>
                 </property>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>m_button1</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>m_button2</cstring>
                     </property>
@@ -46,7 +46,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>m_button3</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>m_button4</cstring>
                     </property>
@@ -62,7 +62,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>m_button5</cstring>
                     </property>
@@ -80,14 +80,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>m_optionsButton</cstring>
                     </property>
@@ -116,7 +116,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 321aa349..57b63573 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -72,7 +72,7 @@ static TQString nicePrimary( const TQString &primary )
 	else if ( primary == "JAVA" )
 		return i18n( "Java" );
 	else
-		return TQString::null;
+		return TQString();
 }
 
 
@@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde )
 	m_choosenTarget = 0;
         m_makefileHandler = new MakefileHandler();
 
-	TQSplitter *splitter = new TQSplitter(Vertical, this);
+	TQSplitter *splitter = new TQSplitter(Qt::Vertical, this);
 
 	initOverview ( splitter );
 	initDetailview ( splitter );
@@ -101,14 +101,14 @@ AutoProjectWidget::~AutoProjectWidget()
     delete m_makefileHandler;
 }
 
-void AutoProjectWidget::initOverview ( TQWidget* parent )
+void AutoProjectWidget::initOverview ( TQWidget* tqparent )
 {
-	m_subprojectView = new AutoSubprojectView( this, m_part, parent, "project overview widget" );
+	m_subprojectView = new AutoSubprojectView( this, m_part, tqparent, "project overview widget" );
 }
 
-void AutoProjectWidget::initDetailview ( TQWidget* parent )
+void AutoProjectWidget::initDetailview ( TQWidget* tqparent )
 {
-	m_detailView = new AutoDetailsView( this, m_part, parent, "project details widget" );
+	m_detailView = new AutoDetailsView( this, m_part, tqparent, "project details widget" );
 }
 
 void AutoProjectWidget::initActions()
@@ -216,7 +216,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const
 {
 
 	if (!titem)
-		return TQString::null;
+		return TQString();
 
 	kdDebug(9020) << "Looking for target " << titem->name << endl;
 	int prefixLen = m_part->projectDirectory().length() + 1;
@@ -225,7 +225,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const
 	{
 		SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() );
 		kdDebug(9020) << "Checking: " << spitem->path << endl;
-		if (spitem->targets.containsRef(titem))
+		if (spitem->targets.tqcontainsRef(titem))
 		{
 			kdDebug(9020) << "Found it!" << endl;
 			TQString relpath = (spitem->path).mid(prefixLen);
@@ -233,7 +233,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const
 		}
 	}
 	kdDebug(9020) << "Not found" << endl;
-	return TQString::null;
+	return TQString();
 }
 
 TQStringList AutoProjectWidget::allLibraries()
@@ -314,7 +314,7 @@ TQStringList AutoProjectWidget::allFiles()
 TQString AutoProjectWidget::subprojectDirectory()
 {
 	if ( !selectedSubproject() )
-		return TQString::null;
+		return TQString();
 
 	return selectedSubproject()->path;
 }
@@ -387,7 +387,7 @@ TQString AutoProjectWidget::activeDirectory()
 /*		if ( selectedSubproject() )
 			return selectedSubproject()->path;
 		else*/
-			return TQString::null;
+			return TQString();
 	}
 }
 
@@ -405,7 +405,7 @@ void AutoProjectWidget::addFiles( const TQStringList &list )
 
 		for ( it = fileList.begin(); it != fileList.end(); ++it )
 		{
-			int pos = ( *it ).findRev('/');
+			int pos = ( *it ).tqfindRev('/');
 			if (pos != -1)
 				fileName = ( *it ).mid(pos+1);
 			else
@@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
 	// Delete the items from the details view first.
 	if ( m_shownSubproject )
 	{
-		// Remove all TargetItems and all of their children from the view
+		// Remove all TargetItems and all of their tqchildren from the view
 		kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl;
 
 		TQListViewItem* i = m_detailView->listView()->firstChild();
@@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
 	if ( !m_shownSubproject) return;
 	kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()):  " << selectedSubproject()->subdir << endl;
 
-	// Insert all TargetItems and all of their children into the view
+	// Insert all TargetItems and all of their tqchildren into the view
 	TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets );
 	for ( ; it2.current(); ++it2 )
 	{
@@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
 	if ( docgroup )
 		text = i18n( "Documentation data" );
 	else if ( icongroup )
-		text = i18n( "KDE Icon data" ).arg( prefix );
+		text = i18n( "KDE Icon data" ).tqarg( prefix );
 	else
-		text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix );
+		text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix );
 
 	// Workaround because of TQListView not being able to create
 	// items without actually inserting them
@@ -652,7 +652,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
 FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject )
 {
 	bool is_subst;
-	if(name.find("$(") == 0 || name.find("${") == 0)
+	if(name.tqfind("$(") == 0 || name.tqfind("${") == 0)
 		is_subst = true;
 	else
 		is_subst = false;
diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h
index ff79ce71..7d21fd55 100644
--- a/buildtools/autotools/autoprojectwidget.h
+++ b/buildtools/autotools/autoprojectwidget.h
@@ -45,9 +45,10 @@ class KListViewItem;
 class TQListViewItem;
 class MakefileHandler;
 
-class AutoProjectWidget : public QVBox
+class AutoProjectWidget : public TQVBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 	friend class RemoveFileDialog;
 	friend class TargetOptionsDialog;  // to access projectDom() via m_part->projectDom()
 public:
@@ -132,13 +133,13 @@ public:
 	SubprojectItem* selectedSubproject();
 
 	/**
-	* Creates a TargetItem instance without a parent item.
+	* Creates a TargetItem instance without a tqparent item.
 	*/
 	TargetItem *createTargetItem( const TQString &name,
 	                              const TQString &prefix, const TQString &primary,
 	                              bool take = true );
 	/**
-	* Creates a FileItem instance without a parent item.
+	* Creates a FileItem instance without a tqparent item.
 	*/
 	FileItem *createFileItem( const TQString &name, SubprojectItem *subproject );
 
@@ -202,8 +203,8 @@ public slots:
 	void slotOverviewSelectionChanged( TQListViewItem *item );
 
 protected:
-	void initOverview ( TQWidget* parent );
-	void initDetailview ( TQWidget* parent );
+	void initOverview ( TQWidget* tqparent );
+	void initDetailview ( TQWidget* tqparent );
 	void initActions ();
 
 	virtual void focusInEvent( TQFocusEvent *e );
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 9e1f9735..e1d15d90 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************
 */
 
-/** Qt */
+/** TQt */
 #include <tqregexp.h>
 #include <tqcheckbox.h>
 #include <tqstringlist.h>
@@ -60,7 +60,7 @@ namespace AutoProjectPrivate
 
 bool isHeader( const TQString& fileName )
 {
-    return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) );
+    return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).tqcontains( TQFileInfo(fileName).extension(false) );
 }
 
 static TQString cleanWhitespace( const TQString &str )
@@ -81,11 +81,11 @@ static TQString cleanWhitespace( const TQString &str )
 static void removeDir( const TQString& dirName )
 {
     TQDir d( dirName );
-    const QFileInfoList* fileList = d.entryInfoList();
+    const TQFileInfoList* fileList = d.entryInfoList();
     if( !fileList )
 	return;
 
-    QFileInfoListIterator it( *fileList );
+    TQFileInfoListIterator it( *fileList );
     while( it.current() ){
 	const TQFileInfo* fileInfo = it.current();
 	++it;
@@ -107,8 +107,8 @@ static void removeDir( const TQString& dirName )
 }
 
 
-AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name)
-: AutoProjectViewBase(parent, name)
+AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name)
+: AutoProjectViewBase(tqparent, name)
 {
 
 	m_widget = widget;
@@ -116,7 +116,7 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar
 
 	m_listView->setSorting(-1);
 	m_listView->header()->hide();
-	m_listView->addColumn( TQString::null );
+	m_listView->addColumn( TQString() );
 
 	connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
 	         this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) );
@@ -173,7 +173,7 @@ void AutoSubprojectView::initActions()
 	KActionCollection * actions = new KActionCollection( this );
 
 	subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0,
-	                                       this, TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" );
+	                                               TQT_TQOBJECT(this), TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" );
 	subProjectOptionsAction->setWhatsThis(i18n("<qt><b>Options</b><p>Shows subproject options dialog "
 	                                           "that provides settings for compiler, include paths, "
 	                                           "prefixes and build order.</qt>"));
@@ -181,24 +181,24 @@ void AutoSubprojectView::initActions()
 
 	TQToolTip::add( m_button1, tr2i18n( "Add new subproject..."));
 	addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder_new", 0,
-	                                   this, TQT_SLOT( slotAddSubproject() ), actions, "add subproject" );
+	                                           TQT_TQOBJECT(this), TQT_SLOT( slotAddSubproject() ), actions, "add subproject" );
 	addSubprojectAction->setWhatsThis(i18n("<qt><b>Add new subproject</b><p>Creates a new "
 	                                       "subproject in currently selected subproject.</qt>"));
 	addSubprojectAction->plug( m_button1 );
 
 	removeSubprojectAction = new KAction( i18n( "Remove Subproject..." ), "remove_subdir", 0,
-	                                      this, TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" );
+	                                      TQT_TQOBJECT(this), TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" );
 	removeSubprojectAction->setWhatsThis(i18n("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the "
 	                                          "subproject should be also removed from disk. Only subprojects "
 	                                          "which do not hold other subprojects can be removed.</qt>"));
 	addExistingSubprojectAction = new KAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0,
-	                                           this, TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" );
+	                                           TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" );
 	addExistingSubprojectAction->setWhatsThis(i18n("<qt><b>Add existing subprojects</b><p>Imports existing "
 	                                               "subprojects containing Makefile.am.</qt>"));
 
 	TQToolTip::add( m_button2, tr2i18n( "Add Target..."));
 	addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_kdevelop", 0,
-	                               this, TQT_SLOT( slotAddTarget() ), actions, "add target" );
+	                                       TQT_TQOBJECT(this), TQT_SLOT( slotAddTarget() ), actions, "add target" );
 	addTargetAction->setWhatsThis(i18n( "<qt><b>Add target</b><p>Adds a new target to "
 	                                    "the currently selected subproject. Target can be a "
 	                                    "binary program, library, script, also a collection of "
@@ -206,19 +206,19 @@ void AutoSubprojectView::initActions()
 	addTargetAction->plug( m_button2 );
 
 	TQToolTip::add( m_button3, tr2i18n( "Add Service..."));
-	addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, this,
+	addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, TQT_TQOBJECT(this),
 	                                TQT_SLOT( slotAddService() ), actions, "add service" );
 	addServiceAction->setWhatsThis(i18n("<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>"));
 	addServiceAction->plug( m_button3 );
 
 	TQToolTip::add( m_button4, tr2i18n( "Add Application..."));
-	addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, this,
+	addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, TQT_TQOBJECT(this),
 	                                    TQT_SLOT( slotAddApplication() ), actions, "add application" );
 	addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>"));
 	addApplicationAction->plug( m_button4 );
 
 	TQToolTip::add( m_button5, tr2i18n( "Build"));
-	buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this,
+	buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, TQT_TQOBJECT(this),
 	                                     TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" );
 	buildSubprojectAction->setWhatsThis(i18n("<qt><b>Build</b><p>Runs <b>make</b> from the directory of "
 	                                         "the selected subproject.<br> Environment variables and "
@@ -226,11 +226,11 @@ void AutoSubprojectView::initActions()
 	                                         "dialog, <b>Make Options</b> tab.</qt>"));
 	buildSubprojectAction->plug( m_button5 );
 
-	forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, this,
+	forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this),
 	                                           TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" );
 	forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> "
 	                                               "from the directory of the selected subproject.<br>This "
-	                                               "recreates makefile (tip: and solves most of .moc related "
+	                                               "recreates makefile (tip: and solves most of .tqmoc related "
 	                                               "problems)<br>Environment variables and make arguments can "
 	                                               "be specified in the project settings dialog, "
 	                                               "<b>Make Options</b> tab.</qt>"));
@@ -238,21 +238,21 @@ void AutoSubprojectView::initActions()
 	if (!m_part->isKDE())
 		forceReeditSubprojectAction->setEnabled(false);
 
-	cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, this,
+	cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this),
 	                                     TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" );
 	cleanSubprojectAction->setWhatsThis(i18n("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of "
 	                                         "the selected subproject.<br> Environment variables and make "
 	                                         "arguments can be specified in the project settings dialog, "
 	                                         "<b>Make Options</b> tab.</qt>"));
 
-	installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, this,
+	installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, TQT_TQOBJECT(this),
 	                                       TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" );
 	installSubprojectAction->setWhatsThis(i18n("<qt><b>Install</b><p>Runs <b>make install</b> from the directory "
 	                                           "of the selected subproject.<br> Environment variables and "
 	                                           "make arguments can be specified in the project settings "
 	                                           "dialog, <b>Make Options</b> tab.</qt>"));
 	installSuSubprojectAction = new KAction( i18n( "Install (as root user)" ), 0, 0,
-	                                         this, TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" );
+	                                         TQT_TQOBJECT(this), TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" );
 	installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> "
 	                                             "command from the directory of the selected subproject "
 	                                             "with root privileges.<br> It is executed via kdesu "
@@ -260,12 +260,12 @@ void AutoSubprojectView::initActions()
 	                                             "can be specified in the project settings dialog, "
 	                                             "<b>Make Options</b> tab.</qt>"));
 
-	expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, this,
+	expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this),
 	                            TQT_SLOT(slotExpandTree()), actions, "expandAction" );
-	collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, this,
+	collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this),
 	                              TQT_SLOT(slotCollapseTree()), actions, "collapseAction" );
 
-	otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, this,
+	otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this),
 	                           TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" );
 	otherAction->setWhatsThis(i18n("<qt><b>Manage custom commands</b><p>Allows to create, edit and "
 	                               "delete custom build commands which appears in the subproject "
@@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
 	if ( !item )
 		return ;
 
-	KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this );
+	KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this );
 
 	subProjectOptionsAction->plug( &popup );
 	popup.insertSeparator();
@@ -317,7 +317,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
 		}
 		int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int)));
 		m_commandList.append(it.data());
-		popup.setItemParameter(id, m_commandList.findIndex(it.data()));
+		popup.setItemParameter(id, m_commandList.tqfindIndex(it.data()));
 	}
 
 	popup.insertSeparator();
@@ -422,7 +422,7 @@ void AutoSubprojectView::slotBuildSubproject()
 
 	TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() );
 
-	m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) );
+	m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::tqfromLatin1( "" ) );
 }
 
 void AutoSubprojectView::slotRemoveSubproject()
@@ -433,28 +433,28 @@ void AutoSubprojectView::slotRemoveSubproject()
     if( !spitem )
 	return;
 
-    SubprojectItem* parent = static_cast<SubprojectItem*>( spitem->parent() );
-    if( !parent || !parent->listView() || spitem->childCount() != 0 ){
+    SubprojectItem* tqparent = static_cast<SubprojectItem*>( spitem->tqparent() );
+    if( !tqparent || !tqparent->listView() || spitem->childCount() != 0 ){
 	KMessageBox::error( 0, i18n("This item cannot be removed"), i18n("Automake Manager") );
 	return;
     }
 
-    TQStringList list = TQStringList::split( TQRegExp("[ \t]"), parent->variables["SUBDIRS"] );
-    TQStringList::Iterator it = list.find( spitem->subdir );
+    TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] );
+    TQStringList::Iterator it = list.tqfind( spitem->subdir );
     TQString subdirToRemove = spitem->subdir;
     bool topsubdirs = true;
-    if ((parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1)
-        && (parent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1))
+    if ((tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") == -1)
+        && (tqparent->variables["SUBDIRS"].tqfind("$(AUTODIRS)") == -1))
     {
         topsubdirs = false;
         if( it == list.end() ){
-            KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir));
+            KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir));
             return;
         }
     }
 
-    RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)),
-        i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0)));
+    RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)),
+        i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0)));
     if( dlg.exec() ){
 
     bool removeSources = dlg.removeFromDisk();
@@ -462,11 +462,11 @@ void AutoSubprojectView::slotRemoveSubproject()
     if (!topsubdirs)
     {
     list.remove( it );
-    parent->variables[ "SUBDIRS" ] = list.join( " " );
+    tqparent->variables[ "SUBDIRS" ] = list.join( " " );
     }
 
-    parent->listView()->setSelected( parent, true );
-    kapp->processEvents( 500 );
+    tqparent->listView()->setSelected( tqparent, true );
+    kapp->tqprocessEvents( 500 );
 
 
     if( removeSources ){
@@ -483,7 +483,7 @@ void AutoSubprojectView::slotRemoveSubproject()
 
         TQString projroot = m_part->projectDirectory() + "/";
         TQString subdirectory = spitem->path;
-        TQString relpath = subdirectory.replace(0, projroot.length(),"");
+        TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
 
         TQString configureFile = m_part->getAutoConfFile(projroot);
 
@@ -511,9 +511,9 @@ void AutoSubprojectView::slotRemoveSubproject()
 
     // Adjust SUBDIRS variable in containing Makefile.am
 
-    if (parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
+    if (tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
     {
-        TQFile subdirsfile( parent->path + "/subdirs" );
+        TQFile subdirsfile( tqparent->path + "/subdirs" );
         TQStringList topdirs;
         if ( subdirsfile.open( IO_ReadOnly ) )
         {
@@ -534,9 +534,9 @@ void AutoSubprojectView::slotRemoveSubproject()
 
 	TQMap<TQString,TQString> replaceMap;
 	    replaceMap.insert( "SUBDIRS", subdirToRemove );
-	AutoProjectTool::removeFromMakefileam( parent->path + "/Makefile.am", replaceMap );
+	AutoProjectTool::removeFromMakefileam( tqparent->path + "/Makefile.am", replaceMap );
 
-	TQString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 );
+	TQString relmakefile = ( tqparent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 );
 	kdDebug(9020) << "Relative makefile path: " << relmakefile << endl;
 
     // check for config.status
@@ -563,7 +563,7 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item,
 {
 	// Parse line foo_bar = bla bla
 
-	int pos = lhs.findRev( '_' );
+	int pos = lhs.tqfindRev( '_' );
 	TQString prefix = lhs.left( pos );
 	TQString primary = lhs.right( lhs.length() - pos - 1 );
 	//    kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl;
@@ -707,7 +707,7 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item,
 {
 	// Parse a line foo_ICON = bla bla
 
-	int pos = lhs.find( "_ICON" );
+	int pos = lhs.tqfind( "_ICON" );
 	TQString prefix = lhs.left( pos );
 	if ( prefix == "KDE" )
 		prefix = "kde_icon";
@@ -766,7 +766,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
 	// Take care of KDE hacks:
 	// TOPSUBDIRS is an alias for all directories
 	// listed in the subdirs file
-	if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 )
+	if ( subdirs.tqfind( "$(TOPSUBDIRS)" ) != -1 )
 	{
 		TQStringList dirs;
 		TQFile subdirsfile( item->path + "/subdirs" );
@@ -795,18 +795,18 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
             }
 
         }
-		subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) );
+		subdirs.tqreplace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) );
 	}
 
 	// AUTODIRS is an alias for all subdirectories
-	if ( subdirs.find( "$(AUTODIRS)" ) != -1 )
+	if ( subdirs.tqfind( "$(AUTODIRS)" ) != -1 )
 	{
 		TQDir d( item->path );
 		TQStringList dirs = d.entryList( TQDir::Dirs );
 		dirs.remove( "." );
 		dirs.remove( ".." );
 		dirs.remove( "CVS" );
-		subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) );
+		subdirs.tqreplace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) );
 	}
 
 	// If there are any variables in the subdirs line then search
@@ -822,7 +822,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
 		// Search the whole Makefile(.am?)
 		// Note that if the variable isn't found it just disappears
 		// (Perhaps we should add it back in this case?)
-		TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname );
+		TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname );
 		if ( varit != item->variables.end() )
 		{
 			kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl;
@@ -832,7 +832,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
 		{
 			kdDebug( 9020 ) << "Not found Makefile var " << varname << endl;
 		}
-		subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue );
+		subdirs.tqreplace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue );
 	}
 
 	//search for AC_SUBST variables and try to replace them with variables
@@ -847,7 +847,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
 		// Search the whole Makefile(.am?)
 		// Note that if the variable isn't found it just disappears
 		// (Perhaps we should add it back in this case?)
-		TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname );
+		TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname );
 		if ( varit != item->variables.end() )
 		{
 			kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl;
@@ -857,7 +857,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
 		{
 			kdDebug( 9020 ) << "Not found Makefile var " << varname << endl;
 		}
-		subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue );
+		subdirs.tqreplace( TQRegExp( "\\@" + varname + "\\@" ), varvalue );
 	}
 
 	TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs );
@@ -879,14 +879,14 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
 			open = false;
 		if ( newitem->subdir == "pics" )
 			open = false;
-		if ( newitem && static_cast<SubprojectItem*>( newitem->parent() )
+		if ( newitem && static_cast<SubprojectItem*>( newitem->tqparent() )
 		        ->subdir == "doc" )
 			open = false;
 		if ( newitem && static_cast<SubprojectItem*>
-		        ( newitem->parent() ) ->subdir == "po" )
+		        ( newitem->tqparent() ) ->subdir == "po" )
 			open = false;
 		if ( newitem && static_cast<SubprojectItem*>
-		        ( newitem->parent() ) ->subdir == "pics" )
+		        ( newitem->tqparent() ) ->subdir == "pics" )
 			open = false;
 		newitem->setOpen( open );
 
@@ -914,7 +914,7 @@ void AutoSubprojectView::parse( SubprojectItem *item )
 			parseKDEDOCS( item, lhs, rhs );
 		else if ( lhs.right( 5 ) == "_ICON" )
 			parseKDEICON( item, lhs, rhs );
-		else if ( lhs.find( '_' ) > 0 )
+		else if ( lhs.tqfind( '_' ) > 0 )
 			parsePrimary( item, lhs, rhs );
 		else if ( lhs.right( 3 ) == "dir" )
 			parsePrefix( item, lhs, rhs );
@@ -937,7 +937,7 @@ void AutoSubprojectView::parse( SubprojectItem *item )
 	    TQString fname = *fileIt;
 	    ++fileIt;
 
-	    if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){
+	    if( AutoProjectPrivate::isHeader(fname) && !headers.tqcontains(fname) ){
 	        FileItem *fitem = m_widget->createFileItem( fname, item );
 	        noinst_HEADERS_item->sources.append( fitem );
 	    }
@@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( )
 		{
 			config->writeEntry(widget->commandsTable->text(i, 0),
 				widget->commandsTable->text(i, 1)+":::"+
-				TQString("%1").arg(static_cast<TQComboTableItem*>(widget->
+				TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget->
 				commandsTable->item(i, 2))->currentItem()));
 		}
 		config->sync();
diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h
index 81c772dc..f7a6b6e6 100644
--- a/buildtools/autotools/autosubprojectview.h
+++ b/buildtools/autotools/autosubprojectview.h
@@ -41,9 +41,10 @@ namespace AutoProjectPrivate
 class AutoSubprojectView : public AutoProjectViewBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name );
+	AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name );
 	virtual ~AutoSubprojectView();
 
 public:
diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp
index b5191b37..2d336c9b 100644
--- a/buildtools/autotools/autotoolsaction.cpp
+++ b/buildtools/autotools/autotoolsaction.cpp
@@ -26,73 +26,73 @@ AutoToolsAction::~AutoToolsAction()
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut,
                                   const TQObject* receiver, const char* slot,
-                                  KActionCollection* parent, const char* name )
-: KAction( text, cut, receiver, slot, parent, name )
+                                  KActionCollection* tqparent, const char* name )
+: KAction( text, cut, receiver, slot, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
                                   const TQObject* receiver, const char* slot,
-                                  KActionCollection* parent, const char* name )
-: KAction( text, pix, cut, receiver, slot, parent, name )
+                                  KActionCollection* tqparent, const char* name )
+: KAction( text, pix, cut, receiver, slot, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut,
                                   const TQObject* receiver, const char* slot,
-                                  KActionCollection* parent, const char* name )
-: KAction( text, pix, cut, receiver, slot, parent, name )
+                                  KActionCollection* tqparent, const char* name )
+: KAction( text, pix, cut, receiver, slot, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut,
                                   const TQObject* receiver, const char* slot,
-                                  KActionCollection* parent, const char* name )
-: KAction( item, cut, receiver, slot, parent, name )
+                                  KActionCollection* tqparent, const char* name )
+: KAction( item, cut, receiver, slot, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut,
-                                  TQObject* parent, const char* name )
-: KAction( text, cut, parent, name )
+                                  TQObject* tqparent, const char* name )
+: KAction( text, cut, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut,
                                   const TQObject* receiver, const char* slot,
-                                  TQObject* parent, const char* name )
-: KAction( text, cut, receiver, slot, parent, name )
+                                  TQObject* tqparent, const char* name )
+: KAction( text, cut, receiver, slot, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix,
-                                  const KShortcut& cut, TQObject* parent, const char* name )
-: KAction( text, pix, cut, parent, name )
+                                  const KShortcut& cut, TQObject* tqparent, const char* name )
+: KAction( text, pix, cut, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix,
-                                  const KShortcut& cut, TQObject* parent, const char* name )
-: KAction( text, pix, cut, parent, name )
+                                  const KShortcut& cut, TQObject* tqparent, const char* name )
+: KAction( text, pix, cut, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix,
                                   const KShortcut& cut, const TQObject* receiver,
-                                  const char* slot, TQObject* parent, const char * name )
-: KAction( text, pix, cut, receiver, slot, parent, name )
+                                  const char* slot, TQObject* tqparent, const char * name )
+: KAction( text, pix, cut, receiver, slot, tqparent, name )
 {
 }
 
 AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix,
                                   const KShortcut & cut, const TQObject* receiver,
-                                  const char* slot, TQObject* parent, const char * name )
-: KAction( text, pix, cut, receiver, slot, parent, name )
+                                  const char* slot, TQObject* tqparent, const char * name )
+: KAction( text, pix, cut, receiver, slot, tqparent, name )
 {
 }
 
-AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name )
-: KAction( parent, name )
+AutoToolsAction::AutoToolsAction( TQObject * tqparent, const char * name )
+: KAction( tqparent, name )
 {
 }
 
@@ -107,7 +107,7 @@ int AutoToolsAction::plug( TQWidget* w, int index )
 	if (kapp && !kapp->authorizeKAction(name()))
 		return -1;
 	
-	if ( ::qt_cast<TQToolButton*>( w ) )
+	if ( ::tqqt_cast<TQToolButton*>( w ) )
 	{
 		TQToolButton* tb = static_cast<TQToolButton*>( w );
 		connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) );
@@ -145,7 +145,7 @@ void AutoToolsAction::updateEnabled( int i )
 {
 	TQWidget* w = container( i );
 	
-	if ( ::qt_cast<TQToolButton*>( w ) )
+	if ( ::tqqt_cast<TQToolButton*>( w ) )
 		static_cast<TQToolButton*>( w )->setEnabled( isEnabled() );
 	else
 		KAction::updateEnabled( i ) ;
diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h
index 574b20b1..990102f1 100644
--- a/buildtools/autotools/autotoolsaction.h
+++ b/buildtools/autotools/autotoolsaction.h
@@ -21,7 +21,7 @@ class TQObject;
 class KActionCollection;
 
 /**
- * A KAction derivative that will work with the QToolButtons used in
+ * A KAction derivative that will work with the TQToolButtons used in
  * the Automake Manager
  * @author Matt Rogers
  */
@@ -32,33 +32,33 @@ public:
 
 	AutoToolsAction( const TQString& text, const KShortcut& cut,
 	                 const TQObject* receiver, const char* slot,
-	                 KActionCollection* parent, const char* name );
+	                 KActionCollection* tqparent, const char* name );
 
 	AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
 	                 const TQObject* receiver, const char* slot,
-	                 KActionCollection* parent, const char* name );
+	                 KActionCollection* tqparent, const char* name );
 
 	AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut,
 	                 const TQObject* receiver, const char* slot,
-	                 KActionCollection* parent, const char* name );
+	                 KActionCollection* tqparent, const char* name );
 
 	AutoToolsAction( const KGuiItem& item, const KShortcut& cut,
 	                 const TQObject* receiver, const char* slot,
-	                 KActionCollection* parent, const char* name );
+	                 KActionCollection* tqparent, const char* name );
 
-	AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
+	AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 );
 	AutoToolsAction( const TQString& text, const KShortcut& cut,
-	                 const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
+	                 const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
 	AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
-	                 TQObject* parent = 0, const char* name = 0 );
+	                 TQObject* tqparent = 0, const char* name = 0 );
 	AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
-	                 TQObject* parent = 0, const char* name = 0 );
+	                 TQObject* tqparent = 0, const char* name = 0 );
 	AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
-	                 const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
+	                 const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
 	AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut,
-	                 const TQObject* receiver, const char* slot, TQObject* parent,
+	                 const TQObject* receiver, const char* slot, TQObject* tqparent,
 	                 const char* name = 0 );
-	AutoToolsAction( TQObject* parent = 0, const char* name = 0 );
+	AutoToolsAction( TQObject* tqparent = 0, const char* name = 0 );
 
 	virtual int plug( TQWidget *widget, int index = -1 );
 
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index 4ffc326b..d09f0a7b 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -58,12 +58,12 @@ public:
 };
 
 ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectPart* part,
-                                         TQStringList fileList, TQWidget* parent, const char* name )
-: KDialogBase( parent, name, false, i18n("Automake Manager - Choose Target"),
+                                         TQStringList fileList, TQWidget* tqparent, const char* name )
+: KDialogBase( tqparent, name, false, i18n("Automake Manager - Choose Target"),
                Ok | Cancel, KDialogBase::Ok, true /* seperator */ )
 
 {
-	Q_UNUSED( parent );
+	Q_UNUSED( tqparent );
 	Q_UNUSED( name );
 	d = new ChooseTargetDialog::Private;
 	d->widget = widget;
@@ -76,7 +76,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP
 	d->baseUI->subprojectComboBox->setAutoCompletion( true );
 	d->baseUI->targetComboBox->setAutoCompletion( true );
 	d->baseUI->newFileList->header()->hide();
-	d->baseUI->newFileList->addColumn( TQString::null );
+	d->baseUI->newFileList->addColumn( TQString() );
 	d->baseUI->newFileList->setSorting(-1);
 
 	setIcon ( SmallIcon ( "target_kdevelop" ) );
@@ -128,7 +128,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP
 
 	for ( it = fileList.begin(); it != fileList.end(); ++it )
 	{
-		int pos = ( *it ).findRev('/');
+		int pos = ( *it ).tqfindRev('/');
 		if (pos != -1)
 			fileName = ( *it ).mid(pos+1);
 		else
@@ -246,7 +246,7 @@ void ChooseTargetDialog::slotOk()
 	{
 		bool found = false;
 
-		int pos = ( *it ).findRev('/');
+		int pos = ( *it ).tqfindRev('/');
 		if (pos != -1)
 		{
 			directory = ( *it ).left(pos);
diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h
index 7ca7a3f4..d1ebdab6 100644
--- a/buildtools/autotools/choosetargetdialog.h
+++ b/buildtools/autotools/choosetargetdialog.h
@@ -29,9 +29,10 @@ class TQWidget;
 class ChooseTargetDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part,
-	                    TQStringList fileList, TQWidget* parent = 0,
+	                    TQStringList fileList, TQWidget* tqparent = 0,
 	                    const char* name = 0 );
 	~ChooseTargetDialog();
 
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index 3581e595..f41433cd 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ChooseTargetDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ChooseTargetDlgBase</cstring>
     </property>
@@ -12,7 +12,7 @@
             <height>306</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>444</width>
             <height>306</height>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>activeTargetRadioButton</cstring>
                     </property>
@@ -62,7 +62,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>chooseTargetRadioButton</cstring>
                     </property>
@@ -72,7 +72,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>chosenTargetGroupBox</cstring>
             </property>
@@ -102,7 +102,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>targetStaticLabel</cstring>
                     </property>
@@ -114,7 +114,7 @@
                         <string>Target:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="1">
+                <widget class="TQLabel" row="2" column="1">
                     <property name="name">
                         <cstring>chosenTargetLabel</cstring>
                     </property>
@@ -132,7 +132,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -151,20 +151,20 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>cancelNoticeLabel</cstring>
                     </property>
                     <property name="text">
                         <string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; If you cancel, your files will be created but will &lt;b&gt;not&lt;/b&gt; be added to the project.&lt;/qt&gt;</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>neverAskAgainCheckbox</cstring>
             </property>
@@ -205,13 +205,13 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotActiveTargetToggled(bool)</slot>
     <slot access="protected">slotChooseTargetToggled(bool)</slot>
     <slot access="private">slotSubprojectChanged(const QString&amp;)</slot>
     <slot access="private">slotTargetChanged(const QString&amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 0be8903b..1e877a5c 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -51,7 +51,7 @@ public:
     static TQString currentText(TQComboBox *combo, const TQStringList &names)
     {
         if (combo->currentItem() == -1)
-            return TQString::null;
+            return TQString();
         return names[combo->currentItem()];
     }
     static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names)
@@ -69,10 +69,10 @@ public:
 };
 
 
-ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name)
-    : ConfigureOptionsWidgetBase(parent, name)
+ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *tqparent, const char *name)
+    : ConfigureOptionsWidgetBase(tqparent, name)
 {
-    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
 
     m_part = part;
     env_groupBox->setColumnLayout( 1, Qt::Vertical );
@@ -98,7 +98,7 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *
     config_combo->insertStringList(allConfigs);
 
     dirty = false;
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged(part->currentBuildConfig());
 
     fixLayout();
@@ -111,20 +111,20 @@ ConfigureOptionsWidget::~ConfigureOptionsWidget()
 
 void ConfigureOptionsWidget::fixLayout()
 {
-    int w1 = ccompiler_label->sizeHint().width();
-    int w2 = cbinary_label->sizeHint().width();
-    int w3 = cflags_label->sizeHint().width();
-    int w4 = cxxcompiler_label->sizeHint().width();
-    int w5 = cxxbinary_label->sizeHint().width();
-    int w6 = cxxflags_label->sizeHint().width();
-    int w7 = f77compiler_label->sizeHint().width();
-    int w8 = f77binary_label->sizeHint().width();
-    int w9 = f77flags_label->sizeHint().width();
-
-    int w = QMAX(w1, QMAX(w2, w3));
-    w = QMAX(w, QMAX(w4, w5));
-    w = QMAX(w, QMAX(w6, w7));
-    w = QMAX(w, QMAX(w8, w9));
+    int w1 = ccompiler_label->tqsizeHint().width();
+    int w2 = cbinary_label->tqsizeHint().width();
+    int w3 = cflags_label->tqsizeHint().width();
+    int w4 = cxxcompiler_label->tqsizeHint().width();
+    int w5 = cxxbinary_label->tqsizeHint().width();
+    int w6 = cxxflags_label->tqsizeHint().width();
+    int w7 = f77compiler_label->tqsizeHint().width();
+    int w8 = f77binary_label->tqsizeHint().width();
+    int w9 = f77flags_label->tqsizeHint().width();
+
+    int w = TQMAX(w1, TQMAX(w2, w3));
+    w = TQMAX(w, TQMAX(w4, w5));
+    w = TQMAX(w, TQMAX(w6, w7));
+    w = TQMAX(w, TQMAX(w8, w9));
 
     ccompiler_label->setMinimumWidth(w);
     cxxcompiler_label->setMinimumWidth(w);
@@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config)
     DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text());
     DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text());
 
-    if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
+    if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
         TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure()));
 
 }
@@ -267,8 +267,8 @@ void ConfigureOptionsWidget::topsourcedirClicked()
 
 void ConfigureOptionsWidget::configComboTextChanged(const TQString &config)
 {
-    bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
-    bool canRemove = allConfigs.contains(config) && config != "default";
+    bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
+    bool canRemove = allConfigs.tqcontains(config) && config != "default";
     addconfig_button->setEnabled(canAdd);
     removeconfig_button->setEnabled(canRemove);
 }
@@ -276,7 +276,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const TQString &config)
 
 void ConfigureOptionsWidget::configChanged(const TQString &config)
 {
-    if (config == currentConfig || !allConfigs.contains(config))
+    if (config == currentConfig || !allConfigs.tqcontains(config))
         return;
 
     if (!currentConfig.isNull() && dirty)
@@ -317,7 +317,7 @@ void ConfigureOptionsWidget::configRemoved()
     config_combo->clear();
     config_combo->insertStringList(allConfigs);
 
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged("default");
 }
 
@@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
+                                   "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage));
         exit(1);
     }
 
@@ -405,7 +405,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
-    TQObject *obj = factory->create(this, service->name().latin1(),
+    TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(),
                                    "KDevCompilerOptions", args);
 
     if (!obj->inherits("KDevCompilerOptions")) {
diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h
index 9272b3f2..fd8afade 100644
--- a/buildtools/autotools/configureoptionswidget.h
+++ b/buildtools/autotools/configureoptionswidget.h
@@ -25,9 +25,10 @@ class EnvironmentVariablesWidget;
 class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 );
+	ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 );
 	~ConfigureOptionsWidget();
 
 public slots:
diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui
index 0eb47ac7..c8374366 100644
--- a/buildtools/autotools/configureoptionswidgetbase.ui
+++ b/buildtools/autotools/configureoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigureOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>configure_options_widget</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>config_label</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <cstring>config_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>config_combo</cstring>
                     </property>
@@ -81,14 +81,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>8</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addconfig_button</cstring>
                     </property>
@@ -99,7 +99,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeconfig_button</cstring>
                     </property>
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -129,11 +129,11 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabwidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>general_tab</cstring>
                 </property>
@@ -155,7 +155,7 @@
                             <string>Options to pass to configure, e.g. --prefix=&lt;install dir&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="5">
+                    <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>builddir_label</cstring>
                         </property>
@@ -176,14 +176,14 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>topsourcedir_label</cstring>
                         </property>
@@ -229,17 +229,17 @@ building in the project directory, you
 probably want this to be blank.</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="4" column="4">
+                    <widget class="TQPushButton" row="4" column="4">
                         <property name="name">
                             <cstring>builddir_button</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>30</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -259,24 +259,24 @@ probably want this to be blank.</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="6" column="4">
+                    <widget class="TQPushButton" row="6" column="4">
                         <property name="name">
                             <cstring>topsourcedir_button</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>30</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -313,14 +313,14 @@ then it is relative to the project directory.
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="10" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>ldflags_label</cstring>
                         </property>
@@ -345,7 +345,7 @@ nonstandard directory &lt;lib dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -388,14 +388,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>cppflags_label</cstring>
                         </property>
@@ -410,7 +410,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
 headers in a nonstandard directory &lt;include dir&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5">
+                    <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>configargs_label</cstring>
                         </property>
@@ -421,7 +421,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>configargs_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="12" column="0" rowspan="1" colspan="5">
+                    <widget class="TQGroupBox" row="12" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>env_groupBox</cstring>
                         </property>
@@ -444,7 +444,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>c_tab</cstring>
                 </property>
@@ -455,7 +455,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>ccompiler_label</cstring>
                         </property>
@@ -466,7 +466,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>cservice_combo</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="0" column="1">
+                    <widget class="TQComboBox" row="0" column="1">
                         <property name="name">
                             <cstring>cservice_combo</cstring>
                         </property>
@@ -481,14 +481,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>cflags_label</cstring>
                         </property>
@@ -504,7 +504,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>cflags_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="4" column="2">
+                    <widget class="TQPushButton" row="4" column="2">
                         <property name="name">
                             <cstring>cflags_button</cstring>
                         </property>
@@ -516,7 +516,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -536,14 +536,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>168</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>cbinary_label</cstring>
                         </property>
@@ -569,7 +569,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -578,7 +578,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>cxx_tab</cstring>
                 </property>
@@ -589,7 +589,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>cxxcompiler_label</cstring>
                         </property>
@@ -600,7 +600,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>cxxservice_combo</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="0" column="1">
+                    <widget class="TQComboBox" row="0" column="1">
                         <property name="name">
                             <cstring>cxxservice_combo</cstring>
                         </property>
@@ -615,14 +615,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>cxxbinary_label</cstring>
                         </property>
@@ -648,14 +648,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>cxxflags_label</cstring>
                         </property>
@@ -671,7 +671,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>cxxflags_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="4" column="2">
+                    <widget class="TQPushButton" row="4" column="2">
                         <property name="name">
                             <cstring>cxxflags_button</cstring>
                         </property>
@@ -683,7 +683,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -703,7 +703,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -712,7 +712,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>fortran_tab</cstring>
                 </property>
@@ -723,7 +723,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>f77compiler_label</cstring>
                         </property>
@@ -734,7 +734,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>f77service_combo</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="0" column="1">
+                    <widget class="TQComboBox" row="0" column="1">
                         <property name="name">
                             <cstring>f77service_combo</cstring>
                         </property>
@@ -749,14 +749,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>f77binary_label</cstring>
                         </property>
@@ -782,14 +782,14 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>f77flags_label</cstring>
                         </property>
@@ -805,7 +805,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                             <cstring>f77flags_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="4" column="2">
+                    <widget class="TQPushButton" row="4" column="2">
                         <property name="name">
                             <cstring>f77flags_button</cstring>
                         </property>
@@ -817,7 +817,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -837,7 +837,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -1017,7 +1017,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">builddirClicked()</slot>
     <slot access="protected">cflagsClicked()</slot>
     <slot access="protected">configAdded()</slot>
@@ -1031,9 +1031,9 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
     <slot access="protected">f77serviceChanged()</slot>
     <slot access="protected">setDirty()</slot>
     <slot access="protected">topsourcedirClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index 2235f357..f67d9295 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -48,20 +48,20 @@
 #include "kfilednddetailview.h"
 #include "kfiledndiconview.h"
 
-KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name )
+KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* tqparent, const char* name ) : KDirOperator ( urlName, tqparent, name )
 {
 
 }
 
-KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view )
+KFileView* KDnDDirOperator::createView( TQWidget* tqparent, KFile::FileView view )
 {
     KFileView* new_view = 0L;
 
     if( (view & KFile::Detail) == KFile::Detail ) {
-        new_view = new KFileDnDDetailView( parent, "detail view");
+        new_view = new KFileDnDDetailView( tqparent, "detail view");
     }
     else if ((view & KFile::Simple) == KFile::Simple ) {
-        new_view = new KFileDnDIconView( parent, "simple view");
+        new_view = new KFileDnDIconView( tqparent, "simple view");
         new_view->setViewName( i18n("Short View") );
     }
 
@@ -69,11 +69,11 @@ KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view )
 }
 
 
-FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* parent, const char* name ) : TQWidget(parent, name)
+FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* tqparent, const char* name ) : TQWidget(tqparent, name)
 {
     m_part = part;
 
-	// widgets and layout
+	// widgets and tqlayout
 	TQVBoxLayout* lo = new TQVBoxLayout(this);
 
 	TQHBox *hlow = new TQHBox (this);
@@ -98,7 +98,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 	hlow->setMaximumHeight(up->height());
 
 	cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-	cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+	cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 	KURLCompletion* cmpl = new KURLCompletion();
 	cmbPath->setCompletionObject( cmpl );
 	lo->addWidget(cmbPath);
@@ -114,7 +114,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 	filterIcon = new TQLabel(filterBox);
 	filterIcon->setPixmap( BarIcon("filter") );
 	filter = new KHistoryCombo(filterBox, "filter");
-	filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+	filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 	filterBox->setStretchFactor(filter, 2);
 	lo->addWidget(filterBox);
 
@@ -148,7 +148,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
     {
         if (groupEl.tagName() == "group")
         {
-            list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")";
+            list << groupEl.attribute("pattern").tqreplace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")";
         }
         groupEl = groupEl.nextSibling().toElement();
     }
diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h
index 636cec87..187348fa 100644
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@@ -40,20 +40,22 @@ class KFile;
 class KDnDDirOperator : public KDirOperator
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *parent = 0, const char* name = 0 );
+	KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *tqparent = 0, const char* name = 0 );
 
 protected:
-	virtual KFileView* createView( TQWidget* parent, KFile::FileView view );
+	virtual KFileView* createView( TQWidget* tqparent, KFile::FileView view );
 };
 
-class FileSelectorWidget : public QWidget
+class FileSelectorWidget : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* parent = 0, const char* name = 0 );
+	FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* tqparent = 0, const char* name = 0 );
 	~FileSelectorWidget();
 
 	KDnDDirOperator * dirOperator()
diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp
index 098d975f..d98e7a81 100644
--- a/buildtools/autotools/kfilednddetailview.cpp
+++ b/buildtools/autotools/kfilednddetailview.cpp
@@ -16,7 +16,7 @@
 ***************************************************************************/
 
 //////////////////////////////////////////////////////
-// Qt specific includes
+// TQt specific includes
 #include <tqptrlist.h>
 #include <tqapplication.h>
 //////////////////////////////////////////////////////
@@ -33,8 +33,8 @@
 	static int autoOpenTime = 750;
 #endif
 //-----------------------------------------------
-KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name )
-	:	KFileDetailView(parent,name), m_autoOpenTimer( this ),
+KFileDnDDetailView::KFileDnDDetailView(TQWidget *tqparent, const char *name )
+	:	KFileDetailView(tqparent,name), m_autoOpenTimer( this ),
 		m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ),
 		m_dropItem(0), m_dndEnabled( true )
 {
@@ -207,6 +207,6 @@ void KFileDnDDetailView::setDnDEnabled( bool useDnD ){
 	viewport()->setAcceptDrops( useDnD );
 }
 //-----------------------------------------------
-#ifndef NO_INCLUDE_MOCFILES
+#ifndef NO_INCLUDE_TQMOCFILES
 #include "kfilednddetailview.moc"
 #endif
diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h
index 0cf13f7e..762d6921 100644
--- a/buildtools/autotools/kfilednddetailview.h
+++ b/buildtools/autotools/kfilednddetailview.h
@@ -19,7 +19,7 @@
 #define KFILEDNDDETAILVIEW_H
 
 //////////////////////////////////////////////////////////////////////
-// Qt specific include files
+// TQt specific include files
 #include <tqwidget.h>
 #include <tqtimer.h> 
 //////////////////////////////////////////////////////////////////////
@@ -40,9 +40,10 @@
 class KFileDnDDetailView : public KFileDetailView
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	/**  */
-	KFileDnDDetailView( TQWidget *parent = 0, const char *name = 0 );
+	KFileDnDDetailView( TQWidget *tqparent = 0, const char *name = 0 );
 	/**  */
 	virtual ~KFileDnDDetailView();
 	/**
@@ -78,9 +79,9 @@ public:
 		return m_useAutoOpenTimer;
 	}
 	/** */
-	virtual void readConfig( KConfig*, const TQString& group = TQString::null );
+	virtual void readConfig( KConfig*, const TQString& group = TQString() );
 	/** */
-	virtual void writeConfig( KConfig*, const TQString& group = TQString::null );
+	virtual void writeConfig( KConfig*, const TQString& group = TQString() );
 signals:  // Signals
 	/**
 	* Emitted whenever an decodable item is dropped in the view.
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index 1a491c62..d230eee7 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -2,7 +2,7 @@
 *                        kfiledndiconview.cpp  -  description
 *                           -------------------
 *  begin                : Wed Nov 1 2000
-*  copyright            : (C) 2000 by Björn Sahlström
+*  copyright            : (C) 2000 by Bj�rn Sahlstr�m
 *  email                : kbjorn@users.sourceforge.net
 ***************************************************************************/
 
@@ -16,7 +16,7 @@
 ***************************************************************************/
 
 //////////////////////////////////////////////////////
-// Qt specific includes
+// TQt specific includes
 #include <tqptrlist.h>
 #include <tqapplication.h>
 //////////////////////////////////////////////////////
@@ -33,8 +33,8 @@
 	static int autoOpenTime = 750;
 #endif
 //-----------------------------------------------
-KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name )
-	: KFileIconView(parent,name), m_autoOpenTimer( this ),
+KFileDnDIconView::KFileDnDIconView( TQWidget *tqparent, const char *name )
+	: KFileIconView(tqparent,name), m_autoOpenTimer( this ),
 		m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ),
 		m_dropItem(0), m_dndEnabled( true )
 {
@@ -84,7 +84,7 @@ void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) {
 		return;
 	}
 	e->acceptAction();     // Yes
-	TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) );
+	TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) );
 	if ( i && m_useAutoOpenTimer) {  // are we over an item ?
 		m_dropItem = i;  // set new m_dropItem
 		m_autoOpenTimer.start( m_autoOpenTime ); // restart timer
@@ -97,7 +97,7 @@ void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) {
 		return;
 	}
 	e->acceptAction();     // Yes
-	TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) );
+	TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) );
 	if( ! m_useAutoOpenTimer )
 		return;
 	if ( i ) {  // are we over an item ?
@@ -189,6 +189,6 @@ bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const {
 				|| e->action() == TQDropEvent::Link );
 }
 //-----------------------------------------------
-#ifndef NO_INCLUDE_MOCFILES
+#ifndef NO_INCLUDE_TQMOCFILES
 #include "kfiledndiconview.moc"
 #endif
diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h
index e2b3402e..e58062b3 100644
--- a/buildtools/autotools/kfiledndiconview.h
+++ b/buildtools/autotools/kfiledndiconview.h
@@ -35,9 +35,10 @@
 class KFileDnDIconView : public KFileIconView
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:  // Public methods
 
-	KFileDnDIconView( TQWidget *parent = 0, const char *name = 0 );
+	KFileDnDIconView( TQWidget *tqparent = 0, const char *name = 0 );
 	virtual ~KFileDnDIconView();
 	
 	/**
@@ -77,8 +78,8 @@ public:  // Public methods
 		return m_useAutoOpenTimer;
 	}
 
-	virtual void readConfig( KConfig*, const TQString& group = TQString::null );
-	virtual void writeConfig( KConfig*, const TQString& group = TQString::null );
+	virtual void readConfig( KConfig*, const TQString& group = TQString() );
+	virtual void writeConfig( KConfig*, const TQString& group = TQString() );
 signals:
 	
 	/**
@@ -101,7 +102,7 @@ protected:
 	
 	/**
 	 * Creates a @ref TQDragObject containing all urls of the selected @ref KFileItem of the view,
-	 * @returns the @ref QDragObject
+	 * @returns the @ref TQDragObject
 	 */
 	virtual TQDragObject* dragObject();
 	
diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp
index 3634886a..87c0d19f 100644
--- a/buildtools/autotools/kimporticonview.cpp
+++ b/buildtools/autotools/kimporticonview.cpp
@@ -26,8 +26,8 @@
 #include "kimporticonview.h"
 
 
-KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *parent, const char *name)
-  : KFileDnDIconView(parent, name)
+KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *tqparent, const char *name)
+  : KFileDnDIconView(tqparent, name)
 {
 	m_strIntro = strIntro;
 	m_bDropped = false;
diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h
index 3cfd5745..c0674eb7 100644
--- a/buildtools/autotools/kimporticonview.h
+++ b/buildtools/autotools/kimporticonview.h
@@ -24,9 +24,10 @@
 class KImportIconView : public KFileDnDIconView
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KImportIconView( const TQString& strIntro, TQWidget *parent, const char *name );
+	KImportIconView( const TQString& strIntro, TQWidget *tqparent, const char *name );
 	virtual ~KImportIconView();
 
 	void somethingDropped ( bool dropped );
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index db30508d..ef2354f1 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
 
     if ( recursive && ast && ast->hasChildren() )
     {
-        TQValueList<AutoTools::AST*> astChildList = ast->children();
+        TQValueList<AutoTools::AST*> astChildList = ast->tqchildren();
         TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
         for ( ; it != clEnd; ++it )
         {
@@ -122,7 +122,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
 
 AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath )
 {
-    if ( d->folderToFileMap.contains( folderPath ) )
+    if ( d->folderToFileMap.tqcontains( folderPath ) )
     {
         TQString filePath = d->folderToFileMap[folderPath];
         return d->projects[filePath];
@@ -145,14 +145,14 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
         return variable;
 
     kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl;
-    ASTList childList = ast->children();
+    ASTList childList = ast->tqchildren();
     ASTList::iterator it( childList.begin() ), clEnd( childList.end() );
     for ( ; it != clEnd; ++it )
     {
         if ( ( *it )->nodeType() == AutoTools::AST::AssignmentAST )
         {
             AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( ( *it ) );
-            if ( variable.find( assignment->scopedID ) != -1 )
+            if ( variable.tqfind( assignment->scopedID ) != -1 )
             {
                 kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '"
                               << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl;
diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp
index a602a3a9..92db0620 100644
--- a/buildtools/autotools/managecustomcommand.cpp
+++ b/buildtools/autotools/managecustomcommand.cpp
@@ -22,8 +22,8 @@
 
 #include <klocale.h>
 
-ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name)
-    :ManageCustomBuildCommandsBase(parent, name)
+ManageCustomCommand::ManageCustomCommand(TQWidget *tqparent, const char *name)
+    :ManageCustomBuildCommandsBase(tqparent, name)
 {
 }
 
diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h
index b4e4af49..22f78431 100644
--- a/buildtools/autotools/managecustomcommand.h
+++ b/buildtools/autotools/managecustomcommand.h
@@ -24,8 +24,9 @@
 class ManageCustomCommand: public ManageCustomBuildCommandsBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 );
+	ManageCustomCommand( TQWidget *tqparent = 0, const char *name = 0 );
 
 	void setRowProperties( int row );
 public slots:
diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui
index 43164ef5..47c018ea 100644
--- a/buildtools/autotools/managecustomcommandsbase.ui
+++ b/buildtools/autotools/managecustomcommandsbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ManageCustomBuildCommandsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ManageCustomBuildCommandsBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>addButton</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <string>&amp;Add</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>removeButton</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <string>&amp;Remove</string>
             </property>
         </widget>
-        <widget class="QTable" row="0" column="0" rowspan="3" colspan="1">
+        <widget class="TQTable" row="0" column="0" rowspan="3" colspan="1">
             <column>
                 <property name="text">
                     <string>Menu Text</string>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -117,9 +117,9 @@
     <tabstop>addButton</tabstop>
     <tabstop>removeButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>addButton_clicked()</slot>
     <slot>removeButton_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index e44a32c3..9dfffefb 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -24,7 +24,7 @@
 #include "kdevcompileroptions.h"
 
 
-static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent )
 {
 	KService::Ptr service = KService::serviceByDesktopName( name );
 	if ( !service )
@@ -47,7 +47,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
-    TQObject *obj = factory->create(parent, service->name().latin1(),
+    TQObject *obj = factory->create(tqparent, service->name().latin1(),
                                    "KDevCompilerOptions", args);
 
     if (!obj->inherits("KDevCompilerOptions")) {
@@ -65,22 +65,22 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 		args = TQStringList::split( " ", prop.toString() );
 
 	return KParts::ComponentFactory
-	       ::createInstanceFromService<KDevCompilerOptions>( service, parent,
+	       ::createInstanceFromService<KDevCompilerOptions>( service, tqparent,
 	                                                         service->name().latin1(), args );*/
 }
 
 
-TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent )
+TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent )
 {
-	KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent );
+	KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(tqparent) );
 
 	if ( plugin )
 	{
-		TQString newflags = plugin->exec( parent, flags );
+		TQString newflags = plugin->exec( tqparent, flags );
 		delete plugin;
 		return newflags;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -128,7 +128,7 @@ void AutoProjectTool::parseMakefileam(const TQString &fileName, TQMap<TQString,
 				rhs[rhs.length() - 1] = ' ';
 			}
 
-			// The need for stripWhiteSpace seems to be a Qt bug.
+			// The need for stripWhiteSpace seems to be a TQt bug.
 			// make our list nice and neat.
 			TQStringList bits = TQStringList::split(" ", rhs);
 			rhs = bits.join(" ");
@@ -238,11 +238,11 @@ void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString,
 		if ( re.exactMatch ( s ) )
 		{
 			TQString lhs = re.cap ( 2 );
-			bool notFound = ( variables.find ( lhs ) == variables.end() );
+			bool notFound = ( variables.tqfind ( lhs ) == variables.end() );
 
 			if ( notFound )
 			{
-				if ( seenLhs.find ( lhs ) == seenLhs.end() )
+				if ( seenLhs.tqfind ( lhs ) == seenLhs.end() )
 				{
 					// not interested in this line at all
 					// write it out as is..
@@ -446,7 +446,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 		if (re.exactMatch(s))
 		{
 			TQString lhs = re.cap(2);
-			TQMap<TQString, bool>* ourRhs = interest.find(lhs);
+			TQMap<TQString, bool>* ourRhs = interest.tqfind(lhs);
 
 			if (!ourRhs)
 			{
@@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						// add this line to we we want to add to remove duplicates.
 						for (uint index = 0; index < bits.size(); index++)
 						{
-							TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]);
+							TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(bits[index]);
 							if (findEntry == ourRhs->end())
 							{
 								// we haven't seen it, so add it, so we don't add it again later..
@@ -490,7 +490,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						}
 						// now write the line out if it is not going to be empty.
 						TQString newLine(lhs);
-						if (seenLhs.find(lhs) == seenLhs.end())
+						if (seenLhs.tqfind(lhs) == seenLhs.end())
 						{
 							newLine += " = ";
 							seenLhs[lhs] = "";
@@ -537,7 +537,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						{
 							// check if any of these values are down to remove.
 							TQString newLine(lhs);
-							if (seenLhs.find(lhs) == seenLhs.end())
+							if (seenLhs.tqfind(lhs) == seenLhs.end())
 							{
 								newLine += " = ";
 								seenLhs[lhs] = "";
@@ -551,7 +551,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 							bool added = false;
 							for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++)
 							{
-								TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter);
+								TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter);
 								if (findEntry == ourRhs->end())
 								{
 									// we do not want to remove it..
@@ -598,7 +598,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 			{
 				// now we have to deal with this multiLine value..
 				// ourRhs will always be a value, as we only get multiLine if we're interested in it..
-				TQMap<TQString, bool>* ourRhs = interest.find(lastLhs);
+				TQMap<TQString, bool>* ourRhs = interest.tqfind(lastLhs);
 
 				if (add)
 				{
@@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 					// add this line to we we want to add to remove duplicates.
 					for (uint index = 0; index < lastRhs.size(); index++)
 					{
-						TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]);
+						TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(lastRhs[index]);
 						if (findEntry == ourRhs->end())
 						{
 							// we haven't seen it, so add it, so we don't add it again later..
@@ -619,7 +619,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 					}
 					// now write the line out if it is not going to be empty.
 					TQString newLine(lastLhs);
-					if (seenLhs.find(lastLhs) == seenLhs.end())
+					if (seenLhs.tqfind(lastLhs) == seenLhs.end())
 					{
 						newLine += " = ";
 						seenLhs[lastLhs] = "";
@@ -665,7 +665,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 					{
 						// check if any of these values are down to remove.
 						TQString newLine(lastLhs);
-						if (seenLhs.find(lastLhs) == seenLhs.end())
+						if (seenLhs.tqfind(lastLhs) == seenLhs.end())
 						{
 							newLine += " = ";
 							seenLhs[lastLhs] = "";
@@ -678,7 +678,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						bool added = false;
 						for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++)
 						{
-							TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter);
+							TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter);
 							if (findEntry == ourRhs->end())
 							{
 								// we do not want to remove it..
@@ -724,7 +724,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 			TQMap<TQString, bool>* ourRhs = it.current();
 
 			TQString newLine(lhs);
-			if (seenLhs.find(lhs) == seenLhs.end())
+			if (seenLhs.tqfind(lhs) == seenLhs.end())
 			{
 				newLine += " = ";
 				seenLhs[lastLhs] = "";
@@ -814,7 +814,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
 		{
 			if (close.search(line) >= 0)
 			{
-				line = line.replace(close.search(line), 1, "");
+				line = line.tqreplace(close.search(line), 1, "");
 				list += TQStringList::split(" ", line);
 				break;
 			}
@@ -829,11 +829,11 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
 		}
 		else if (ac_regex.search(line) >= 0)
 		{
-			line = line.replace(ac_regex.search(line), ac_match.length() - 1, "");
+			line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, "");
 
 			if (open.search(line) >= 0)
 			{
-				line = line.replace(open.search(line), 1, "");
+				line = line.tqreplace(open.search(line), 1, "");
 			}
 
 			if (line.endsWith(cont))
@@ -845,7 +845,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
 			{
 				if (close.search(line) >= 0)
 				{
-					line = line.replace(close.search(line), 1, "");
+					line = line.tqreplace(close.search(line), 1, "");
 				}
 			}
 
@@ -946,7 +946,7 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m
 			else if (ac_regex.search(line) >= 0)
 			{
 				line = line.stripWhiteSpace();
-				line = line.replace(ac_regex.search(line), ac_match.length() - 1, "");
+				line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, "");
 				if (line.endsWith(cont))
 				{
 					line.setLength(line.length() - 1);
@@ -954,11 +954,11 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m
 				}
 				if (open.search(line) >= 0)
 				{
-					line = line.replace(open.search(line), 1, "");
+					line = line.tqreplace(open.search(line), 1, "");
 				}
 				if (close.search(line) >= 0)
 				{
-					line = line.replace(close.search(line), 1, "");
+					line = line.tqreplace(close.search(line), 1, "");
 				}
 
 				if (!multiLine)
diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h
index 2f8a092d..26bb0e83 100644
--- a/buildtools/autotools/misc.h
+++ b/buildtools/autotools/misc.h
@@ -27,7 +27,7 @@ public:
 	 * Loads the compiler options plugin for the given compiler, executes the dialog
 	 * with some initial flags, and returns the new flags.
 	 */
-	static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent );
+	static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent );
 
 	/**
 	 * Returns the canonicalized version of a file name, i.e.
@@ -48,7 +48,7 @@ public:
 	static void addRemoveMakefileam(const TQString &fileName, TQMap<TQString, TQString> variables,  bool add);
 
 	/**
-	 * Parses configure.in and splits AC_OUTPUT into a QStringList
+	 * Parses configure.in and splits AC_OUTPUT into a TQStringList
 	 */
 	static TQStringList configureinLoadMakefiles( TQString configureinpath );
 
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index e265a969..a650fd53 100644
--- a/buildtools/autotools/removefiledlg.cpp
+++ b/buildtools/autotools/removefiledlg.cpp
@@ -43,8 +43,8 @@ static bool fileListContains(const TQPtrList<FileItem> &list, const TQString &na
 
 RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem,
 								TargetItem *item, const TQString &filename,
-								TQWidget *parent, const char *name)
-	: RemoveFileDlgBase(parent, name, true)
+								TQWidget *tqparent, const char *name)
+	: RemoveFileDlgBase(tqparent, name, true)
 {
 	removeFromTargetsCheckBox = 0;
 
@@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p
 
 		TQString joinedtargets = "    *" + targets.join("\n    *");
 		removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n"
-												"Remove it from all of them?").arg(filename).arg(joinedtargets) );
+												"Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) );
         setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) );
 	}
 
diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h
index 81e24d5f..36e1c2bd 100644
--- a/buildtools/autotools/removefiledlg.h
+++ b/buildtools/autotools/removefiledlg.h
@@ -26,11 +26,12 @@ class TargetItem;
 class RemoveFileDialog : public RemoveFileDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	RemoveFileDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem,
 	                  TargetItem *item, const TQString &filename,
-	                  TQWidget *parent = 0, const char *name = 0 );
+	                  TQWidget *tqparent = 0, const char *name = 0 );
 	~RemoveFileDialog();
 
 protected:
diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui
index d7b66011..6aaab95e 100644
--- a/buildtools/autotools/removefiledlgbase.ui
+++ b/buildtools/autotools/removefiledlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>RemoveFileDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>RemoveFileDlgBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,14 +37,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>247</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeButton</cstring>
                     </property>
@@ -55,7 +55,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -65,11 +65,11 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -82,7 +82,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>fileLayout</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>removeLabel</cstring>
                             </property>
@@ -98,7 +98,7 @@
                                 <string>[REMOVE QUESTION]</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>removeCheckBox</cstring>
                             </property>
@@ -106,11 +106,11 @@
                                 <string>Also &amp;remove it from disk</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>noticeLabel</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -124,7 +124,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>targetBox</cstring>
             </property>
@@ -143,7 +143,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>targetLabel</cstring>
                     </property>
@@ -159,7 +159,7 @@
                         <string>[TARGET NAME]</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>directoryStaticLabel</cstring>
                     </property>
@@ -179,7 +179,7 @@
                         <string>Directory:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>targetStaticLabel</cstring>
                     </property>
@@ -199,7 +199,7 @@
                         <string>Target:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>directoryLabel</cstring>
                     </property>
@@ -228,6 +228,6 @@
     <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 5783900c..962a386c 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -42,8 +42,8 @@
 
 
 RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem,
-					TargetItem *titem, TQWidget* parent, const char* name )
-  : RemoveTargetDlgBase ( parent, name, true, 0 )
+					TargetItem *titem, TQWidget* tqparent, const char* name )
+  : RemoveTargetDlgBase ( tqparent, name, true, 0 )
 {
     removeLabel->setText ( i18n ( "Do you really want to remove <b>%1</b><br>with <b>all files</b> that are attached to it<br>and <b>all dependencies</b>?" ).arg ( titem->name ) );
     directoryLabel->setText ( spitem->path );
@@ -96,8 +96,8 @@ void RemoveTargetDialog::init()
 			{
 				TQString canonname = AutoProjectTool::canonicalize ( titem->name );
 
-				if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 ||
-					spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 )
+				if ( spitem->variables[canonname + "_LIBADD"].tqcontains ( m_titem->name ) > 0 ||
+					spitem->variables[canonname + "_LDADD"].tqcontains ( m_titem->name ) > 0 )
 				{
 					dependencyListBox->insertItem ( SmallIcon ( "target_kdevelop" ), spitem->path + " (" + titem->name + ")" );
 
@@ -116,7 +116,7 @@ void RemoveTargetDialog::accept ()
 	progressBar->show();
 	progressBar->setFormat ( i18n ( "Removing Target... %p%" ) );
 
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	TQString canonname = AutoProjectTool::canonicalize ( m_titem->name );
 	TQString varname = m_titem->prefix + "_" + m_titem->primary;
@@ -136,7 +136,7 @@ void RemoveTargetDialog::accept ()
 			TQString curCanonname = AutoProjectTool::canonicalize ( titem->name );
 			TQStringList dependencies;
 
-			if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) )
+			if ( spitem->variables[curCanonname + "_LIBADD"].tqcontains ( m_titem->name ) )
 				curVarname = curCanonname + "_LIBADD";
 			else
 				curVarname = curCanonname + "_LDADD";
@@ -148,7 +148,7 @@ void RemoveTargetDialog::accept ()
 			for ( uint i = 0; i < dependencies.size(); ++i )
 			{
 				TQString s = dependencies[i];
-				if ( s.contains ( m_titem->name ) > 0 )
+				if ( s.tqcontains ( m_titem->name ) > 0 )
 					dependencies.remove ( s );
 			}
 
@@ -250,7 +250,7 @@ void RemoveTargetDialog::accept ()
 			// before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h"
 			TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] );
 
-			if ( noInstHeaders.contains ( fitem->name ) )
+			if ( noInstHeaders.tqcontains ( fitem->name ) )
 			{
 				noInstHeaders.remove ( fitem->name );
 
@@ -265,7 +265,7 @@ void RemoveTargetDialog::accept ()
 
 		fileList.append ( m_spitem->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fitem->name );
 
-		qApp->processEvents();
+		tqApp->processEvents();
 
 		progressBar->setValue ( progressBar->value() + 1 );
 	}
diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h
index a9981007..8a376678 100644
--- a/buildtools/autotools/removetargetdlg.h
+++ b/buildtools/autotools/removetargetdlg.h
@@ -35,7 +35,7 @@ class RemoveTargetDialog : public RemoveTargetDlgBase
 
 public:
 	RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem,
-	                    TargetItem *titem, TQWidget* parent = 0, const char* name = 0 );
+	                    TargetItem *titem, TQWidget* tqparent = 0, const char* name = 0 );
 	~RemoveTargetDialog();
 
 private:
diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui
index 8e3660d3..860dfb4a 100644
--- a/buildtools/autotools/removetargetdlgbase.ui
+++ b/buildtools/autotools/removetargetdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>RemoveTargetDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>RemoveTargetDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>targetBox</cstring>
             </property>
@@ -46,7 +46,7 @@
                         <string>[TARGET DIRECTORY]</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>targetLabel</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>[TARGET NAME]</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>directoryStaticLabel</cstring>
                     </property>
@@ -74,7 +74,7 @@
                         <string>Directory:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>targetStaticLabel</cstring>
                     </property>
@@ -96,17 +96,17 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>140</height>
@@ -119,7 +119,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>removeLabel</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <string>[REMOVE QUESTION]</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>removeCheckBox</cstring>
                     </property>
@@ -135,11 +135,11 @@
                         <string>Also &amp;remove it from disk</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -151,7 +151,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -193,14 +193,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="5" column="0">
+        <widget class="TQLayoutWidget" row="5" column="0">
             <property name="name">
                 <cstring>buttonLayout</cstring>
             </property>
@@ -221,14 +221,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeButton</cstring>
                     </property>
@@ -239,7 +239,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -254,8 +254,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index a7fd2c11..314fc710 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -42,10 +42,10 @@
 
 
 SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProjectWidget *widget,
-                                                 SubprojectItem *item, TQWidget *parent, const char *name)
-    : SubprojectOptionsDialogBase(parent, name, true)
+                                                 SubprojectItem *item, TQWidget *tqparent, const char *name)
+    : SubprojectOptionsDialogBase(tqparent, name, true)
 {
-    setCaption(i18n("Subproject Options for '%1'").arg(item->subdir));
+    setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir));
 
     subProject = item;
     m_part = part;
@@ -90,7 +90,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
 	TQString subProjectName = *it;
 
 	if( subProjectName.isEmpty() ){
-	    subProjectName = TQString::fromLatin1( "." );
+	    subProjectName = TQString::tqfromLatin1( "." );
 	}
         TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox);
         if (lastItem)
@@ -182,7 +182,7 @@ void SubprojectOptionsDialog::storeConfig()
     }
 
     TQString old_metasources = subProject->variables["METASOURCES"];
-    TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString::null;
+    TQString new_metasources = metasources_checkbox->isChecked() ? TQString::tqfromLatin1("AUTO") : TQString();
     if (new_metasources != old_metasources) {
         subProject->variables["METASOURCES"] = new_metasources;
         replaceMap.insert("METASOURCES", new_metasources);
@@ -304,7 +304,7 @@ void SubprojectOptionsDialog::outsideAddClicked()
 {
     KURLRequesterDlg dialog( "", i18n( "Add Include directory: Choose directory, give -Idirectory or use a variable with -I$(FOOBAR)" ), 0, 0 );
     dialog.urlRequester() ->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
-    dialog.urlRequester() ->setURL( TQString::null );
+    dialog.urlRequester() ->setURL( TQString() );
     if ( dialog.exec() != TQDialog::Accepted )
         return ;
     TQString file = dialog.urlRequester() ->url();
diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h
index 648c007d..2e54af32 100644
--- a/buildtools/autotools/subprojectoptionsdlg.h
+++ b/buildtools/autotools/subprojectoptionsdlg.h
@@ -22,10 +22,11 @@ class SubprojectItem;
 class SubprojectOptionsDialog : public SubprojectOptionsDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	SubprojectOptionsDialog( AutoProjectPart *part, AutoProjectWidget *widget,
-	                         SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 );
+	                         SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 );
 	~SubprojectOptionsDialog();
 
 private:
diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui
index f2723e5a..89f5b4f3 100644
--- a/buildtools/autotools/subprojectoptionsdlgbase.ui
+++ b/buildtools/autotools/subprojectoptionsdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>SubprojectOptionsDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>sub project options widget</cstring>
     </property>
@@ -19,11 +19,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>subprojectoptions_tabwidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -34,7 +34,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>cflags_label</cstring>
                         </property>
@@ -49,7 +49,7 @@
                             <cstring>cflags_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout5</cstring>
                         </property>
@@ -73,7 +73,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>cflags_button</cstring>
                                 </property>
@@ -85,7 +85,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>25</height>
@@ -110,14 +110,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>cxxflags_label</cstring>
                         </property>
@@ -132,7 +132,7 @@
                             <cstring>cxxflags_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout3</cstring>
                         </property>
@@ -148,7 +148,7 @@
                                     <cstring>cxxflags_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>cxxflags_button</cstring>
                                 </property>
@@ -160,7 +160,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>25</height>
@@ -185,14 +185,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>fflags_label</cstring>
                         </property>
@@ -207,7 +207,7 @@
                             <cstring>fflags_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout4</cstring>
                         </property>
@@ -223,7 +223,7 @@
                                     <cstring>fflags_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>fflags_button</cstring>
                                 </property>
@@ -235,7 +235,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>25</height>
@@ -260,7 +260,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -269,7 +269,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -280,15 +280,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>metasources_checkbox</cstring>
                                 </property>
@@ -296,15 +296,15 @@
                                     <string>Automatically &amp;generate metasources</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget" row="1" column="1">
+                                    <widget class="TQLayoutWidget" row="1" column="1">
                                         <property name="name">
                                             <cstring>Layout9</cstring>
                                         </property>
@@ -325,14 +325,14 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>16</height>
                                                     </size>
                                                 </property>
                                             </spacer>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>insidemoveup_button</cstring>
                                                 </property>
@@ -340,7 +340,7 @@
                                                     <string>Move &amp;Up</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>insidemovedown_button</cstring>
                                                 </property>
@@ -358,7 +358,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>16</height>
@@ -367,7 +367,7 @@
                                             </spacer>
                                         </vbox>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>insideinc_label</cstring>
                                         </property>
@@ -382,7 +382,7 @@
                                             <cstring>insideinc_listview</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QListView" row="1" column="0">
+                                    <widget class="TQListView" row="1" column="0">
                                         <column>
                                             <property name="text">
                                                 <string></string>
@@ -403,15 +403,15 @@
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout10</cstring>
+                                    <cstring>tqlayout10</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
+                                    <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                                         <property name="name">
                                             <cstring>Layout10</cstring>
                                         </property>
@@ -432,14 +432,14 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>20</height>
                                                     </size>
                                                 </property>
                                             </spacer>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>outsideadd_button</cstring>
                                                 </property>
@@ -447,7 +447,7 @@
                                                     <string>&amp;Add...</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>outsideedit_button</cstring>
                                                 </property>
@@ -455,7 +455,7 @@
                                                     <string>&amp;Edit...</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>outsideremove_button</cstring>
                                                 </property>
@@ -463,7 +463,7 @@
                                                     <string>&amp;Remove</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>outsidemoveup_button</cstring>
                                                 </property>
@@ -471,7 +471,7 @@
                                                     <string>Move U&amp;p</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>outsidemovedown_button</cstring>
                                                 </property>
@@ -489,7 +489,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>20</height>
@@ -498,7 +498,7 @@
                                             </spacer>
                                         </vbox>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>TextLabel2_2</cstring>
                                         </property>
@@ -513,7 +513,7 @@
                                             <cstring>outsideinc_listview</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QListView" row="1" column="0">
+                                    <widget class="TQListView" row="1" column="0">
                                         <column>
                                             <property name="text">
                                                 <string></string>
@@ -538,7 +538,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -549,7 +549,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListView" row="1" column="0">
+                    <widget class="TQListView" row="1" column="0">
                         <column>
                             <property name="text">
                                 <string>Name</string>
@@ -582,7 +582,7 @@
                             <enum>AllColumns</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>prefixes_label</cstring>
                         </property>
@@ -597,7 +597,7 @@
                             <cstring>prefix_listview</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
                             <cstring>Layout6</cstring>
                         </property>
@@ -618,14 +618,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>addprefix_button</cstring>
                                 </property>
@@ -633,7 +633,7 @@
                                     <string>&amp;Add...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>editprefix_button</cstring>
                                 </property>
@@ -641,7 +641,7 @@
                                     <string>&amp;Edit...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>removeprefix_button</cstring>
                                 </property>
@@ -659,7 +659,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -670,7 +670,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -681,7 +681,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
                             <cstring>Layout9_2</cstring>
                         </property>
@@ -702,14 +702,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buildmoveup_button</cstring>
                                 </property>
@@ -717,7 +717,7 @@
                                     <string>Move &amp;Up</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buildmovedown_button</cstring>
                                 </property>
@@ -735,7 +735,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -744,7 +744,7 @@
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QListView" row="1" column="0">
+                    <widget class="TQListView" row="1" column="0">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -763,7 +763,7 @@
                             <enum>LastColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>buildorder_label</cstring>
                         </property>
@@ -781,7 +781,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -802,14 +802,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okbutton</cstring>
                     </property>
@@ -820,7 +820,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -967,7 +967,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">buildorderMoveDownClicked()</slot>
     <slot access="protected">cflagsClicked()</slot>
     <slot access="protected">cxxFlagsClicked()</slot>
@@ -983,7 +983,7 @@
     <slot access="protected">removePrefixClicked()</slot>
     <slot access="private">addPrefixClicked()</slot>
     <slot access="private">editPrefixClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index 39cd35f2..14e5ee96 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -34,10 +34,10 @@
 #include "urlutil.h"
 
 TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *item,
-                                         TQWidget *parent, const char *name)
-    : TargetOptionsDialogBase(parent, name, true)
+                                         TQWidget *tqparent, const char *name)
+    : TargetOptionsDialogBase(tqparent, name, true)
 {
-    setCaption( i18n("Target Options for '%1'").arg(item->name) );
+    setCaption( i18n("Target Options for '%1'").tqarg(item->name) );
     setIcon( SmallIcon("configure") );
 
     target = item;
@@ -79,26 +79,26 @@ TargetOptionsDialog::~TargetOptionsDialog()
 void TargetOptionsDialog::readConfig()
 {
     TQString flagsstr = target->ldflags;
-    flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)");
+    flagsstr.tqreplace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)");
     TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr);
     TQStringList::Iterator l1it;
 
-    l1it = l1.find("-all-static");
+    l1it = l1.tqfind("-all-static");
     if (l1it != l1.end()) {
         allstatic_box->setChecked(true);
         l1.remove(l1it);
     }
-    l1it = l1.find("-avoid-version");
+    l1it = l1.tqfind("-avoid-version");
     if (l1it != l1.end()) {
         avoidversion_box->setChecked(true);
         l1.remove(l1it);
     }
-    l1it = l1.find("-module");
+    l1it = l1.tqfind("-module");
     if (l1it != l1.end()) {
         module_box->setChecked(true);
         l1.remove(l1it);
     }
-    l1it = l1.find("-no-undefined");
+    l1it = l1.tqfind("-no-undefined");
     if (l1it != l1.end()) {
         noundefined_box->setChecked(true);
         l1.remove(l1it);
@@ -295,7 +295,7 @@ void TargetOptionsDialog::outsideAddClicked()
     KURLRequesterDlg dialog( "", i18n( "Add Library: Choose the .a/.so file, give -l<libname> or use a variable with $(FOOBAR)" ), 0, 0 );
     dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
     dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") );
-    dialog.urlRequester() ->setURL( TQString::null );
+    dialog.urlRequester() ->setURL( TQString() );
     dialog.urlRequester() ->completionObject() ->setDir( m_widget->selectedSubproject()->path );
     dialog.urlRequester() ->fileDialog() ->setURL( KURL::fromPathOrURL( m_widget->selectedSubproject()->path ) );
     if ( dialog.exec() != TQDialog::Accepted )
@@ -354,4 +354,4 @@ void TargetOptionsDialog::accept()
 }
 
 #include "targetoptionsdlg.moc"
-// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on;
+// kate: indent-mode csands; space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h
index 3b938046..7e64ca96 100644
--- a/buildtools/autotools/targetoptionsdlg.h
+++ b/buildtools/autotools/targetoptionsdlg.h
@@ -21,10 +21,11 @@ class TargetItem;
 class TargetOptionsDialog : public TargetOptionsDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	TargetOptionsDialog( AutoProjectWidget *widget, TargetItem *item,
-	                     TQWidget *parent = 0, const char *name = 0 );
+	                     TQWidget *tqparent = 0, const char *name = 0 );
 	~TargetOptionsDialog();
 
 private:
diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui
index 07487ac2..5da3e0b5 100644
--- a/buildtools/autotools/targetoptionsdlgbase.ui
+++ b/buildtools/autotools/targetoptionsdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TargetOptionsDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>target_options_dialog</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget5</cstring>
                 </property>
@@ -37,7 +37,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel1</cstring>
                         </property>
@@ -52,7 +52,7 @@
                             <cstring>allstatic_box</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout12</cstring>
                         </property>
@@ -63,7 +63,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>allstatic_box</cstring>
                                 </property>
@@ -71,7 +71,7 @@
                                     <string>&amp;Do not link against shared libraries (-all-static)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>avoidversion_box</cstring>
                                 </property>
@@ -79,7 +79,7 @@
                                     <string>Do not &amp;assign version numbers to libraries (-avoid-version)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>module_box</cstring>
                                 </property>
@@ -87,7 +87,7 @@
                                     <string>Create a library that can &amp;be dynamically loaded (-module)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>noundefined_box</cstring>
                                 </property>
@@ -95,7 +95,7 @@
                                     <string>Library does not depend on external symbols (-no-&amp;undefined)</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout11</cstring>
                                 </property>
@@ -106,7 +106,7 @@
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>ldflagsother_label</cstring>
                                         </property>
@@ -140,7 +140,7 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -157,7 +157,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -169,7 +169,7 @@
                             <cstring>dependencies_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>dependencies_label</cstring>
                         </property>
@@ -194,7 +194,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -211,7 +211,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -220,7 +220,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget6</cstring>
                 </property>
@@ -231,7 +231,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>insidelib_label</cstring>
                         </property>
@@ -256,14 +256,14 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>7</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QListView" row="4" column="0">
+                    <widget class="TQListView" row="4" column="0">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -282,7 +282,7 @@
                             <enum>LastColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>outsidelib_label</cstring>
                         </property>
@@ -297,7 +297,7 @@
                             <cstring>outsidelib_listview</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
                             <cstring>Layout9_3</cstring>
                         </property>
@@ -318,14 +318,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>insidemoveup_button</cstring>
                                 </property>
@@ -333,7 +333,7 @@
                                     <string>Move &amp;Up</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>insidemovedown_button</cstring>
                                 </property>
@@ -351,7 +351,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -360,7 +360,7 @@
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QListView" row="1" column="0">
+                    <widget class="TQListView" row="1" column="0">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -379,7 +379,7 @@
                             <enum>LastColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="4" column="1">
+                    <widget class="TQLayoutWidget" row="4" column="1">
                         <property name="name">
                             <cstring>Layout10_4</cstring>
                         </property>
@@ -400,14 +400,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>outsideadd_button</cstring>
                                 </property>
@@ -415,7 +415,7 @@
                                     <string>&amp;Add...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>outsideedit_button</cstring>
                                 </property>
@@ -423,7 +423,7 @@
                                     <string>&amp;Edit...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>outsideremove_button</cstring>
                                 </property>
@@ -431,7 +431,7 @@
                                     <string>&amp;Remove</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>outsidemoveup_button</cstring>
                                 </property>
@@ -439,7 +439,7 @@
                                     <string>Mo&amp;ve Up</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>outsidemovedown_button</cstring>
                                 </property>
@@ -457,7 +457,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -468,7 +468,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>arguments_page</cstring>
                 </property>
@@ -479,7 +479,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>argumentBox</cstring>
                         </property>
@@ -495,7 +495,7 @@
                                     <cstring>run_arguments_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>arguments_label_1</cstring>
                                 </property>
@@ -515,7 +515,7 @@
                                     <cstring>m_cwdEdit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1">
+                            <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -523,7 +523,7 @@
                                     <string>Working Directory:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>arguments_label_2</cstring>
                                 </property>
@@ -555,7 +555,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>120</height>
@@ -565,7 +565,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -586,14 +586,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okbutton</cstring>
                     </property>
@@ -607,7 +607,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -703,7 +703,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">insideMoveDownClicked()</slot>
     <slot access="protected">insideMoveUpClicked()</slot>
     <slot access="protected">outsideAddClicked()</slot>
@@ -711,9 +711,9 @@
     <slot access="protected">outsideMoveDownClicked()</slot>
     <slot access="protected">outsideMoveUpClicked()</slot>
     <slot access="protected">outsideRemoveClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp
index e979df61..b06ced18 100644
--- a/buildtools/custommakefiles/custombuildoptionswidget.cpp
+++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp
@@ -22,8 +22,8 @@
 
 
 CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom,
-                                                   TQWidget *parent, const char *name)
-    : CustomBuildOptionsWidgetBase(parent, name),
+                                                   TQWidget *tqparent, const char *name)
+    : CustomBuildOptionsWidgetBase(tqparent, name),
       m_dom(dom)
 {
     ant_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "ant");
@@ -96,4 +96,4 @@ void CustomBuildOptionsWidget::makeToggled(bool b)
 
 #include "custombuildoptionswidget.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h
index bf67477a..492cc8ea 100644
--- a/buildtools/custommakefiles/custombuildoptionswidget.h
+++ b/buildtools/custommakefiles/custombuildoptionswidget.h
@@ -21,9 +21,10 @@ class TQTabWidget;
 class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *parent=0, const char *name=0 );
+    CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *tqparent=0, const char *name=0 );
     ~CustomBuildOptionsWidget();
 
     void setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget *oow);
@@ -43,4 +44,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
index 59ca9ba2..619a653b 100644
--- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
+++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomBuildOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>configure_options_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buildtool_group</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>make_button</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>ant_button</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <string>A&amp;nt</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>other_button</cstring>
                     </property>
@@ -78,14 +78,14 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>builddir_label</cstring>
             </property>
@@ -96,9 +96,9 @@
                 <cstring>builddir_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -150,12 +150,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">makeToggled(bool)</slot>
     <slot access="protected">otherToggled(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp
index b47ef3ff..6b27994e 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.cpp
+++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp
@@ -28,8 +28,8 @@
 
 #include <environmentvariableswidget.h>
 
-CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent)
- : CustomMakeConfigWidgetBase(parent),
+CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent)
+ : CustomMakeConfigWidgetBase(tqparent),
     m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() )
 {
     abort_box->setChecked(DomUtil::readBoolEntry(m_dom, m_configGroup + "/make/abortonerror"));
@@ -43,7 +43,7 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQ
     defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget"));
     makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions"));
 
-    envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this));
+    envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), TQT_TQOBJECT(this)));
     m_allEnvironments = m_part->allMakeEnvironments();
     m_currentEnvironment = m_part->currentMakeEnvironment();
     env_var_group->setColumnLayout( 1, Qt::Vertical );
@@ -61,8 +61,8 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget()
 void CustomMakeConfigWidget::envNameChanged(const TQString& envName)
 {
     TQStringList allEnvNames = m_part->allMakeEnvironments();
-    bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty();
-    bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1;
+    bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty();
+    bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1;
     addenvs_button->setEnabled(canAdd);
     copyenvs_button->setEnabled(canAdd);
     removeenvs_button->setEnabled(canRemove);
@@ -70,7 +70,7 @@ void CustomMakeConfigWidget::envNameChanged(const TQString& envName)
 
 void CustomMakeConfigWidget::envChanged(const TQString& envName)
 {
-    if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName))
+    if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName))
         return;
 
     // save settings of previously active environment
@@ -100,7 +100,7 @@ void CustomMakeConfigWidget::envRemoved()
     m_allEnvironments.remove(env);
     envs_combo->clear();
     envs_combo->insertStringList(m_allEnvironments);
-    m_currentEnvironment = TQString::null;
+    m_currentEnvironment = TQString();
     envChanged( m_allEnvironments[0] );
 }
 
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h
index 5a94e669..42cd310e 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.h
+++ b/buildtools/custommakefiles/custommakeconfigwidget.h
@@ -24,9 +24,10 @@ class EnvironmentVariablesWidget;
 class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent);
+    CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent);
 
     ~CustomMakeConfigWidget();
 
diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
index b864a18f..085724c1 100644
--- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomMakeConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CustomMakeConfigWidgetBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>abort_box</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <string>A&amp;bort on first error</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>dontact_box</cstring>
             </property>
@@ -35,9 +35,9 @@
                 <string>Only di&amp;splay commands without actually executing them</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -53,7 +53,7 @@
                         <cstring>makebin_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>makeoptions_label</cstring>
                     </property>
@@ -69,7 +69,7 @@
                         <cstring>makeoptions_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>makebin_label</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <cstring>makebin_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>defTarget_label</cstring>
                     </property>
@@ -93,15 +93,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>runMultiJobs</cstring>
                     </property>
@@ -109,7 +109,7 @@
                         <string>Run multiple jobs</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>jobs_label</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <cstring>jobs_box</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>jobs_box</cstring>
                     </property>
@@ -155,7 +155,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>200</width>
                             <height>20</height>
@@ -164,15 +164,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>prio_label</cstring>
                     </property>
@@ -183,7 +183,7 @@
                         <cstring>jobs_box</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>prio_box</cstring>
                     </property>
@@ -215,7 +215,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>192</width>
                             <height>20</height>
@@ -224,15 +224,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>envs_label</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <cstring>envs_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>envs_combo</cstring>
                     </property>
@@ -267,7 +267,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addenvs_button</cstring>
                     </property>
@@ -278,7 +278,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>copyenvs_button</cstring>
                     </property>
@@ -289,7 +289,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeenvs_button</cstring>
                     </property>
@@ -302,7 +302,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>env_var_group</cstring>
             </property>
@@ -378,15 +378,15 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">envNameChanged(const QString &amp;)</slot>
     <slot access="protected">envChanged(const QString&amp;)</slot>
     <slot access="protected">envAdded()</slot>
     <slot access="protected">envRemoved()</slot>
     <slot access="protected">envCopied()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 84278a69..bb31b025 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -28,13 +28,13 @@
 #include "customprojectpart.h"
 #include "domutil.h"
 
-CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* parent )
-        : CustomManagerWidgetBase( parent ), m_part( part), m_dom( *part->projectDom() )
+CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* tqparent )
+        : CustomManagerWidgetBase( tqparent ), m_part( part), m_dom( *part->projectDom() )
 {
     m_filetypes->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/filetypes", "filetype" ) );
     KURLRequester* urlselector = new KURLRequester( );
     urlselector->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
-    urlselector->setURL( TQString::null );
+    urlselector->setURL( TQString() );
     urlselector->completionObject() ->setDir( part->projectDirectory() );
     urlselector->fileDialog() ->setURL( KURL( part->projectDirectory() ) );
     m_blacklistBox = new KEditListBox( i18n("blacklisted files and directories are not"
@@ -54,7 +54,7 @@ void CustomManagerWidget::checkUrl(const TQString& url)
     {
         kdDebug(9025) << "seems to be non-relative" << endl;
         TQString relpath = m_part->relativeToProject( url );
-        TQListBoxItem* item = m_blacklistBox->listBox()->findItem( url );
+        TQListBoxItem* item = m_blacklistBox->listBox()->tqfindItem( url );
         m_blacklistBox->listBox()->takeItem( item );
         kdDebug(9025) << "relative path:" << relpath << endl;
         if( !relpath.isEmpty() )
@@ -77,4 +77,4 @@ void CustomManagerWidget::accept()
 
 #include "custommanagerwidget.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h
index ce12805b..5f63d006 100644
--- a/buildtools/custommakefiles/custommanagerwidget.h
+++ b/buildtools/custommakefiles/custommanagerwidget.h
@@ -23,9 +23,10 @@ class KEditListBox;
 class CustomManagerWidget : public CustomManagerWidgetBase
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomManagerWidget( CustomProjectPart* part, TQWidget* parent );
+    CustomManagerWidget( CustomProjectPart* part, TQWidget* tqparent );
     ~CustomManagerWidget();
 public slots:
     void checkUrl(const TQString& url);
@@ -38,4 +39,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui
index a388b288..4b6c0c92 100644
--- a/buildtools/custommakefiles/custommanagerwidgetbase.ui
+++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomManagerWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CustomManagerWidgetBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>grid</cstring>
             </property>
@@ -55,7 +55,7 @@ This will be used when adding/removing files in directories and re-populating th
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>108</height>
@@ -66,7 +66,7 @@ This will be used when adding/removing files in directories and re-populating th
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp
index d40c55d2..b3430e62 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.cpp
+++ b/buildtools/custommakefiles/customotherconfigwidget.cpp
@@ -29,8 +29,8 @@
 
 #include <environmentvariableswidget.h>
 
-CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent)
- : CustomOtherConfigWidgetBase(parent),
+CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent)
+ : CustomOtherConfigWidgetBase(tqparent),
     m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() )
 {
     prio_box->setValue(DomUtil::readIntEntry(m_dom, m_configGroup + "/other/prio"));
@@ -38,7 +38,7 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const
     defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget"));
     makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions"));
 
-    envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+    envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
     m_allEnvironments = m_part->allMakeEnvironments();
     m_currentEnvironment = m_part->currentMakeEnvironment();
     env_var_group->setColumnLayout( 1, Qt::Vertical );
@@ -56,8 +56,8 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget()
 void CustomOtherConfigWidget::envNameChanged(const TQString& envName)
 {
     TQStringList allEnvNames = m_part->allMakeEnvironments();
-    bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty();
-    bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1;
+    bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty();
+    bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1;
     addenvs_button->setEnabled(canAdd);
     copyenvs_button->setEnabled(canAdd);
     removeenvs_button->setEnabled(canRemove);
@@ -65,7 +65,7 @@ void CustomOtherConfigWidget::envNameChanged(const TQString& envName)
 
 void CustomOtherConfigWidget::envChanged(const TQString& envName)
 {
-    if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName))
+    if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName))
         return;
 
     // save settings of previously active environment
@@ -95,7 +95,7 @@ void CustomOtherConfigWidget::envRemoved()
     m_allEnvironments.remove(env);
     envs_combo->clear();
     envs_combo->insertStringList(m_allEnvironments);
-    m_currentEnvironment = TQString::null;
+    m_currentEnvironment = TQString();
     envChanged( m_allEnvironments[0] );
 }
 
@@ -121,5 +121,5 @@ void CustomOtherConfigWidget::accept()
 }
 
 #include "customotherconfigwidget.moc"
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h
index c786635c..a432d3e6 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.h
+++ b/buildtools/custommakefiles/customotherconfigwidget.h
@@ -24,9 +24,10 @@ class EnvironmentVariablesWidget;
 class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent);
+    CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent);
 
     ~CustomOtherConfigWidget();
 
@@ -53,5 +54,5 @@ protected:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
index 174391ae..37c1b1ea 100644
--- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomOtherConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CustomOtherConfigWidgetBase</cstring>
     </property>
@@ -19,25 +19,25 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>defaultTarget_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>makebin_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>makeoptions_label</cstring>
                     </property>
@@ -48,12 +48,12 @@
                         <cstring>makeoptions_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>makeoptions_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>makebin_label</cstring>
                     </property>
@@ -64,7 +64,7 @@
                         <cstring>makebin_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>defTarget_label</cstring>
                     </property>
@@ -77,15 +77,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>prio_label</cstring>
                     </property>
@@ -96,7 +96,7 @@
                         <cstring>jobs_box</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>prio_box</cstring>
                     </property>
@@ -128,7 +128,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -137,15 +137,15 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>envs_label</cstring>
                     </property>
@@ -164,7 +164,7 @@
                         <cstring>envs_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>envs_combo</cstring>
                     </property>
@@ -180,7 +180,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addenvs_button</cstring>
                     </property>
@@ -191,7 +191,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>copyenvs_button</cstring>
                     </property>
@@ -202,7 +202,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeenvs_button</cstring>
                     </property>
@@ -215,7 +215,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>env_var_group</cstring>
             </property>
@@ -276,13 +276,13 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">envNameChanged(const QString &amp;)</slot>
     <slot access="protected">envChanged(const QString&amp;)</slot>
     <slot access="protected">envAdded()</slot>
     <slot access="protected">envRemoved()</slot>
     <slot access="protected">envCopied()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index b25a69d7..da6ce3cd 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -65,8 +65,8 @@ typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
 static const KDevPluginInfo data( "kdevcustomproject" );
 K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
 
-CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
-        : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
+CustomProjectPart::CustomProjectPart( TQObject *tqparent, const char *name, const TQStringList & )
+        : KDevBuildTool( &data, tqparent, name ? name : "CustomProjectPart" )
         , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
 {
     setInstance( CustomProjectFactory::instance() );
@@ -231,7 +231,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
 
     TQString popupstr = fcontext->urls().first().fileName();
 
-    if ( popupstr == TQString::null )
+    if ( popupstr == TQString() )
         popupstr = ".";
 
     if ( fcontext->urls().size() == 1 && URLUtil::isDirectory( fcontext->urls().first() ) && !isInBlacklist( fcontext->urls().first().path() ) )
@@ -242,7 +242,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
         m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 );
         int id = popup->insertItem( i18n( "Make Active Directory" ),
                                     this, TQT_SLOT( slotChooseActiveDirectory() ) );
-        popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>"
+        popup->tqsetWhatsThis( id, i18n( "<b>Make active directory</b><p>"
                                        "Chooses this directory as the destination for new files created using wizards "
                                        "like the <i>New Class</i> wizard." ) );
     }
@@ -258,7 +258,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
         {
             id = popup->insertItem( i18n( "Remove from blacklist" ),
                                     this, TQT_SLOT( slotChangeBlacklist() ) );
-            popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
+            popup->tqsetWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
                                            "Removes the given file or directory from the "
                                            "blacklist if it is already in it.<br>The blacklist contains files and"
                                            " directories that should be ignored even if they match a project filetype "
@@ -268,7 +268,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
         {
             id = popup->insertItem( i18n( "Add to blacklist" ),
                                     this, TQT_SLOT( slotChangeBlacklist() ) );
-            popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
+            popup->tqsetWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
                                            "Adds the given file or directory to the blacklist.<br>The blacklist contains files and"
                                            " directories that should be ignored even if they match a project filetype "
                                            "pattern" ) );
@@ -318,13 +318,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
     {
         int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ),
                                     this, TQT_SLOT( slotAddToProject() ) );
-        popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
+        popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
                                        "Note that the files should be manually added to the corresponding makefile or build.xml." ) );
         if ( dirAddRecursive )
         {
             int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ),
                                         this, TQT_SLOT( slotAddToProjectRecursive() ) );
-            popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
+            popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
                                            "Note that the files should be manually added to the corresponding makefile or build.xml." ) );
         }
     }
@@ -333,14 +333,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
     {
         int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ),
                                     this, TQT_SLOT( slotRemoveFromProject() ) );
-        popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
+        popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
                                        "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
 
         if ( dirDelRecursive )
         {
             int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ),
                                         this, TQT_SLOT( slotRemoveFromProjectRecursive() ) );
-            popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
+            popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
                                            "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
         }
     }
@@ -460,7 +460,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr
         int r = KMessageBox::questionYesNo( mainWindow()->main(),
                                             i18n( "This project does not contain any files yet.\n"
                                                   "Populate it with all C/C++/Java files below "
-                                                  "the project directory?" ), TQString::null, i18n( "Populate" ), i18n( "Do Not Populate" ) );
+                                                  "the project directory?" ), TQString(), i18n( "Populate" ), i18n( "Do Not Populate" ) );
         if ( r == KMessageBox::Yes )
             populateProject();
     }
@@ -512,7 +512,7 @@ void CustomProjectPart::findNewFiles( const TQString& dir, TQStringList& filelis
         // If the entry is blacklisted, proceed to next one.
         // Note that by using generic isInBlacklist(),
         // we are actually wasting resources,
-        // because it also tests whether any parent directory of relativeEntry is blacklisted.
+        // because it also tests whether any tqparent directory of relativeEntry is blacklisted.
         // But by the order we are traversing and processing the directories,
         // we know it is not the case, ever.
         if ( isInBlacklist( relativeEntry ) )
@@ -568,7 +568,7 @@ void CustomProjectPart::populateProject()
         setFiletypes( lb->items() );
     }
 
-    TQApplication::setOverrideCursor( Qt::waitCursor );
+    TQApplication::setOverrideCursor( TQt::waitCursor );
     removeFiles( allFiles() );
     updateBlacklist( TQStringList() );
 
@@ -910,7 +910,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t
         cmdline = DomUtil::readEntry( dom, "/kdevcustomproject/other/otherbin" );
         if ( cmdline.isEmpty() )
             cmdline = "echo";
-        else if ( cmdline.find( "/" ) == -1 )
+        else if ( cmdline.tqfind( "/" ) == -1 )
             cmdline = "./" + cmdline;
         cmdline += " " + DomUtil::readEntry( dom, "/kdevcustomproject/other/otheroptions" );
     }
@@ -944,7 +944,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t
     TQString nice;
     if ( prio != 0 )
     {
-        nice = TQString( "nice -n%1 " ).arg( prio );
+        nice = TQString( "nice -n%1 " ).tqarg( prio );
     }
 
     cmdline.prepend( nice );
@@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile()
 
 void CustomProjectPart::slotInstallActiveDir()
 {
-    startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) );
+    startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::tqfromLatin1( "install" ) );
 }
 
 void CustomProjectPart::slotInstall()
 {
-    startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) );
+    startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ) );
 }
 
 
@@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu()
     slotBuild();
 
     // After that issue "make install" with the root user
-    startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
+    startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
 }
 
 void CustomProjectPart::slotClean()
 {
-    startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) );
+    startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "clean" ) );
 }
 
 
@@ -1056,7 +1056,7 @@ void CustomProjectPart::slotExecute()
         // Use kdesu??
         if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autokdesu", false ) )
             //slotInstallWithKdesu assumes that it hasn't just been build...
-            _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
+            _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
         else
             slotInstall();
         _auto = true;
@@ -1186,7 +1186,7 @@ void CustomProjectPart::putEnvVarsInVarMap()
 
 void CustomProjectPart::parseMakefile( const TQString& filename )
 {
-    if ( m_parsedMakefiles.contains( filename ) )
+    if ( m_parsedMakefiles.tqcontains( filename ) )
         return;
 
     m_parsedMakefiles.insert( filename, 1 );
@@ -1218,9 +1218,9 @@ void CustomProjectPart::parseMakefile( const TQString& filename )
         while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 )
         {
             TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace();
-            if ( m_makefileVars.contains( variableName ) )
+            if ( m_makefileVars.tqcontains( variableName ) )
             {
-                str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] );
+                str.tqreplace( variablesRe.cap( 0 ), m_makefileVars[variableName] );
             }
         }
 
@@ -1245,17 +1245,17 @@ void CustomProjectPart::parseMakefile( const TQString& filename )
             TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace();
             if ( tmpTarget.endsWith( ".o" ) )
             {
-                if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() )
+                if ( m_targetsObjectFiles.tqfind( tmpTarget ) == m_targetsObjectFiles.end() )
                     m_targetsObjectFiles += tmpTarget;
             }
-            else if ( tmpTarget.contains( '.' ) )
+            else if ( tmpTarget.tqcontains( '.' ) )
             {
-                if ( m_targetsOtherFiles.find( tmpTarget ) == m_targetsOtherFiles.end() )
+                if ( m_targetsOtherFiles.tqfind( tmpTarget ) == m_targetsOtherFiles.end() )
                     m_targetsOtherFiles += tmpTarget;
             }
             else
             {
-                if ( m_targets.find( tmpTarget ) == m_targets.end() )
+                if ( m_targets.tqfind( tmpTarget ) == m_targets.end() )
                     m_targets += tmpTarget;
             }
         }
@@ -1289,7 +1289,7 @@ void CustomProjectPart::updateMakeEnvironmentsMenu()
     {
         TQStringList l = allMakeEnvironments();
         m_makeEnvironmentsSelector->setItems( l );
-        m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) );
+        m_makeEnvironmentsSelector->setCurrentItem( l.tqfindIndex( currentMakeEnvironment() ) );
     }
     else
     {
@@ -1322,7 +1322,7 @@ void CustomProjectPart::slotCommandFinished( const TQString& command )
     if ( m_buildCommand != command )
         return;
 
-    m_buildCommand = TQString::null;
+    m_buildCommand = TQString();
 
     m_timestamp.clear();
     TQStringList fileList = allFiles();
@@ -1361,7 +1361,7 @@ bool CustomProjectPart::isDirty()
         TQString fileName = *it;
         ++it;
 
-        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName );
+        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName );
         TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified();
         if ( it == m_timestamp.end() || *it != t )
         {
@@ -1401,7 +1401,7 @@ TQString CustomProjectPart::currentMakeEnvironment() const
     TQStringList allEnvs = allMakeEnvironments();
     TQDomDocument &dom = *projectDom();
     TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" );
-    if ( environment.isEmpty() || !allEnvs.contains( environment ) )
+    if ( environment.isEmpty() || !allEnvs.tqcontains( environment ) )
         environment  = allEnvs[0];
     return environment;
 }
@@ -1510,11 +1510,11 @@ bool CustomProjectPart::isProjectFileType( const TQString& filename ) const
         re.setPattern( *it );
         int pos = re.search( filename );
         uint len = re.matchedLength();
-        if ((( *it ).find( "*" ) != -1 || ( *it ).find( "?" ) != -1 ) && pos + len == filename.length() )
+        if ((( *it ).tqfind( "*" ) != -1 || ( *it ).tqfind( "?" ) != -1 ) && pos + len == filename.length() )
             return true;
-        else if ( filename.find( "/" ) != -1 && filename.find( *it ) != -1 )
+        else if ( filename.tqfind( "/" ) != -1 && filename.tqfind( *it ) != -1 )
             return true;
-        else if ( filename.find( "/" ) == -1 && filename == *it )
+        else if ( filename.tqfind( "/" ) == -1 && filename == *it )
             return true;
     }
     return false;
@@ -1555,16 +1555,16 @@ bool CustomProjectPart::isInBlacklist( const TQString& path ) const
     TQStringList blacklist = this->blacklist();
     if ( !TQFileInfo( relpath ).isRelative() )
         relpath = relativeToProject( path );
-    if ( blacklist.find( relpath ) != blacklist.end() )
+    if ( blacklist.tqfind( relpath ) != blacklist.end() )
         return true;
     TQStringList paths = TQStringList::split( "/", relpath );
-    TQString parentpath;
+    TQString tqparentpath;
     for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it )
     {
-        parentpath += *it;
-        if ( blacklist.find( parentpath ) != blacklist.end() )
+        tqparentpath += *it;
+        if ( blacklist.tqfind( tqparentpath ) != blacklist.end() )
             return true;
-        parentpath = parentpath + "/";
+        tqparentpath = tqparentpath + "/";
     }
     return false;
 }
@@ -1607,7 +1607,7 @@ void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist )
             {
                 for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 )
                 {
-                    if ( it2.key().find( *it ) != -1 )
+                    if ( it2.key().tqfind( *it ) != -1 )
                     {
                         removeFromExcludes << *it;
                     }
@@ -1637,7 +1637,7 @@ void CustomProjectPart::setFiletypes( const TQStringList& l )
  */
 bool CustomProjectPart::isInProject( const TQString& fileName ) const
 {
-    return m_sourceFilesSet.contains( fileName );
+    return m_sourceFilesSet.tqcontains( fileName );
 }
 
 
diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h
index 288011e6..a31276f4 100644
--- a/buildtools/custommakefiles/customprojectpart.h
+++ b/buildtools/custommakefiles/customprojectpart.h
@@ -33,9 +33,10 @@ class KSelectAction;
 class CustomProjectPart : public KDevBuildTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomProjectPart( TQObject *parent, const char *name, const TQStringList & );
+    CustomProjectPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~CustomProjectPart();
 
     TQStringList allMakeEnvironments() const;
@@ -155,4 +156,4 @@ private:
 };
 
 #endif
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp
index a4c0db99..622d6012 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include "selectnewfilesdialogbase.h"
 
-SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* parent, const char* name )
-        : KDialogBase( parent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel )
+SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* tqparent, const char* name )
+        : KDialogBase( tqparent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel )
 {
     m_widget = new SelectNewFilesDialogBase(this);
     m_widget->fileView->header()->hide();
@@ -87,13 +87,13 @@ void SelectNewFilesDialog::addPath( TQCheckListItem* item, const TQString& path
     addPath(i, parts.join("/") );
 }
 
-TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, const TQString& name, int count )
+TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* tqparent, const TQString& name, int count )
 {
     TQCheckListItem::Type t = TQCheckListItem::CheckBox;
     if( count > 0 )
         t = TQCheckListItem::CheckBoxController;
 
-    if( parent == 0 )
+    if( tqparent == 0 )
     {
         TQListViewItem* item = m_widget->fileView->firstChild();
         while( item )
@@ -105,14 +105,14 @@ TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, cons
         return new TQCheckListItem( m_widget->fileView, name, t );
     }else
     {
-        TQListViewItem* item = parent->firstChild();
+        TQListViewItem* item = tqparent->firstChild();
         while( item )
         {
             if( item->text( 0 ) == name )
                 return static_cast<TQCheckListItem*>(item);
             item = item->nextSibling();
         }
-        return new TQCheckListItem( parent, name, t );
+        return new TQCheckListItem( tqparent, name, t );
     }
 }
 
@@ -128,4 +128,4 @@ TQStringList SelectNewFilesDialog::includedPaths() const
 
 #include "selectnewfilesdialog.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h
index cd9831ee..db0eee3d 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.h
+++ b/buildtools/custommakefiles/selectnewfilesdialog.h
@@ -21,9 +21,10 @@ class SelectNewFilesDialogBase;
 class SelectNewFilesDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SelectNewFilesDialog( TQStringList paths, TQWidget* parent = 0, const char* name = 0 );
+    SelectNewFilesDialog( TQStringList paths, TQWidget* tqparent = 0, const char* name = 0 );
     ~SelectNewFilesDialog();
 
     TQStringList excludedPaths() const;
@@ -50,4 +51,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
index fbd5b5ec..43c3280c 100644
--- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui
+++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SelectNewFilesDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SelectNewFilesDialogBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -43,7 +43,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp
index 2dfc3d84..aee38261 100644
--- a/buildtools/lib/base/kdevbuildtool.cpp
+++ b/buildtools/lib/base/kdevbuildtool.cpp
@@ -21,8 +21,8 @@
 #include <kdevmakefrontend.h>
 #include <kdevappfrontend.h>
 
-KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name)
-    :KDevProject(info, parent, name)
+KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name)
+    :KDevProject(info, tqparent, name)
 {
 }
 
diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h
index ff1abcc0..f1276f4a 100644
--- a/buildtools/lib/base/kdevbuildtool.h
+++ b/buildtools/lib/base/kdevbuildtool.h
@@ -29,7 +29,7 @@ class KDevAppFrontend;
 class KDevBuildTool: public KDevProject
 {
 public:
-    KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name);
+    KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name);
 
     /**@return The make frontend.*/
     KDevMakeFrontend *makeFrontend();
diff --git a/buildtools/lib/parsers/autotools/autotools.ll b/buildtools/lib/parsers/autotools/autotools.ll
index f05f8ff6..d6f2a9bb 100644
--- a/buildtools/lib/parsers/autotools/autotools.ll
+++ b/buildtools/lib/parsers/autotools/autotools.ll
@@ -98,7 +98,7 @@ rule              [\t]+[^\n]*
 
 <list>{id_list} {
 	yylval.value = yytext;
-	yylval.value = yylval.value.mid(0, yylval.value.findRev("\\"));
+	yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\"));
 	unput('\\');
 	BEGIN(INITIAL);
 	return (ID_LIST); 
diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy
index d76cc5fe..350fbd77 100644
--- a/buildtools/lib/parsers/autotools/autotools.yy
+++ b/buildtools/lib/parsers/autotools/autotools.yy
@@ -89,7 +89,7 @@ currently on the top in the stack.
  
 When a scope or function scope statement is parsed, the child ProjectAST is created
 and pushed onto the stack. Therefore all statements which belong to the scope
-or function scope are added as childs to their direct parent (scope or function scope).
+or function scope are added as childs to their direct tqparent (scope or function scope).
 */
 QValueStack<ProjectAST*> projects;
 
diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp
index d5f690b5..e534d74f 100644
--- a/buildtools/lib/parsers/autotools/autotools_lex.cpp
+++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp
@@ -539,8 +539,8 @@ at the left of the operator in assignments (like "SOURCES" in "SOURCES+=foo.cpp
 -id_list: those are "value list identifiers" at the right side in assignments
 (like "foo.cpp goo.cpp" in "SOURCES+=foo.cpp goo.cpp");
 -id_args: function arguments recognized as one identifier 
-(example: ""${QMAKE_FILE} is intended only for Windows!""
-in "!win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")" statements).
+(example: ""${TQMAKE_FILE} is intended only for Windows!""
+in "!win32-*:!wince-*:error("${TQMAKE_FILE} is intended only for Windows!")" statements).
 .
 
 To recognize those identifiers two additional start conditions are used: list and funcargs.
@@ -841,7 +841,7 @@ YY_RULE_SETUP
 #line 99 "autotools.ll"
 {
 	yylval.value = yytext;
-	yylval.value = yylval.value.mid(0, yylval.value.findRev("\\"));
+	yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\"));
 	unput('\\');
 	BEGIN(INITIAL);
 	return (ID_LIST); 
diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp
index 93cdb733..e0b92999 100644
--- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp
+++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp
@@ -204,7 +204,7 @@ currently on the top in the stack.
  
 When a scope or function scope statement is parsed, the child ProjectAST is created
 and pushed onto the stack. Therefore all statements which belong to the scope
-or function scope are added as childs to their direct parent (scope or function scope).
+or function scope are added as childs to their direct tqparent (scope or function scope).
 */
 TQValueStack<ProjectAST*> projects;
 
diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp
index ddcbddc3..f6ac032f 100644
--- a/buildtools/lib/parsers/autotools/autotoolsast.cpp
+++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp
@@ -28,7 +28,7 @@ namespace AutoTools {
 
 AST::~AST()
 {
-	for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
+	for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
 	{
 		AST *node = *it;
 		delete node;
@@ -37,13 +37,13 @@ AST::~AST()
 
 void AST::addChildAST(AST *node)
 {
-	m_children.append(node);
+	m_tqchildren.append(node);
 }
 
 void AST::writeBack(TQString &buffer)
 {
-	for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
-	     it != m_children.constEnd(); ++it)
+	for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin();
+	     it != m_tqchildren.constEnd(); ++it)
 	{
 		if (*it)
 			(*it)->writeBack(buffer);
@@ -60,12 +60,12 @@ TQString AST::indentation()
 
 bool AST::hasChildren() const
 {
-	return !m_children.isEmpty();
+	return !m_tqchildren.isEmpty();
 }
 
-TQValueList<AST*> AST::children() const
+TQValueList<AST*> AST::tqchildren() const
 {
-	return m_children;
+	return m_tqchildren;
 }
 
 //ProjectAST
diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h
index 768e3e07..e690baa4 100644
--- a/buildtools/lib/parsers/autotools/autotoolsast.h
+++ b/buildtools/lib/parsers/autotools/autotoolsast.h
@@ -37,7 +37,7 @@ namespace AutoTools
  * AST node.
  * This is the base class. Objects of this type are not created by the parser.
  *
- * Each AST node holds the list of its children which are always deleted in the
+ * Each AST node holds the list of its tqchildren which are always deleted in the
  * destructor. This way, it's possible call delete for only root AST node and
  * others will be deleted automatically.
  *
@@ -85,20 +85,20 @@ public:
 	/** @return The indentation string based on node depth.*/
 	virtual TQString indentation();
 	
-	//! \return true if this AST has children
+	//! \return true if this AST has tqchildren
 	bool hasChildren() const;
 
 	/**
-	 * Get the children of this ast
+	 * Get the tqchildren of this ast
 	 * \return the list of this ast's childre
 	 */
-	TQValueList<AST*> children() const;
+	TQValueList<AST*> tqchildren() const;
 
 
 	
 protected:
 	NodeType m_nodeType;
-	TQValueList<AST*> m_children;
+	TQValueList<AST*> m_tqchildren;
 	
 private:
 	int m_depth;
diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h
index 5f6ac7e7..8e29bec6 100644
--- a/buildtools/lib/parsers/autotools/autotoolsdriver.h
+++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h
@@ -20,8 +20,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QMAKEQMAKEDRIVER_H
-#define QMAKEQMAKEDRIVER_H
+#ifndef TQMAKETQMAKEDRIVER_H
+#define TQMAKETQMAKEDRIVER_H
 
 #include <tqvaluelist.h>
 #include <kurl.h>
@@ -56,12 +56,12 @@ public:
     static void walkAST(Op &op, const ProjectAST *ast)
     {
 //         op(ast);
-        for (TQValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin();
+        for (TQValueList<TQMake::AST*>::const_iterator it = ast->statements.constBegin();
                 it != ast->statements.constEnd(); ++it)
         {
             const AST *child = *it;
             if (child->nodeType() == AST::ProjectAST)
-                walkAST<Op>(op, static_cast<const QMake::ProjectAST*>(child));
+                walkAST<Op>(op, static_cast<const TQMake::ProjectAST*>(child));
             else
                 op(child);
         }
diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp
index 0dc8e733..66401c2c 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.cpp
+++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp
@@ -34,8 +34,8 @@
 
 using namespace AutoTools;
 
-Viewer::Viewer(TQWidget *parent, const char *name)
-    :ViewerBase(parent, name)
+Viewer::Viewer(TQWidget *tqparent, const char *name)
+    :ViewerBase(tqparent, name)
 {
     if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist"))
     {
@@ -46,7 +46,7 @@ Viewer::Viewer(TQWidget *parent, const char *name)
             files->insertItem(str.readLine());
     }
     ast->setSorting(-1);
-    parentProject.push((TQListViewItem*)0);
+    tqparentProject.push((TQListViewItem*)0);
 }
 
 void Viewer::addAll_clicked()
@@ -99,12 +99,12 @@ void Viewer::tabWidget2_selected(const TQString& text)
 void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 {
     TQListViewItem *projectIt;
-    if (!parentProject.top())
+    if (!tqparentProject.top())
         projectIt = new TQListViewItem(ast, "Project");
     else
     {
         if ( projectAST->isConditionalScope() || projectAST->isRule() )
-            projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID);
+            projectIt = new TQListViewItem(tqparentProject.top(), globAfter, projectAST->scopedID);
     }
     projectIt->setOpen(true);
     
@@ -128,7 +128,7 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 		{
 			AutomakeTargetAST* ata = static_cast<AutomakeTargetAST*>(ast);
 			TQListViewItem* item = new TQListViewItem(projectIt, after,
-					ata->target, TQString::null, ata->deps.join(""));
+					ata->target, TQString(), ata->deps.join(""));
 			after = item;
 		}
 		break;
@@ -145,14 +145,14 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 		{
 			ConditionAST* ata = static_cast<ConditionAST*>(ast);
 			TQListViewItem* item = new TQListViewItem(projectIt, after,
-					ata->type, ata->conditionName, TQString::null );
+					ata->type, ata->conditionName, TQString() );
 			after = item;
 		}
 	case AST::ProjectAST: {
 		ProjectAST *projectAST = static_cast<ProjectAST*>(ast);
-		parentProject.push(projectIt);
+		tqparentProject.push(projectIt);
 		processAST(projectAST, after);
-		parentProject.pop(); }
+		tqparentProject.pop(); }
 		break;
 	}
     }
diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h
index 5ee63c54..c0653020 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.h
+++ b/buildtools/lib/parsers/autotools/tests/viewer.h
@@ -30,8 +30,9 @@ class TQListViewItem;
 
 class Viewer: public ViewerBase {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    Viewer(TQWidget *parent = 0, const char *name = 0);
+    Viewer(TQWidget *tqparent = 0, const char *name = 0);
     void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0);
 public slots:
     virtual void tabWidget2_selected(const TQString&);
@@ -40,7 +41,7 @@ public slots:
     virtual void addAll_clicked();
 private:
     AutoTools::ProjectAST *projectAST;
-    TQValueStack<TQListViewItem *> parentProject;
+    TQValueStack<TQListViewItem *> tqparentProject;
 };
 
 #endif
diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp
index 380767a9..0fc5157b 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp
+++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
     app.setMainWidget(&viewer);
     viewer.show();
     viewer.resize(800, 600);
-    //viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized);
+    //viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized);
     
     return app.exec();
 }
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index 7c228299..75ed7559 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ViewerBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ViewerBase</cstring>
     </property>
@@ -19,15 +19,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
+        <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>source</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QTabWidget">
+                <widget class="TQTabWidget">
                     <property name="name">
                         <cstring>tabWidget2</cstring>
                     </property>
@@ -52,7 +52,7 @@
                             <verstretch>2</verstretch>
                         </sizepolicy>
                     </property>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>tab</cstring>
                         </property>
@@ -63,7 +63,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView" row="0" column="0">
+                            <widget class="TQListView" row="0" column="0">
                                 <column>
                                     <property name="text">
                                         <string>Name</string>
@@ -103,7 +103,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>tab</cstring>
                         </property>
@@ -114,7 +114,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTextEdit" row="0" column="0">
+                            <widget class="TQTextEdit" row="0" column="0">
                                 <property name="name">
                                     <cstring>writeBack</cstring>
                                 </property>
@@ -124,22 +124,22 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLineEdit" row="0" column="0">
+        <widget class="TQLineEdit" row="0" column="0">
             <property name="name">
                 <cstring>allLocation</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
                 </size>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="0">
+        <widget class="TQPushButton" row="1" column="0">
             <property name="name">
                 <cstring>addAll</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -149,11 +149,11 @@
                 <string>Add All From Directory</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="0">
+        <widget class="TQPushButton" row="2" column="0">
             <property name="name">
                 <cstring>choose</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -163,7 +163,7 @@
                 <string>Choose File to Add...</string>
             </property>
         </widget>
-        <widget class="QListBox" row="3" column="0">
+        <widget class="TQListBox" row="3" column="0">
             <property name="name">
                 <cstring>files</cstring>
             </property>
@@ -175,7 +175,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -210,11 +210,11 @@
         <slot>tabWidget2_selected(const QString&amp;)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>addAll_clicked()</slot>
     <slot>choose_clicked()</slot>
     <slot>files_currentChanged(QListBoxItem*)</slot>
     <slot>tabWidget2_selected(const QString&amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.hh
index 4da36b8a..41ec2015 100644
--- a/buildtools/lib/parsers/qmake/location.hh
+++ b/buildtools/lib/parsers/qmake/location.hh
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
@@ -34,7 +34,7 @@
 
 /**
  ** \file location.hh
- ** Define the QMake::location class.
+ ** Define the TQMake::location class.
  */
 
 #ifndef BISON_LOCATION_HH
@@ -44,7 +44,7 @@
 # include <string>
 # include "position.hh"
 
-namespace QMake
+namespace TQMake
 {
 
   /// Abstract a location.
diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.hh
index 704f0df4..63fe2d81 100644
--- a/buildtools/lib/parsers/qmake/position.hh
+++ b/buildtools/lib/parsers/qmake/position.hh
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
@@ -34,7 +34,7 @@
 
 /**
  ** \file position.hh
- ** Define the QMake::position class.
+ ** Define the TQMake::position class.
  */
 
 #ifndef BISON_POSITION_HH
@@ -43,7 +43,7 @@
 # include <iostream>
 # include <string>
 
-namespace QMake
+namespace TQMake
 {
   /// Abstract a position.
   class position
diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy
index e11c086d..75d306d0 100644
--- a/buildtools/lib/parsers/qmake/qmake.yy
+++ b/buildtools/lib/parsers/qmake/qmake.yy
@@ -90,7 +90,7 @@ currently on the top in the stack.
 
 When a scope or function scope statement is parsed, the child ProjectAST is created
 and pushed onto the stack. Therefore all statements which belong to the scope
-or function scope are added as childs to their direct parent (scope or function scope).
+or function scope are added as childs to their direct tqparent (scope or function scope).
 */
 //QValueStack<ProjectAST*> projects;
 
@@ -359,7 +359,7 @@ function_call : ID_SIMPLE LBRACE function_args RBRACE
             depth++;
 
             //qWarning("%s", $<value>1.ascii());
-            if ($<value>1.contains("include"))
+            if ($<value>1.tqcontains("include"))
             {
                 IncludeAST *includeAST = new IncludeAST();
                 includeAST->projectName = $<value>3;
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp
index 9fe37664..4d74571c 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp
@@ -398,7 +398,7 @@ int yyFlexLexer::yylex()
 	return 0;
 	}
 
-#define YY_DECL int QMake::Lexer::yylex()
+#define YY_DECL int TQMake::Lexer::yylex()
 
 /* %if-c-only Standard (non-C++) definition */
 /* %endif */
@@ -630,7 +630,7 @@ static yyconst flex_int16_t yy_rule_linenum[23] =
 
 /**
 @file qmake.ll
-QMake Lexer
+TQMake Lexer
 
 There are 3 types of identifiers recognized by this lexer:
 -id_simple: examples of such identifiers are qmake variables and scoped variables
@@ -638,8 +638,8 @@ at the left of the operator in assignments (like "SOURCES" in "SOURCES+=foo.cpp
 -id_list: those are "value list identifiers" at the right side in assignments
 (like "foo.cpp goo.cpp" in "SOURCES+=foo.cpp goo.cpp");
 -id_args: function arguments recognized as one identifier
-(example: ""${QMAKE_FILE} is intended only for Windows!""
-in "!win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")" statements).
+(example: ""${TQMAKE_FILE} is intended only for Windows!""
+in "!win32-*:!wince-*:error("${TQMAKE_FILE} is intended only for Windows!")" statements).
 .
 
 To recognize those identifiers two additional start conditions are used: list and funcargs.
@@ -1011,7 +1011,7 @@ YY_RULE_SETUP
 {
     BEGIN(vallist);
     mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
-    return Parser::token::token::QUOTED_VARIABLE_VALUE;
+    return Parser::token::token::TQUOTED_VARIABLE_VALUE;
 }
 	YY_BREAK
 case 9:
@@ -2202,14 +2202,14 @@ void yyfree (void * ptr )
 #line 203 "qmake.ll"
 
 
-namespace QMake
+namespace TQMake
 {
     Lexer::Lexer( std::istream* argin, std::ostream* argout )
         : yyFlexLexer(argin, argout), mylval(0), m_lineEnding(None)
     {
     }
 
-    int Lexer::yylex( QMake::Parser::semantic_type* yylval )
+    int Lexer::yylex( TQMake::Parser::semantic_type* yylval )
     {
         mylval = yylval;
         return yylex();
@@ -2231,7 +2231,7 @@ namespace QMake
     }
 }
 
-int QMakelex( QMake::Parser::semantic_type* yylval, QMake::Lexer* lexer)
+int TQMakelex( TQMake::Parser::semantic_type* yylval, TQMake::Lexer* lexer)
 {
     return lexer->yylex( yylval );
 }
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h
index 242cec2a..514631bf 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.h
+++ b/buildtools/lib/parsers/qmake/qmake_lex.h
@@ -1,4 +1,4 @@
-/* KDevelop QMake Support
+/* KDevelop TQMake Support
  *
  * Copyright 2007 Andreas Pakulat <apaku@gmx.de>
  *
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  */
-#ifndef QMAKE_LEX_H
-#define QMAKE_LEX_H
+#ifndef TQMAKE_LEX_H
+#define TQMAKE_LEX_H
 
 #include "qmake_yacc.hpp"
 #include <iostream>
@@ -27,23 +27,23 @@
 #include "FlexLexer.h"
 #endif
 
-namespace QMake
+namespace TQMake
 {
     class Lexer : public yyFlexLexer
     {
         public:
             enum LineEnding{ None, Unix, MacOS, Windows };
             Lexer( std::istream* argin = 0, std::ostream* argout = 0 );
-            int yylex( QMake::Parser::semantic_type* yylval );
+            int yylex( TQMake::Parser::semantic_type* yylval );
             int yylex();
             void setLineEndingFromString( const TQString& );
             LineEnding lineending();
         private:
-            QMake::Parser::semantic_type* mylval;
+            TQMake::Parser::semantic_type* mylval;
             LineEnding m_lineEnding;
     };
 }
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on
+// kate: space-indent on; indent-width 4; tab-width: 4; tqreplace-tabs on; auto-insert-doxygen on
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
index 32722979..718cb4f5 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
@@ -33,7 +33,7 @@
    version 2.2 of Bison.  */
 
 // Take the name prefix into account.
-#define yylex   QMakelex
+#define yylex   TQMakelex
 
 #include "qmake_yacc.hpp"
 
@@ -41,7 +41,7 @@
 
 
 /* Line 317 of lalr1.cc.  */
-#line 45 "qmake_yacc.cpp"
+#line 45 "tqmake_yacc.cpp"
 
 #ifndef YY_
 # if YYENABLE_NLS
@@ -100,7 +100,7 @@ do {					\
 #define YYABORT		goto yyabortlab
 #define YYERROR		goto yyerrorlab
 
-namespace QMake
+namespace TQMake
 {
 #if YYERROR_VERBOSE
 
@@ -144,7 +144,7 @@ namespace QMake
 #endif
 
   /// Build a parser object.
-  Parser::Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg)
+  Parser::Parser (TQMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg)
     : yydebug_ (false),
       yycdebug_ (&std::cerr),
       lexer (lexer_yyarg),
@@ -679,7 +679,7 @@ namespace QMake
             depth++;
 
             //qWarning("%s", $<value>1.ascii());
-            if ((yysemantic_stack_[(4) - (1)].value).contains("include"))
+            if ((yysemantic_stack_[(4) - (1)].value).tqcontains("include"))
             {
                 IncludeAST *includeAST = new IncludeAST();
                 includeAST->projectName = (yysemantic_stack_[(4) - (3)].value);
@@ -752,7 +752,7 @@ namespace QMake
 
 
     /* Line 675 of lalr1.cc.  */
-#line 756 "qmake_yacc.cpp"
+#line 756 "tqmake_yacc.cpp"
 	default: break;
       }
     YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
@@ -1089,7 +1089,7 @@ namespace QMake
     "$end", "error", "$undefined", "ID_SIMPLE", "EQ", "PLUSEQ", "MINUSEQ",
   "STAREQ", "TILDEEQ", "LBRACE", "RBRACE", "COLON", "NEWLINE", "COMMENT",
   "CONT", "COMMENT_CONT", "RCURLY", "LCURLY", "ID_ARGS",
-  "QUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE",
+  "TQUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE",
   "\"else\"", "$accept", "project", "@1", "statements", "statement",
   "variable_assignment", "possible_value", "multiline_values",
   "variable_value", "listws", "operator", "scope", "@2", "function_call",
@@ -1227,13 +1227,13 @@ namespace QMake
   const unsigned int Parser::yyuser_token_number_max_ = 278;
   const Parser::token_number_type Parser::yyundef_token_ = 2;
 
-} // namespace QMake
+} // namespace TQMake
 
 #line 421 "qmake.yy"
 
 
 
-namespace QMake
+namespace TQMake
 {
     void Parser::error(const location_type& /*l*/, const std::string& m)
     {
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp
index 91583cd3..0b67bb14 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
@@ -41,7 +41,7 @@
 #include <iostream>
 #include "stack.hh"
 
-namespace QMake
+namespace TQMake
 {
   class position;
   class location;
@@ -74,9 +74,9 @@ namespace QMake
 
 /**
 @file qmake.yy
-QMake Parser
+TQMake Parser
 
-Simple LALR parser which builds the syntax tree (see @ref QMake::AST).
+Simple LALR parser which builds the syntax tree (see @ref TQMake::AST).
 
 @todo Recognize comments after statements like:
 SOURCES = foo #regognize me
@@ -91,7 +91,7 @@ SOURCES = foo #regognize me
 
 #define YYSTYPE_IS_DECLARED
 
-namespace QMake
+namespace TQMake
 {
     class Lexer;
 
@@ -129,7 +129,7 @@ struct Result {
 typedef Result YYSTYPE;
 }
 
-extern int QMakelex( QMake::Result* yylval, QMake::Lexer* lexer );
+extern int TQMakelex( TQMake::Result* yylval, TQMake::Lexer* lexer );
 
 /**
 The stack to store ProjectAST pointers when a new child
@@ -141,7 +141,7 @@ currently on the top in the stack.
 
 When a scope or function scope statement is parsed, the child ProjectAST is created
 and pushed onto the stack. Therefore all statements which belong to the scope
-or function scope are added as childs to their direct parent (scope or function scope).
+or function scope are added as childs to their direct tqparent (scope or function scope).
 */
 //TQValueStack<ProjectAST*> projects;
 
@@ -202,7 +202,7 @@ do {							\
 } while (false)
 #endif
 
-namespace QMake
+namespace TQMake
 {
 
   /// A Bison parser.
@@ -238,7 +238,7 @@ namespace QMake
      RCURLY = 271,
      LCURLY = 272,
      ID_ARGS = 273,
-     QUOTED_VARIABLE_VALUE = 274,
+     TQUOTED_VARIABLE_VALUE = 274,
      VARIABLE_VALUE = 275,
      LIST_WS = 276,
      ENDOFFILE = 277
@@ -249,7 +249,7 @@ namespace QMake
     typedef token::yytokentype token_type;
 
     /// Build a parser object.
-    Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg);
+    Parser (TQMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg);
     virtual ~Parser ();
 
     /// Parse.
@@ -408,7 +408,7 @@ namespace QMake
 
 
     /* User arguments.  */
-    QMake::Lexer* lexer;
+    TQMake::Lexer* lexer;
     TQValueStack<ProjectAST*>& projects;
     int depth;
   };
diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp
index 91e48d2d..c551abef 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeast.cpp
@@ -21,34 +21,34 @@
 
 #include <kdebug.h>
 
-namespace QMake {
+namespace TQMake {
 
 //AST
 
 AST::~AST()
 {
-    for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
+    for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
     {
         AST *node = *it;
         delete node;
     }
-    m_children.clear();
+    m_tqchildren.clear();
 }
 
 void AST::addChildAST(AST *node)
 {
-    m_children.append(node);
+    m_tqchildren.append(node);
 }
 
 void AST::removeChildAST(AST *node)
 {
-    m_children.remove(node);
+    m_tqchildren.remove(node);
 }
 
 void AST::writeBack(TQString &buffer)
 {
-    for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
-        it != m_children.constEnd(); ++it)
+    for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin();
+        it != m_tqchildren.constEnd(); ++it)
     {
         if (*it)
         {
@@ -70,7 +70,7 @@ TQString AST::indentation()
 void ProjectAST::writeBack(TQString &buffer)
 {
     bool hasActualStatements = false;
-    for (TQValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it)
+    for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
     {
         if ((*it)->nodeType() != AST::IncludeAST)
         {
@@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer)
         if( !buffer.endsWith(": ") )
             buffer += indentation();
         buffer += scopedID;
-	if( m_children.count() == 1 )
+	if( m_tqchildren.count() == 1 )
 	    buffer += " : ";
         else
             buffer += " {";
@@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer)
         if( !buffer.endsWith(": ") )
             buffer += indentation();
         buffer += scopedID + "(" + args + ")";
-	if( m_children.count() == 1 && hasActualStatements )
+	if( m_tqchildren.count() == 1 && hasActualStatements )
             buffer += ": ";
-        else if( (m_children.count() > 0 && hasActualStatements) )
+        else if( (m_tqchildren.count() > 0 && hasActualStatements) )
             buffer += "{";
         else
             buffer += "";
@@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer)
     else if( !buffer.endsWith(": ") )
         buffer += indentation();
     AST::writeBack(buffer);
-    if (isScope() && m_children.count() > 1 )
+    if (isScope() && m_tqchildren.count() > 1 )
         buffer += indentation() + "}";
 
-    if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1)
+    if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1)
         buffer += indentation() + "}";
 }
 
@@ -165,6 +165,6 @@ void IncludeAST::writeBack(TQString &/*buffer*/)
 
 }
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
 
diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h
index 45aedb2e..e2abba70 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.h
+++ b/buildtools/lib/parsers/qmake/qmakeast.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QMAKEQMAKEAST_H
-#define QMAKEQMAKEAST_H
+#ifndef TQMAKETQMAKEAST_H
+#define TQMAKETQMAKEAST_H
 
 #include <tqstringlist.h>
 
@@ -27,13 +27,13 @@
 Abstract Syntax Tree (AST) class declarations.
 */
 
-namespace QMake {
+namespace TQMake {
 
 /**
 AST node.
 This is the base class. Objects of this type are not created by the parser.
 
-Each AST node holds the list of its children which are always deleted in the
+Each AST node holds the list of its tqchildren which are always deleted in the
 destructor. This way, it's possible call delete for only root AST node and
 others will be deleted automatically.
 
@@ -79,7 +79,7 @@ public:
     virtual TQString indentation();
 
     /**The list of child AST nodes.*/
-    TQValueList<AST*> m_children;
+    TQValueList<AST*> m_tqchildren;
 
 protected:
     NodeType m_nodeType;
diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
index 1f7e6cb6..b9470bd9 100644
--- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "qmakeastvisitor.h"
 
-namespace QMake {
+namespace TQMake {
 
 void ASTVisitor::processProject(ProjectAST *project)
 {
@@ -29,31 +29,31 @@ void ASTVisitor::processProject(ProjectAST *project)
         enterScope(project);
     else if (project->isFunctionScope())
         enterFunctionScope(project);
-    for (TQValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin();
-         it != project->m_children.constEnd(); ++it)
+    for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin();
+         it != project->m_tqchildren.constEnd(); ++it)
     {
         AST *ast = *it;
         if (ast == 0)
             continue;
         switch (ast->nodeType()) {
             case AST::AssignmentAST:
-                processAssignment(static_cast<QMake::AssignmentAST*>(ast));
+                processAssignment(static_cast<TQMake::AssignmentAST*>(ast));
                 break;
 
             case AST::NewLineAST:
-                processNewLine(static_cast<QMake::NewLineAST*>(ast));
+                processNewLine(static_cast<TQMake::NewLineAST*>(ast));
                 break;
 
             case AST::CommentAST:
-                processComment(static_cast<QMake::CommentAST*>(ast));
+                processComment(static_cast<TQMake::CommentAST*>(ast));
                 break;
 
             case AST::ProjectAST:
-                processProject(static_cast<QMake::ProjectAST*>(ast));
+                processProject(static_cast<TQMake::ProjectAST*>(ast));
                 break;
 
             case AST::IncludeAST:
-                processInclude(static_cast<QMake::IncludeAST*>(ast));
+                processInclude(static_cast<TQMake::IncludeAST*>(ast));
                 break;
         }
     }
diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.h b/buildtools/lib/parsers/qmake/qmakeastvisitor.h
index 3db9d14d..6978074c 100644
--- a/buildtools/lib/parsers/qmake/qmakeastvisitor.h
+++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.h
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QMAKEQMAKEASTVISITOR_H
-#define QMAKEQMAKEASTVISITOR_H
+#ifndef TQMAKETQMAKEASTVISITOR_H
+#define TQMAKETQMAKEASTVISITOR_H
 
 #include "qmakeast.h"
 
-namespace QMake {
+namespace TQMake {
 
 class ASTVisitor{
 public:
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index e2d93ef8..09256178 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -30,7 +30,7 @@
 #include "qmake_lex.h"
 #include "qmake_yacc.hpp"
 
-namespace QMake {
+namespace TQMake {
 
 int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug)
 {
@@ -52,15 +52,15 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug)
     (*ast)->setFileName(fileName);
     switch( l.lineending() )
     {
-        case QMake::Lexer::Windows:
-            (*ast)->setLineEnding(QMake::ProjectAST::Windows);
+        case TQMake::Lexer::Windows:
+            (*ast)->setLineEnding(TQMake::ProjectAST::Windows);
             break;
-        case QMake::Lexer::MacOS:
-            (*ast)->setLineEnding(QMake::ProjectAST::MacOS);
+        case TQMake::Lexer::MacOS:
+            (*ast)->setLineEnding(TQMake::ProjectAST::MacOS);
             break;
-        case QMake::Lexer::Unix:
+        case TQMake::Lexer::Unix:
         default:
-            (*ast)->setLineEnding(QMake::ProjectAST::Unix);
+            (*ast)->setLineEnding(TQMake::ProjectAST::Unix);
             break;
     }
     return ret;
@@ -96,15 +96,15 @@ int Driver::parseString( const char* string, ProjectAST **ast, int debug )
     (*ast)->setFileName("");
     switch( l.lineending() )
     {
-        case QMake::Lexer::Windows:
-            (*ast)->setLineEnding(QMake::ProjectAST::Windows);
+        case TQMake::Lexer::Windows:
+            (*ast)->setLineEnding(TQMake::ProjectAST::Windows);
             break;
-        case QMake::Lexer::MacOS:
-            (*ast)->setLineEnding(QMake::ProjectAST::MacOS);
+        case TQMake::Lexer::MacOS:
+            (*ast)->setLineEnding(TQMake::ProjectAST::MacOS);
             break;
-        case QMake::Lexer::Unix:
+        case TQMake::Lexer::Unix:
         default:
-            (*ast)->setLineEnding(QMake::ProjectAST::Unix);
+            (*ast)->setLineEnding(TQMake::ProjectAST::Unix);
             break;
     }
     return ret;
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.h b/buildtools/lib/parsers/qmake/qmakedriver.h
index 918054fa..ee56f388 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.h
+++ b/buildtools/lib/parsers/qmake/qmakedriver.h
@@ -17,13 +17,13 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QMAKEQMAKEDRIVER_H
-#define QMAKEQMAKEDRIVER_H
+#ifndef TQMAKETQMAKEDRIVER_H
+#define TQMAKETQMAKEDRIVER_H
 
 class TQString;
 class KURL;
 
-namespace QMake {
+namespace TQMake {
 
 /**
 @file qmakedriver.h
diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.hh
index b81e4a28..07f71922 100644
--- a/buildtools/lib/parsers/qmake/stack.hh
+++ b/buildtools/lib/parsers/qmake/stack.hh
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
@@ -37,7 +37,7 @@
 
 #include <deque>
 
-namespace QMake
+namespace TQMake
 {
   template <class T, class S = std::deque<T> >
   class stack
diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp
index 6f1d5956..5dd417db 100644
--- a/buildtools/lib/parsers/qmake/tests/runner.cpp
+++ b/buildtools/lib/parsers/qmake/tests/runner.cpp
@@ -21,8 +21,8 @@
 #include <cstdlib>
 #include <iostream>
 #include <stdio.h>
-#include "qmakedriver.h"
-#include "qmakeastvisitor.h"
+#include "tqmakedriver.h"
+#include "tqmakeastvisitor.h"
 
 #include <tqstring.h>
 
@@ -34,92 +34,92 @@ static const KCmdLineOptions options[] =
 {
     {"silent", "Enable Parser debug output", 0},
     {"!debug", "Disable output of the generated AST", 0},
-    {"!+files", "QMake project files", 0}
+    {"!+files", "TQMake project files", 0}
 };
 
 
-class PrintAST : QMake::ASTVisitor
+class PrintAST : TQMake::ASTVisitor
 {
 public:
-  PrintAST() : QMake::ASTVisitor()
+  PrintAST() : TQMake::ASTVisitor()
   {
       indent = 0;
   }
 
-  virtual void processProject( QMake::ProjectAST* p )
+  virtual void processProject( TQMake::ProjectAST* p )
   {
-      QMake::ASTVisitor::processProject(p);
+      TQMake::ASTVisitor::processProject(p);
   }
 private:
-  virtual void enterRealProject( QMake::ProjectAST* p )
+  virtual void enterRealProject( TQMake::ProjectAST* p )
   {
       kdDebug(9024) << getIndent() << "--------- Entering Project: " << replaceWs(p->fileName()) << "| LineEnding:" << p->lineEnding() << " --------------" << endl;
       indent += 4;
-      QMake::ASTVisitor::enterRealProject(p);
+      TQMake::ASTVisitor::enterRealProject(p);
   }
 
-  virtual void leaveRealProject( QMake::ProjectAST* p )
+  virtual void leaveRealProject( TQMake::ProjectAST* p )
   {
       indent -= 4;
       kdDebug(9024) << getIndent() << "--------- Leaving Project: " << replaceWs(p->fileName()) << " --------------" << endl;
-      QMake::ASTVisitor::leaveRealProject(p);
+      TQMake::ASTVisitor::leaveRealProject(p);
   }
 
-  virtual void enterScope( QMake::ProjectAST* p )
+  virtual void enterScope( TQMake::ProjectAST* p )
   {
       kdDebug(9024) << getIndent() << "--------- Entering Scope: " << replaceWs(p->scopedID) << " --------------" << endl;
       indent += 4;
-      QMake::ASTVisitor::enterScope(p);
+      TQMake::ASTVisitor::enterScope(p);
   }
 
-  virtual void leaveScope( QMake::ProjectAST* p )
+  virtual void leaveScope( TQMake::ProjectAST* p )
   {
       indent -= 4;
       kdDebug(9024) << getIndent() << "--------- Leaving Scope: " << replaceWs(p->scopedID) << " --------------" << endl;
-      QMake::ASTVisitor::leaveScope(p);
+      TQMake::ASTVisitor::leaveScope(p);
   }
 
-  virtual void enterFunctionScope( QMake::ProjectAST* p )
+  virtual void enterFunctionScope( TQMake::ProjectAST* p )
   {
       kdDebug(9024) << getIndent() << "--------- Entering FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl;
       indent += 4;
-      QMake::ASTVisitor::enterFunctionScope(p);
+      TQMake::ASTVisitor::enterFunctionScope(p);
   }
 
-  virtual void leaveFunctionScope( QMake::ProjectAST* p )
+  virtual void leaveFunctionScope( TQMake::ProjectAST* p )
   {
       indent -= 4;
       kdDebug(9024) << getIndent() << "--------- Leaving FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl;
-      QMake::ASTVisitor::leaveFunctionScope(p);
+      TQMake::ASTVisitor::leaveFunctionScope(p);
   }
 
   TQString replaceWs(TQString s)
   {
-      return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc");
+      return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc");
   }
 
-  virtual void processAssignment( QMake::AssignmentAST* a)
+  virtual void processAssignment( TQMake::AssignmentAST* a)
   {
       kdDebug(9024) << getIndent() << "Assignment(" << replaceWs(a->indent) << "):" << replaceWs(a->scopedID) << " " << replaceWs(a->op) << " " << replaceWs(a->values.join("|")) << endl;
-      QMake::ASTVisitor::processAssignment(a);
+      TQMake::ASTVisitor::processAssignment(a);
   }
 
-  virtual void processNewLine( QMake::NewLineAST* n)
+  virtual void processNewLine( TQMake::NewLineAST* n)
   {
       kdDebug(9024) << getIndent() << "Newline " << endl;
-      QMake::ASTVisitor::processNewLine(n);
+      TQMake::ASTVisitor::processNewLine(n);
   }
 
-  virtual void processComment( QMake::CommentAST* a)
+  virtual void processComment( TQMake::CommentAST* a)
   {
       kdDebug(9024) << getIndent() << "Comment: " << replaceWs(a->comment) << endl;
-      QMake::ASTVisitor::processComment(a);
+      TQMake::ASTVisitor::processComment(a);
   }
 
-  virtual void processInclude( QMake::IncludeAST* a)
+  virtual void processInclude( TQMake::IncludeAST* a)
   {
       kdDebug(9024) << getIndent() << "Include: " << replaceWs(a->projectName) << endl;
-      QMake::ASTVisitor::processInclude(a);
+      TQMake::ASTVisitor::processInclude(a);
   }
 
   TQString getIndent()
@@ -133,7 +133,7 @@ private:
 };
 int main(int argc, char *argv[])
 {
-  KCmdLineArgs::init( argc, argv, "QMake Parser", "qmake-parser", "Parse QMake project files", "1.0.0");
+  KCmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0");
     KCmdLineArgs::addCmdLineOptions(options);
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -152,8 +152,8 @@ int main(int argc, char *argv[])
         debug = 1;
     for( int i = 0 ; i < args->count() ; i++ )
     {
-        QMake::ProjectAST *projectAST;
-        int ret = QMake::Driver::parseFile(args->url(i).path(), &projectAST, debug);
+        TQMake::ProjectAST *projectAST;
+        int ret = TQMake::Driver::parseFile(args->url(i).path(), &projectAST, debug);
         PrintAST pa;
         if ( ret == 0 )
             if ( !silent )
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
                 pa.processProject(projectAST);
                 TQString profile;
                 projectAST->writeBack(profile);
-                kdDebug(9024) << "QMake file written back:\n" << profile << endl;
+                kdDebug(9024) << "TQMake file written back:\n" << profile << endl;
             }
         return ret;
     }
diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp
index 4583ab11..6f1e5f25 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer.cpp
+++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp
@@ -29,14 +29,14 @@
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 
-#include <qmakeast.h>
-#include <qmakedriver.h>
-#include <qmakeastvisitor.h>
+#include <tqmakeast.h>
+#include <tqmakedriver.h>
+#include <tqmakeastvisitor.h>
 
-using namespace QMake;
+using namespace TQMake;
 
-Viewer::Viewer(TQWidget *parent, const char *name)
-    :ViewerBase(parent, name), projectAST(0)
+Viewer::Viewer(TQWidget *tqparent, const char *name)
+    :ViewerBase(tqparent, name), projectAST(0)
 {
     if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist"))
     {
@@ -47,7 +47,7 @@ Viewer::Viewer(TQWidget *parent, const char *name)
             files->insertItem(str.readLine());
     }
     ast->setSorting(-1);
-//    parentProject.push((TQListViewItem*)0);
+//    tqparentProject.push((TQListViewItem*)0);
 }
 
 void Viewer::addAll_clicked()
@@ -78,7 +78,7 @@ void Viewer::files_currentChanged(TQListBoxItem* item)
     source->setText(str.read());
     f.close();
 
-    int result = QMake::Driver::parseFile(item->text().ascii(), &projectAST, 0);
+    int result = TQMake::Driver::parseFile(item->text().ascii(), &projectAST, 0);
     if (projectAST && (result == 0))
     {
         processAST(projectAST);
@@ -102,7 +102,7 @@ public:
     ViewerVisitor(Viewer *v): ASTVisitor()
     {
         this->v = v;
-        parentProject.push((TQListViewItem*)0);
+        tqparentProject.push((TQListViewItem*)0);
     }
 
     virtual void processProject(ProjectAST *project)
@@ -113,39 +113,39 @@ public:
     virtual void enterRealProject(ProjectAST *project)
     {
         TQListViewItem *projectIt;
-        if (!parentProject.top())
+        if (!tqparentProject.top())
         {
             projectIt = new TQListViewItem(v->ast, "Project");
             projectIt->setOpen(true);
-            parentProject.push(projectIt);
+            tqparentProject.push(projectIt);
         }
 
         ASTVisitor::enterRealProject(project);
     }
     virtual void enterScope(ProjectAST *scope)
     {
-        TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope");
-        parentProject.push(projectIt);
+        TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), scope->scopedID, "scope");
+        tqparentProject.push(projectIt);
         ASTVisitor::enterScope(scope);
     }
     virtual void leaveScope(ProjectAST *scope)
     {
-        parentProject.pop();
+        tqparentProject.pop();
     }
     virtual void enterFunctionScope(ProjectAST *fscope)
     {
-        TQListViewItem *projectIt = new TQListViewItem(parentProject.top(),
+        TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(),
             fscope->scopedID + "(" + fscope->args + ")", "function scope");
-        parentProject.push(projectIt);
+        tqparentProject.push(projectIt);
         ASTVisitor::enterFunctionScope(fscope);
     }
     virtual void leaveFunctionScope(ProjectAST *fscope)
     {
-        parentProject.pop();
+        tqparentProject.pop();
     }
     virtual void processAssignment(AssignmentAST *assignment)
     {
-        TQListViewItem *item = new TQListViewItem(parentProject.top(),
+        TQListViewItem *item = new TQListViewItem(tqparentProject.top(),
                 assignment->scopedID, assignment->op, assignment->values.join("|"),
                 "assignment");
         item->setMultiLinesEnabled(true);
@@ -154,26 +154,26 @@ public:
     }
     virtual void processNewLine(NewLineAST *newline)
     {
-        new TQListViewItem(parentProject.top(), "<newline>");
+        new TQListViewItem(tqparentProject.top(), "<newline>");
         ASTVisitor::processNewLine(newline);
     }
     virtual void processComment(CommentAST *comment)
     {
-        new TQListViewItem(parentProject.top(), "<comment>");
+        new TQListViewItem(tqparentProject.top(), "<comment>");
         ASTVisitor::processComment(comment);
     }
     virtual void processInclude(IncludeAST *include)
     {
-        new TQListViewItem(parentProject.top(), "<include>", include->projectName);
-        QMake::ASTVisitor::processInclude(include);
+        new TQListViewItem(tqparentProject.top(), "<include>", include->projectName);
+        TQMake::ASTVisitor::processInclude(include);
     }
 
     Viewer *v;
-    TQValueStack<TQListViewItem *> parentProject;
+    TQValueStack<TQListViewItem *> tqparentProject;
 };
 
 
-void Viewer::processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter)
+void Viewer::processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter)
 {
     ViewerVisitor visitor(this);
     visitor.processProject(projectAST);
diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h
index bba85b1f..28a7613c 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer.h
+++ b/buildtools/lib/parsers/qmake/tests/viewer.h
@@ -24,7 +24,7 @@
 
 #include "viewerbase.h"
 
-namespace QMake {
+namespace TQMake {
 class ProjectAST;
 }
 
@@ -32,16 +32,17 @@ class TQListViewItem;
 
 class Viewer: public ViewerBase {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    Viewer(TQWidget *parent = 0, const char *name = 0);
-    void processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0);
+    Viewer(TQWidget *tqparent = 0, const char *name = 0);
+    void processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0);
 public slots:
     virtual void tabWidget2_selected(const TQString&);
     virtual void files_currentChanged(TQListBoxItem*);
     virtual void choose_clicked();
     virtual void addAll_clicked();
 private:
-    QMake::ProjectAST *projectAST;
+    TQMake::ProjectAST *projectAST;
     friend class ViewerVisitor;
 };
 
diff --git a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp
index c31ea02c..199b106d 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp
+++ b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
     Viewer viewer;
     app.setMainWidget(&viewer);
     viewer.show();
-    viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized);
+    viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized);
     
     return app.exec();
 }
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index 976d4d0f..c37f41bf 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ViewerBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ViewerBase</cstring>
     </property>
@@ -19,37 +19,37 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QSplitter" row="0" column="0">
+        <widget class="TQSplitter" row="0" column="0">
             <property name="name">
                 <cstring>splitter5</cstring>
             </property>
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="QLayoutWidget">
+            <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout4</cstring>
+                    <cstring>tqlayout4</cstring>
                 </property>
                 <vbox>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLineEdit">
+                    <widget class="TQLineEdit">
                         <property name="name">
                             <cstring>allLocation</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
                             </size>
                         </property>
                     </widget>
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>addAll</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -59,11 +59,11 @@
                             <string>Add All From Directory</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>choose</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -73,7 +73,7 @@
                             <string>Choose File to Add...</string>
                         </property>
                     </widget>
-                    <widget class="QListBox">
+                    <widget class="TQListBox">
                         <property name="name">
                             <cstring>files</cstring>
                         </property>
@@ -85,7 +85,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -97,14 +97,14 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QSplitter">
+            <widget class="TQSplitter">
                 <property name="name">
                     <cstring>splitter2</cstring>
                 </property>
                 <property name="orientation">
                     <enum>Vertical</enum>
                 </property>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>source</cstring>
                     </property>
@@ -117,7 +117,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QTabWidget">
+                <widget class="TQTabWidget">
                     <property name="name">
                         <cstring>tabWidget2</cstring>
                     </property>
@@ -129,7 +129,7 @@
                             <verstretch>2</verstretch>
                         </sizepolicy>
                     </property>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>tab</cstring>
                         </property>
@@ -140,7 +140,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView" row="0" column="0">
+                            <widget class="TQListView" row="0" column="0">
                                 <column>
                                     <property name="text">
                                         <string>Name</string>
@@ -191,7 +191,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>tab</cstring>
                         </property>
@@ -202,7 +202,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTextEdit" row="0" column="0">
+                            <widget class="TQTextEdit" row="0" column="0">
                                 <property name="name">
                                     <cstring>writeBack</cstring>
                                 </property>
@@ -240,11 +240,11 @@
         <slot>tabWidget2_selected(const QString&amp;)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>addAll_clicked()</slot>
     <slot>choose_clicked()</slot>
     <slot>files_currentChanged( QListBoxItem * )</slot>
     <slot>tabWidget2_selected( const QString &amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index 89d7f655..333cf78d 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -28,8 +28,8 @@
 #include "addenvvardlg.h"
 
 
-AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
-    : TQDialog(parent, name, true)
+AddEnvvarDialog::AddEnvvarDialog(TQWidget *tqparent, const char *name)
+    : TQDialog(tqparent, name, true)
 {
     setCaption(i18n("Add Environment Variable"));
 
@@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
 
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    layout->addLayout(grid);
+    tqlayout->addLayout(grid);
     grid->addWidget(varname_label, 0, 0);
     grid->addWidget(varname_edit, 0, 1);
     grid->addWidget(value_label, 1, 0);
@@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    layout->addWidget(frame, 0);
+    tqlayout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
     slotTextChanged();
 }
 
diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h
index 9f072cfb..af2abf54 100644
--- a/buildtools/lib/widgets/addenvvardlg.h
+++ b/buildtools/lib/widgets/addenvvardlg.h
@@ -27,12 +27,13 @@ class TQPushButton;
 /**
 Dialog to add environment variables.
 */
-class AddEnvvarDialog : public QDialog
+class AddEnvvarDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AddEnvvarDialog( TQWidget *parent=0, const char *name=0 );
+    AddEnvvarDialog( TQWidget *tqparent=0, const char *name=0 );
     ~AddEnvvarDialog();
 
     TQString varname() const
diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index f5a1fa92..d7489a56 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -25,8 +25,8 @@
 #include "addfilesdialog.moc"
 
 AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
-    TQWidget *parent, const char *name, bool modal):
-    KFileDialog(startDir, filter, parent, name, modal)
+    TQWidget *tqparent, const char *name, bool modal):
+    KFileDialog(startDir, filter, tqparent, name, modal)
 {
     KConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
@@ -45,8 +45,8 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
 
 
 AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
-    TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget):
-    KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget)
+    TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget):
+    KFileDialog(startDir, filter, tqparent, name, modal, extraWidget), m_extraWidget(extraWidget)
 {
     KConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h
index c66532e5..c81abd23 100644
--- a/buildtools/lib/widgets/addfilesdialog.h
+++ b/buildtools/lib/widgets/addfilesdialog.h
@@ -34,14 +34,15 @@ with the relative path (e.g. ../../dir/filename)
 class AddFilesDialog : public KFileDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum Mode { Copy, Link, Relative };
 
     AddFilesDialog(const TQString& startDir, const TQString& filter,
-               TQWidget *parent, const char *name, bool modal);
+               TQWidget *tqparent, const char *name, bool modal);
 
     AddFilesDialog(const TQString& startDir, const TQString& filter,
-               TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget);
+               TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget);
 
     virtual ~AddFilesDialog();
 
diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp
index 1a809459..f23d7602 100644
--- a/buildtools/lib/widgets/environmentdisplaydialog.cpp
+++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp
@@ -25,8 +25,8 @@
 
 extern char **environ;
 
-EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl)
-: EnvironmentDisplayDialogBase(parent,name, modal,fl)
+EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: EnvironmentDisplayDialogBase(tqparent,name, modal,fl)
 {
 	TQStringList environment;
 	char ** e = ::environ;
diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h
index 3458ba78..0e0ce5a3 100644
--- a/buildtools/lib/widgets/environmentdisplaydialog.h
+++ b/buildtools/lib/widgets/environmentdisplaydialog.h
@@ -26,9 +26,10 @@
 class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 	
 public:
-	EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	EnvironmentDisplayDialog(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 };
 
 #endif
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index 8b41862f..41d8d4e6 100644
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>EnvironmentDisplayDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>EnvironmentDisplayDialogBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -59,9 +59,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -77,14 +77,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>321</width>
                             <height>21</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>closeButton</cstring>
                     </property>
@@ -104,7 +104,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp
index 3c3e448f..2e2be1f3 100644
--- a/buildtools/lib/widgets/environmentvariableswidget.cpp
+++ b/buildtools/lib/widgets/environmentvariableswidget.cpp
@@ -67,8 +67,8 @@ void EnvironmentVariablesWidget::removeVarClicked()
 
 
 EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup,
-                                   TQWidget *parent, const char *name)
-    : EnvironmentVariablesWidgetBase(parent, name),
+                                   TQWidget *tqparent, const char *name)
+    : EnvironmentVariablesWidgetBase(tqparent, name),
       m_dom(dom), m_configGroup(configGroup)
 {
     readEnvironment(dom, configGroup);
diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h
index f2c00b52..c70aa81f 100644
--- a/buildtools/lib/widgets/environmentvariableswidget.h
+++ b/buildtools/lib/widgets/environmentvariableswidget.h
@@ -31,10 +31,11 @@ Environment variables widget.
 class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup,
-                       TQWidget *parent=0, const char *name=0 );
+                       TQWidget *tqparent=0, const char *name=0 );
     ~EnvironmentVariablesWidget();
 
     /// read in a set of environment variables from the DOM document
diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
index d16cc613..9c8f9077 100644
--- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui
+++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>EnvironmentVariablesWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EnvironmentVariablesWidgetBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="6" colspan="1">
+        <widget class="TQListView" row="0" column="0" rowspan="6" colspan="1">
             <column>
                 <property name="text">
                     <string>Name</string>
@@ -63,7 +63,7 @@
                 <enum>AllColumns</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>removevar_button</cstring>
             </property>
@@ -79,7 +79,7 @@
                 <string>&amp;Remove</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>editvar_button</cstring>
             </property>
@@ -95,7 +95,7 @@
                 <string>&amp;Edit</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>addvar_button</cstring>
             </property>
@@ -121,14 +121,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>environmentButton</cstring>
             </property>
@@ -146,7 +146,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>171</height>
@@ -189,12 +189,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>addVarClicked()</slot>
     <slot>removeVarClicked()</slot>
     <slot>editVarClicked()</slot>
     <slot>environmentClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp
index 71c44377..7c3a115f 100644
--- a/buildtools/lib/widgets/envvartools.cpp
+++ b/buildtools/lib/widgets/envvartools.cpp
@@ -23,7 +23,7 @@
 TQString EnvVarTools::quote( const TQString & arg )
 {
     TQString res = arg;
-    res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''"));
+    res.tqreplace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''"));
     res.prepend("\"");
     res.append("\"");
     return res;
diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp
index ef901cc8..2058152e 100644
--- a/buildtools/lib/widgets/makeoptionswidget.cpp
+++ b/buildtools/lib/widgets/makeoptionswidget.cpp
@@ -29,8 +29,8 @@
 #include "environmentvariableswidget.h"
 
 MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup,
-                                   TQWidget *parent, const char *name)
-    : MakeOptionsWidgetBase(parent, name),
+                                   TQWidget *tqparent, const char *name)
+    : MakeOptionsWidgetBase(tqparent, name),
       m_dom(dom), m_configGroup(configGroup)
 {
     env_var_group->setColumnLayout( 1, Qt::Vertical );
diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h
index 0cd962c3..14635b49 100644
--- a/buildtools/lib/widgets/makeoptionswidget.h
+++ b/buildtools/lib/widgets/makeoptionswidget.h
@@ -32,10 +32,11 @@ Make options widget.
 class MakeOptionsWidget : public MakeOptionsWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup,
-                       TQWidget *parent=0, const char *name=0 );
+                       TQWidget *tqparent=0, const char *name=0 );
     ~MakeOptionsWidget();
 
 public slots:
diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui
index 4bddebd1..91e77362 100644
--- a/buildtools/lib/widgets/makeoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MakeOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>make_options_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="6">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>abort_box</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <string>&amp;Abort on first error</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="6">
+        <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>dontact_box</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <string>Onl&amp;y display commands without actually executing them</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="6">
+        <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>env_var_group</cstring>
             </property>
@@ -43,7 +43,7 @@
                 <string>Environment &amp;Variables</string>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>makebin_label</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <cstring>makebin_edit</cstring>
             </property>
         </widget>
-        <widget class="QSpinBox" row="4" column="4">
+        <widget class="TQSpinBox" row="4" column="4">
             <property name="name">
                 <cstring>jobs_box</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <number>1</number>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="1" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>121</width>
                     <height>20</height>
@@ -122,14 +122,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="6">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>runMultiJobs</cstring>
             </property>
@@ -137,7 +137,7 @@
                 <string>Run more than one &amp;job at a time</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>prio_label</cstring>
             </property>
@@ -145,7 +145,7 @@
                 <string>Make priority:</string>
             </property>
         </widget>
-        <widget class="QSpinBox" row="2" column="2">
+        <widget class="TQSpinBox" row="2" column="2">
             <property name="name">
                 <cstring>prio_box</cstring>
             </property>
@@ -189,6 +189,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp
index 4a41ff88..8de6d45c 100644
--- a/buildtools/lib/widgets/removesubprojectdialog.cpp
+++ b/buildtools/lib/widgets/removesubprojectdialog.cpp
@@ -20,8 +20,8 @@
 #include <tqlabel.h>
 #include "removesubprojectdialog.h"
 
-RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl)
-    : RemoveSubprojectDlgBase(parent,name, modal,fl)
+RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    : RemoveSubprojectDlgBase(tqparent,name, modal,fl)
 {
     setCaption(caption);
     removeLabel->setText(question);
diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h
index 593309fe..49be23b8 100644
--- a/buildtools/lib/widgets/removesubprojectdialog.h
+++ b/buildtools/lib/widgets/removesubprojectdialog.h
@@ -28,9 +28,10 @@ Subproject removal dialog.
 class RemoveSubprojectDialog : public RemoveSubprojectDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~RemoveSubprojectDialog();
   /*$PUBLIC_FUNCTIONS$*/
   bool removeFromDisk();
diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui
index cd36b6ff..a89b9107 100644
--- a/buildtools/lib/widgets/removesubprojectdlgbase.ui
+++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>RemoveSubprojectDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>RemoveSubprojectDlgBase</cstring>
     </property>
@@ -19,17 +19,17 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>140</height>
@@ -45,7 +45,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>removeLabel</cstring>
                     </property>
@@ -53,7 +53,7 @@
                         <string>[REMOVE QUESTION]</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>removeCheckBox</cstring>
                     </property>
@@ -61,11 +61,11 @@
                         <string>Also &amp;remove it from disk</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>noticeLabel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -77,7 +77,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>buttonLayout</cstring>
             </property>
@@ -98,14 +98,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeButton</cstring>
                     </property>
@@ -116,7 +116,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -145,10 +145,10 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>accept()</slot>
     <slot>reject()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp
index 9aecbe17..03c75586 100644
--- a/buildtools/lib/widgets/runoptionswidget.cpp
+++ b/buildtools/lib/widgets/runoptionswidget.cpp
@@ -39,8 +39,8 @@
 
 
 RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup,
-                                    const TQString &buildDirectory, TQWidget *parent, const char *name)
-    : RunOptionsWidgetBase(parent, name),
+                                    const TQString &buildDirectory, TQWidget *tqparent, const char *name)
+    : RunOptionsWidgetBase(tqparent, name),
       m_dom(dom), m_configGroup(configGroup)
 {
     // Create the "Environment Variables" GUI
diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h
index 02c38f35..304ce870 100644
--- a/buildtools/lib/widgets/runoptionswidget.h
+++ b/buildtools/lib/widgets/runoptionswidget.h
@@ -33,12 +33,13 @@ Run options widget.
 class RunOptionsWidget : public RunOptionsWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     RunOptionsWidget( TQDomDocument &dom,             //!< document DOM
                       const TQString &configGroup,    //!< configuration group
                       const TQString &buildDirectory, //!< project build directory
-                      TQWidget *parent=0,             //!< parent widget
+                      TQWidget *tqparent=0,             //!< tqparent widget
                       const char *name=0             //!< widget's name
                        );
     ~RunOptionsWidget();
diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 1163484c..3dbb74ca 100644
--- a/buildtools/lib/widgets/runoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/runoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>RunOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>run_options_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>mainProgramGroupBox</cstring>
             </property>
@@ -44,14 +44,14 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>notelabel</cstring>
                     </property>
                     <property name="text">
                         <string>Note: These options override target specific settings.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -66,7 +66,7 @@
                         <string>The command line arguments passed to the main program when run</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>mainprogram_label_2</cstring>
                     </property>
@@ -77,7 +77,7 @@
                         <cstring>mainprogram_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>mainprogram_label</cstring>
                     </property>
@@ -96,7 +96,7 @@
                         <string>Full path to the executable</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>mainprogram_label_3</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>The command line arguments passed to the main program when debugged</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>mainprogram_label_3_2</cstring>
                     </property>
@@ -136,7 +136,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -155,7 +155,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>autocompile_box</cstring>
                     </property>
@@ -166,7 +166,7 @@
                         <string>If the program is not up-to-date with the source code, compile it before starting its execution</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>autoinstall_box</cstring>
                     </property>
@@ -177,7 +177,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>autokdesu_box</cstring>
                     </property>
@@ -188,7 +188,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>startinterminal_box</cstring>
                     </property>
@@ -201,7 +201,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>env_var_group</cstring>
             </property>
@@ -239,11 +239,11 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>mainProgramChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp
index 4dde898b..a17f5b20 100644
--- a/buildtools/lib/widgets/subclassesdlg.cpp
+++ b/buildtools/lib/widgets/subclassesdlg.cpp
@@ -21,8 +21,8 @@
 
 #include "subclassesdlg.h"
 #include "subclassesdlg.moc"
-SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl)
-: SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir)
+SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: SubclassesDlgBase(tqparent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir)
 {
     subclass_url->setEnabled(false);
 
diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h
index adfdc7d4..0b73e269 100644
--- a/buildtools/lib/widgets/subclassesdlg.h
+++ b/buildtools/lib/widgets/subclassesdlg.h
@@ -28,9 +28,10 @@ Subclass creation dialog.
 class SubclassesDlg : public SubclassesDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SubclassesDlg();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index 026ab2ca..ebe62880 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>SubclassesDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SubclassesDlgBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QPushButton" row="1" column="0">
+        <widget class="TQPushButton" row="1" column="0">
             <property name="name">
                 <cstring>add_button</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="0">
+        <widget class="TQPushButton" row="2" column="0">
             <property name="name">
                 <cstring>remove_button</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QListBox" row="1" column="1" rowspan="3" colspan="1">
+        <widget class="TQListBox" row="1" column="1" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>subclasses_box</cstring>
             </property>
@@ -53,7 +53,7 @@
             <property name="name">
                 <cstring>subclass_url</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>24</height>
@@ -73,14 +73,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -95,16 +95,16 @@
             <property name="text">
                 <string>Related subclass &amp;location:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>subclass_url</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -120,14 +120,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>310</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -192,9 +192,9 @@
     </connection>
     <connection>
         <sender>subclasses_box</sender>
-        <signal>clicked(QListBoxItem*)</signal>
+        <signal>clicked(TQListBoxItem*)</signal>
         <receiver>SubclassesDlgBase</receiver>
-        <slot>currentRelationChanged(QListBoxItem*)</slot>
+        <slot>currentRelationChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -208,14 +208,14 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">changeCurrentURL(const QString &amp;str)</slot>
     <slot access="protected">removeRelation()</slot>
     <slot access="protected">newRelation()</slot>
-    <slot access="protected">currentRelationChanged(QListBoxItem *item)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+    <slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index c2c32f9e..d0ec682d 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -23,8 +23,8 @@
 #include "pascalproject_part.h"
 #include "pascalglobaloptionsdlg.h"
 
-PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
-    :PascalProjectOptionsDlgBase(parent,name,fl), m_part(part)
+PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl)
+    :PascalProjectOptionsDlgBase(tqparent,name,fl), m_part(part)
 {
     delete config_label;
     delete config_combo;
@@ -47,7 +47,7 @@ PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget
     if (offers.isEmpty())
         options_button->setEnabled(false);
 
-    currentCompiler = TQString::null;
+    currentCompiler = TQString();
 
     /*kdDebug() << ServiceComboBox::defaultCompiler() << endl;
     kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl;
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h
index b0c19e0e..295958fc 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.h
+++ b/buildtools/pascal/pascalglobaloptionsdlg.h
@@ -22,9 +22,10 @@ class PascalProjectPart;
 class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~PascalGlobalOptionsDlg();
 
 public slots:
diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui
index 0f0b2324..a00c026f 100644
--- a/buildtools/pascal/pascalproject_optionsdlgbase.ui
+++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>PascalProjectOptionsDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PascalProjectOptionsDlgBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="5">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>configuration_layout</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>config_label</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <cstring>config_combo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>config_combo</cstring>
                     </property>
@@ -75,14 +75,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>8</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addconfig_button</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <string>&amp;Add</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>removeconfig_button</cstring>
                     </property>
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -117,7 +117,7 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QPushButton" row="6" column="4">
+        <widget class="TQPushButton" row="6" column="4">
             <property name="name">
                 <cstring>options_button</cstring>
             </property>
@@ -129,7 +129,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>30</width>
                     <height>32767</height>
@@ -139,7 +139,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>options_label</cstring>
             </property>
@@ -158,7 +158,7 @@
                 <cstring>compiler_box</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>compiler_label</cstring>
             </property>
@@ -177,22 +177,22 @@
                 <cstring>compiler_box</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>exec_edit</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="6" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="6" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>options_edit</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="3">
+        <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>compiler_box</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>exec_label</cstring>
             </property>
@@ -235,7 +235,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -252,7 +252,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -269,7 +269,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -286,14 +286,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>400</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="7" column="3" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="7" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>defaultopts_button</cstring>
             </property>
@@ -305,7 +305,7 @@
             <property name="name">
                 <cstring>mainSourceUrl</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>26</height>
@@ -315,7 +315,7 @@
                 <enum>WheelFocus</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="9" column="0">
+        <widget class="TQLabel" row="9" column="0">
             <property name="name">
                 <cstring>mainSourceLabel</cstring>
             </property>
@@ -344,7 +344,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -453,7 +453,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">compiler_box_activated(const QString&amp;)</slot>
     <slot access="protected">addconfig_button_clicked()</slot>
     <slot access="protected">configRemoved()</slot>
@@ -463,9 +463,9 @@
     <slot access="protected">configAdded()</slot>
     <slot access="protected">setDirty()</slot>
     <slot access="protected">setDefaultOptions()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 2ed25fc0..6d26ac60 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -52,8 +52,8 @@ typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
 static const KDevPluginInfo data("kdevpascalproject");
 K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
 
-PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
+PascalProjectPart::PascalProjectPart(TQObject *tqparent, const char *name, const TQStringList& )
+    :KDevBuildTool(&data, tqparent, name ? name : "PascalProjectPart" )
 {
     setInstance(PascalProjectFactory::instance());
     setXMLFile("kdevpascalproject.rc");
@@ -149,7 +149,7 @@ void PascalProjectPart::openProject(const TQString &dirName, const TQString &pro
     do {
         dir.setPath(s.pop());
         kdDebug(9033) << "Examining: " << dir.path() << endl;
-        const QFileInfoList *dirEntries = dir.entryInfoList();
+        const TQFileInfoList *dirEntries = dir.entryInfoList();
         TQPtrListIterator<TQFileInfo> it(*dirEntries);
         for (; it.current(); ++it) {
             TQString fileName = it.current()->fileName();
@@ -256,7 +256,7 @@ TQString PascalProjectPart::mainSource() const
 void PascalProjectPart::setMainSource(TQString fullPath)
 {
     TQString olddir = activeDirectory();
-    m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
+    m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
     emit activeDirectoryChanged( olddir, activeDirectory() );
 }
 
@@ -273,7 +273,7 @@ TQString PascalProjectPart::projectName() const
 TQString PascalProjectPart::activeDirectory() const
 {
     TQFileInfo fi(mainSource());
-    return fi.dirPath(true).replace(TQRegExp(projectDirectory()),"");
+    return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),"");
 }
 
 TQString PascalProjectPart::buildDirectory() const
@@ -287,7 +287,7 @@ void PascalProjectPart::listOfFiles(TQStringList &result, TQString path) const
     TQDir d(path);
     if (!d.exists())
         return;
-    QFileInfoList *entries = const_cast<QFileInfoList*>(d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden));
+    TQFileInfoList *entries = const_cast<TQFileInfoList*>(d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden));
     for (TQFileInfo *it = entries->first(); it; it = entries->next())
     {
         if ((it->isDir()) && (it->filePath() != path))
@@ -448,7 +448,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
+                                   "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage));
         exit(1);
     }
 
diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h
index 944250e4..81565cc4 100644
--- a/buildtools/pascal/pascalproject_part.h
+++ b/buildtools/pascal/pascalproject_part.h
@@ -22,8 +22,9 @@ class KDevCompilerOptions;
 class PascalProjectPart : public KDevBuildTool
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PascalProjectPart(TQObject *parent, const char *name, const TQStringList &);
+    PascalProjectPart(TQObject *tqparent, const char *name, const TQStringList &);
     ~PascalProjectPart();
 
     virtual void openProject(const TQString &dirName, const TQString &projectName);
diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h
index bfd9c328..e7bd5d1d 100644
--- a/buildtools/pascal/pascalproject_widget.h
+++ b/buildtools/pascal/pascalproject_widget.h
@@ -10,9 +10,10 @@ class KDevProject;
 class PascalProjectPart;
 
 
-class PascalProjectWidget : public QWidget
+class PascalProjectWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
     
 public:
 		  
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index 6bbff084..d1ce1f5f 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -26,10 +26,10 @@
 #include "pascalproject_part.h"
 #include "pascalprojectoptionsdlg.h"
 
-PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
-    : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part)
+PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl)
+    : PascalProjectOptionsDlgBase(tqparent,name, fl), m_part(part)
 {
-    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+    config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
 
     offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'");
 
@@ -44,7 +44,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidg
     dirty = false;
 
     TQDomDocument &dom = *(m_part->projectDom());
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged(DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default"));
 }
 
@@ -96,7 +96,7 @@ void PascalProjectOptionsDlg::saveConfig( TQString config )
                         ServiceComboBox::currentText(compiler_box, service_names));
     DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text());
     DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text());
-    DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
+    DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
 }
 
 void PascalProjectOptionsDlg::readConfig( TQString config )
@@ -130,8 +130,8 @@ void PascalProjectOptionsDlg::readConfig( TQString config )
 
 void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config)
 {
-    bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
-    bool canRemove = allConfigs.contains(config) && config != "default";
+    bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
+    bool canRemove = allConfigs.tqcontains(config) && config != "default";
     addconfig_button->setEnabled(canAdd);
     removeconfig_button->setEnabled(canRemove);
 }
@@ -139,7 +139,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config)
 
 void PascalProjectOptionsDlg::configChanged(const TQString &config)
 {
-    if (config == currentConfig || !allConfigs.contains(config))
+    if (config == currentConfig || !allConfigs.tqcontains(config))
         return;
 
     if (!currentConfig.isNull() && dirty)
@@ -180,7 +180,7 @@ void PascalProjectOptionsDlg::configRemoved()
     config_combo->clear();
     config_combo->insertStringList(allConfigs);
 
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged("default");
 }
 
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h
index 6e483338..9ebcbe45 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.h
+++ b/buildtools/pascal/pascalprojectoptionsdlg.h
@@ -21,9 +21,10 @@ class KDevCompilerOptions;
 class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~PascalProjectOptionsDlg();
 
 public slots:
diff --git a/buildtools/pascal/service.cpp b/buildtools/pascal/service.cpp
index ea3846b2..b49274ea 100644
--- a/buildtools/pascal/service.cpp
+++ b/buildtools/pascal/service.cpp
@@ -34,7 +34,7 @@ void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList<KSer
 TQString ServiceComboBox::currentText(TQComboBox *combo, const TQStringList &names)
 {
     if (combo->currentItem() == -1)
-        return TQString::null;
+        return TQString();
     return names[combo->currentItem()];
 }
 
diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp
index 63da84f8..516e5daa 100644
--- a/buildtools/qmake/choosesubprojectdlg.cpp
+++ b/buildtools/qmake/choosesubprojectdlg.cpp
@@ -15,8 +15,8 @@
 #include "choosesubprojectdlg.h"
 #include "scope.h"
 
-ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl)
-    : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget)
+ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    : ChooseSubprojectDlgBase(tqparent,name, modal,fl), m_widget(widget)
 {
     connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *)));
     if( m_widget->m_rootSubproject)
@@ -41,23 +41,23 @@ void ChooseSubprojectDlg::accept()
     ChooseItem *item = dynamic_cast<ChooseItem*>(subprojects_view->currentItem());
     if (!item)
         return;
-    if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
+    if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
         return;
 
     TQDialog::accept();
 }
 
-ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text )
-    :KListViewItem(parent, text), m_spitem(spitem)
+ChooseItem::ChooseItem( TQMakeScopeItem * spitem, TQListViewItem * tqparent, TQString text )
+    :KListViewItem(tqparent, text), m_spitem(spitem)
 {
 }
 
-ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text )
-    :KListViewItem(parent, text), m_spitem(spitem)
+ChooseItem::ChooseItem( TQMakeScopeItem * spitem, TQListView * tqparent, TQString text )
+    :KListViewItem(tqparent, text), m_spitem(spitem)
 {
 }
 
-QMakeScopeItem * ChooseItem::subproject( )
+TQMakeScopeItem * ChooseItem::subproject( )
 {
     return m_spitem;
 }
@@ -69,7 +69,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item )
 
     TQListViewItem * sub_spitem = item->subproject()->firstChild();
     while( sub_spitem ) {
-        QMakeScopeItem *spitem = dynamic_cast<QMakeScopeItem *>(sub_spitem);
+        TQMakeScopeItem *spitem = dynamic_cast<TQMakeScopeItem *>(sub_spitem);
         if ( spitem && spitem->scope->scopeType() == Scope::ProjectScope )
         {
             ChooseItem *child_item = new ChooseItem(spitem, item, spitem->text(0));
@@ -89,13 +89,13 @@ void ChooseSubprojectDlg::itemSelected( TQListViewItem * it )
     ChooseItem *item = dynamic_cast<ChooseItem*>(it);
     if (!item)
         return;
-    if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
+    if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
         buttonOk->setEnabled(false);
     else
         buttonOk->setEnabled(true);
 }
 
-QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( )
+TQMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( )
 {
     if (subprojects_view->currentItem())
     {
@@ -110,5 +110,5 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( )
 
 #include "choosesubprojectdlg.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h
index 2101d3cd..9ce31311 100644
--- a/buildtools/qmake/choosesubprojectdlg.h
+++ b/buildtools/qmake/choosesubprojectdlg.h
@@ -16,31 +16,32 @@
 
 #include "choosesubprojectdlgbase.h"
 
-class QMakeScopeItem;
+class TQMakeScopeItem;
 class TrollProjectWidget;
 
 class ChooseItem: public KListViewItem
 {
 public:
-    ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text);
-    ChooseItem(QMakeScopeItem *spitem, TQListView *parent, TQString text);
+    ChooseItem(TQMakeScopeItem *spitem, TQListViewItem *tqparent, TQString text);
+    ChooseItem(TQMakeScopeItem *spitem, TQListView *tqparent, TQString text);
 
-    QMakeScopeItem *subproject();
+    TQMakeScopeItem *subproject();
 
 private:
-    QMakeScopeItem *m_spitem;
+    TQMakeScopeItem *m_spitem;
 };
 
 class ChooseSubprojectDlg : public ChooseSubprojectDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~ChooseSubprojectDlg();
   /*$PUBLIC_FUNCTIONS$*/
 
-  QMakeScopeItem *selectedSubproject();
+  TQMakeScopeItem *selectedSubproject();
 
 public slots:
   /*$PUBLIC_SLOTS$*/
@@ -61,4 +62,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui
index 12db29e2..fa8051e6 100644
--- a/buildtools/qmake/choosesubprojectdlgbase.ui
+++ b/buildtools/qmake/choosesubprojectdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ChooseSubprojectDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ChooseSubprojectDlgBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -126,7 +126,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index 4f65dd17..a9234b58 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -26,8 +26,8 @@
 #include "scope.h"
 #include "trollprojectwidget.h"
 
-CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent, const char* name, bool modal, WFlags fl )
-        : CreateScopeDlgBase( parent, name, modal, fl ), m_item( item )
+CreateScopeDlg::CreateScopeDlg( TQMakeScopeItem* item, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+        : CreateScopeDlgBase( tqparent, name, modal, fl ), m_item( item )
 {
     incUrl->setMode( KFile::File | KFile::LocalOnly );
     incUrl->setCaption( i18n( "Choose existing .pri file or give a new filename for creation" ) );
@@ -58,7 +58,7 @@ void CreateScopeDlg::accept()
                 TQString file = incUrl->url();
                 if ( !incUrl->url().endsWith( ".pri" ) )
                     file += ".pri";
-                if( file.find("/") == -1 )
+                if( file.tqfind("/") == -1 )
                     file = m_item->scope->projectDir()+"/"+file;
                 // We need to create the file, because getRelativePath checks for existent paths
                 if( !TQFile::exists(file) )
@@ -75,13 +75,13 @@ void CreateScopeDlg::accept()
     if ( s )
     {
         if ( !m_item->firstChild() )
-            new QMakeScopeItem( m_item, s->scopeName(), s );
+            new TQMakeScopeItem( m_item, s->scopeName(), s );
         else
         {
             TQListViewItem* item = m_item->firstChild();
             while( item->nextSibling() )
                 item = item->nextSibling();
-            QMakeScopeItem* newitem = new QMakeScopeItem( m_item, s->scopeName(), s );
+            TQMakeScopeItem* newitem = new TQMakeScopeItem( m_item, s->scopeName(), s );
             newitem->moveItem( item );
         }
         TQDialog::accept();
@@ -97,4 +97,4 @@ void CreateScopeDlg::accept()
 
 #include "createscopedlg.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h
index 675143b1..412a5f2f 100644
--- a/buildtools/qmake/createscopedlg.h
+++ b/buildtools/qmake/createscopedlg.h
@@ -14,15 +14,16 @@
 
 #include "createscopedlgbase.h"
 
-class QMakeScopeItem;
+class TQMakeScopeItem;
 class TrollProjectWigdet;
 
 class CreateScopeDlg : public CreateScopeDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-        CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+        CreateScopeDlg( TQMakeScopeItem* item, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~CreateScopeDlg();
     /*$PUBLIC_FUNCTIONS$*/
 
@@ -36,10 +37,10 @@ protected slots:
     /*$PROTECTED_SLOTS$*/
     virtual void accept();
 private:
-    QMakeScopeItem* m_item;
+    TQMakeScopeItem* m_item;
 };
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui
index 244589cd..1c6cde9e 100644
--- a/buildtools/qmake/createscopedlgbase.ui
+++ b/buildtools/qmake/createscopedlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CreateScopeDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CreateScopeDlgBase</cstring>
     </property>
@@ -19,15 +19,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>95</width>
                             <height>20</height>
@@ -77,7 +77,7 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -88,11 +88,11 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QWidgetStack" row="0" column="0">
+                <widget class="TQWidgetStack" row="0" column="0">
                     <property name="name">
                         <cstring>widgetStack1</cstring>
                     </property>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>simplePage</cstring>
                         </property>
@@ -111,7 +111,7 @@
                                     <string>Specify the new scope name</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -124,7 +124,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>funcPage</cstring>
                         </property>
@@ -140,7 +140,7 @@
                                     <cstring>editFunction</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel3</cstring>
                                 </property>
@@ -154,7 +154,7 @@
                                     <string>Specify the function name</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel4</cstring>
                                 </property>
@@ -175,7 +175,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QWidget">
+                    <widget class="TQWidget">
                         <property name="name">
                             <cstring>incPage</cstring>
                         </property>
@@ -203,7 +203,7 @@
                                     <string>Choose the .pri file to include</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel5</cstring>
                                 </property>
@@ -214,7 +214,7 @@
                                     <cstring>incUrl</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>checkNotInc</cstring>
                                 </property>
@@ -230,9 +230,9 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -248,14 +248,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -269,7 +269,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -316,7 +316,7 @@
     <tabstop>incUrl</tabstop>
     <tabstop>checkNotInc</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp
index c05c70c9..161661d5 100644
--- a/buildtools/qmake/disablesubprojectdlg.cpp
+++ b/buildtools/qmake/disablesubprojectdlg.cpp
@@ -15,8 +15,8 @@
 #include "scope.h"
 #include "qmakescopeitem.h"
 
-DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent, const char* name, WFlags fl )
-        : DisableSubprojectDlgBase( parent, name, fl )
+DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* tqparent, const char* name, WFlags fl )
+        : DisableSubprojectDlgBase( tqparent, name, fl )
 {
     for( TQStringList::const_iterator it = projects.begin(); it != projects.end(); ++it )
     {
@@ -47,4 +47,4 @@ TQStringList DisableSubprojectDlg::selectedProjects()
 #include "disablesubprojectdlg.moc"
 
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h
index 00602f28..4e8a4a84 100644
--- a/buildtools/qmake/disablesubprojectdlg.h
+++ b/buildtools/qmake/disablesubprojectdlg.h
@@ -17,9 +17,10 @@
 class DisableSubprojectDlg : public DisableSubprojectDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    DisableSubprojectDlg( const TQStringList& projects, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~DisableSubprojectDlg();
     /*$PUBLIC_FUNCTIONS$*/
 
@@ -39,4 +40,4 @@ protected slots:
 #endif
 
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui
index ffcc1d32..edc2856c 100644
--- a/buildtools/qmake/disablesubprojectdlgbase.ui
+++ b/buildtools/qmake/disablesubprojectdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DisableSubprojectDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DisableSubprojectDlgBase</cstring>
     </property>
@@ -38,7 +38,7 @@
                 <enum>LastColumn</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -117,7 +117,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp
index 44dd7588..56a7c057 100644
--- a/buildtools/qmake/newwidgetdlg.cpp
+++ b/buildtools/qmake/newwidgetdlg.cpp
@@ -25,8 +25,8 @@
 #define WIDGET_CLASS_NAME   "class"
 #define WIDGET_SLOTS        "slots"
 
-NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent, const char* name, bool modal, WFlags fl)
-: NewWidgetDlgBase(parent,name,modal,fl),
+NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: NewWidgetDlgBase(tqparent,name,modal,fl),
 m_newFileNames(newFileNames)
 //=================================================
 {
diff --git a/buildtools/qmake/newwidgetdlg.h b/buildtools/qmake/newwidgetdlg.h
index 994aead5..4c1843ab 100644
--- a/buildtools/qmake/newwidgetdlg.h
+++ b/buildtools/qmake/newwidgetdlg.h
@@ -21,7 +21,7 @@ class TQDomDocument;
 class NewWidgetDlg : public NewWidgetDlgBase
 {
 public:
-                        NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+                        NewWidgetDlg(TQStringList &newFileNames,TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
                         ~NewWidgetDlg();
 
 
diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui
index 7c3730ca..404fa7d3 100644
--- a/buildtools/qmake/newwidgetdlgbase.ui
+++ b/buildtools/qmake/newwidgetdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>NewWidgetDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>NewWidgetDlgBase</cstring>
     </property>
@@ -35,7 +35,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>subclassingCb</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>Subclassing</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
+                <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>captionLb</cstring>
                             </property>
@@ -78,7 +78,7 @@
                                 <cstring>subclassnameEd</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>TextLabel4</cstring>
                             </property>
@@ -95,14 +95,14 @@
                             <property name="name">
                                 <cstring>ui_classnameEd</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>120</width>
                                     <height>0</height>
                                 </size>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>classnameLb</cstring>
                             </property>
@@ -112,7 +112,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>previewLb</cstring>
                     </property>
@@ -124,7 +124,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>160</height>
@@ -137,7 +137,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1">
+                <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1">
                     <item>
                         <property name="text">
                             <string>New Item</string>
@@ -159,7 +159,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>310</width>
                     <height>0</height>
@@ -220,10 +220,10 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>subclassingPressed()</slot>
     <slot>templateSelChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index 7c646e62..771a1f5f 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -51,15 +51,15 @@
 #include "scope.h"
 #include "urlutil.h"
 
-InsideCheckListItem::InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) :
-        TQCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox )
+InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQMakeScopeItem *item, ProjectConfigurationDlg *config ) :
+        TQCheckListItem( tqparent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox )
 {
     prjItem = item;
     m_config = config;
 }
 
-InsideCheckListItem::InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) :
-        TQCheckListItem( parent,
+InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, TQMakeScopeItem *item, ProjectConfigurationDlg *config ) :
+        TQCheckListItem( tqparent,
                         after,
                         item->relativePath(), TQCheckListItem::CheckBox )
 {
@@ -84,8 +84,8 @@ void InsideCheckListItem::stateChange( bool state )
     }
 }
 
-CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap<TQString, TQString> var)
-    : KListViewItem(parent), m_key(id)
+CustomVarListItem::CustomVarListItem(TQListView* tqparent, unsigned int id, TQMap<TQString, TQString> var)
+    : KListViewItem(tqparent), m_key(id)
 {
     setText(0, var["var"]);
     setText(1, var["op"]);
@@ -99,18 +99,18 @@ TQString CustomVarListItem::key(int column, bool ascending) const
     return KListViewItem::key(column, ascending);
 }
 
-ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl )
-        : ProjectConfigurationDlgBase( parent, name, modal, fl | Qt::WStyle_Tool ), myProjectItem(0)
+ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+        : ProjectConfigurationDlgBase( tqparent, name, modal, fl | TQt::WStyle_Tool ), myProjectItem(0)
 {
     prjList = _prjList;
     prjWidget = _prjWidget;
     //  m_projectConfiguration = conf;
     m_targetLibraryVersion->setValidator( new TQRegExpValidator(
-                                              TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) );
+                                              TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) );
     customVariables->setSortColumn(0);
-    customVariables->setSortOrder(Qt::Ascending);
-    mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
-    mocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
+    customVariables->setSortOrder(TQt::Ascending);
+    tqmocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
+    tqmocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
     objdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
     objdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
     rccdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
@@ -123,7 +123,7 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro
     m_targetPath->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
 }
 
-void ProjectConfigurationDlg::updateSubproject( QMakeScopeItem* _item )
+void ProjectConfigurationDlg::updateSubproject( TQMakeScopeItem* _item )
 {
     if ( myProjectItem && myProjectItem->scope )
     {
@@ -158,21 +158,21 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     {
         if ( radioApplication->isChecked() )
         {
-            if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("app") == -1 )
+            if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 )
             {
                 addAppDeps();
                 removeSharedLibDeps();
                 removeStaticLibDeps();
             }
             myProjectItem->scope->setEqualOp( "TEMPLATE", "app" );
-            if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 )
+            if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 )
                 myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" );
-            if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
+            if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
                 myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" );
             myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) );
             TQString targetname = prjWidget->getCurrentOutputFilename();
-            if( targetname.findRev("/") != -1 )
-                targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 );
+            if( targetname.tqfindRev("/") != -1 )
+                targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 );
             DomUtil::writeEntry( *prjWidget->m_part->projectDom(),
                                  "/kdevtrollproject/run/runarguments/"+targetname, m_editRunArguments->text() );
             DomUtil::writeEntry( *prjWidget->m_part->projectDom(),
@@ -186,7 +186,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
             myProjectItem->scope->setEqualOp( "TEMPLATE", "lib" );
             if ( staticRadio->isOn() )
             {
-                if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") != -1 )
+                if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") != -1 )
                 {
                     addStaticLibDeps();
                     removeSharedLibDeps();
@@ -203,14 +203,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
             if ( sharedRadio->isOn() )
             {
                 kdDebug(9024) << "Activating debug lib:" << myProjectItem->scope->variableValues("CONFIG") << endl;
-                if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") == -1 )
+                if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") == -1 )
                 {
                     addSharedLibDeps();
                     removeStaticLibDeps();
                 }
                 myProjectItem->addValue( "CONFIG", "dll" );
                 myProjectItem->scope->setEqualOp( "VERSION", m_targetLibraryVersion->text() );
-                if ( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 )
+                if ( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 )
                     myProjectItem->removeValue( "CONFIG", "staticlib" );
             }
             if ( checkPlugin->isOn() )
@@ -227,15 +227,15 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
         }
         else if ( radioSubdirs->isChecked() )
         {
-            if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") == -1 )
+            if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") == -1 )
             {
                 removeSharedLibDeps();
                 removeStaticLibDeps();
                 removeAppDeps();
             }
-            if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
+            if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
                 myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" );
-            if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 )
+            if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 )
                 myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" );
             myProjectItem->scope->setEqualOp( "TEMPLATE", "subdirs" );
             myProjectItem->setPixmap( 0, SmallIcon( "folder" ) );
@@ -243,8 +243,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     }
 
     // Buildmode
-    int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "release" );
-    int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "debug" );
+    int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "release" );
+    int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "debug" );
     if ( radioReleaseMode->isChecked() )
     {
         if( releaseidx != -1 && releaseidx < debugidx )
@@ -327,8 +327,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     else
         myProjectItem->removeValue( "CONFIG", "windows" );
 
-    //Qt4 libs
-    if ( prjWidget->m_part->isQt4Project() )
+    //TQt4 libs
+    if ( prjWidget->m_part->isTQt4Project() )
     {
         if ( checkDebugReleaseMode->isChecked() )
             myProjectItem->addValue( "CONFIG", "debug_and_release" );
@@ -414,7 +414,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() );
     for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it )
     {
-        if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 )
+        if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 && extraValues.tqfindIndex( *it ) == -1 )
         {
             myProjectItem->scope->removeFromPlusOp( "CONFIG", *it );
         }
@@ -422,7 +422,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
 
     for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it )
     {
-        if ( confValues.findIndex( *it ) == -1 )
+        if ( confValues.tqfindIndex( *it ) == -1 )
             myProjectItem->scope->addToPlusOp( "CONFIG", *it );
     }
 
@@ -431,9 +431,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
 //         targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath );
     if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope )
     {
-        if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 )
+        if( myProjectItem->scope->variableValues("TARGET").tqfindIndex( m_targetOutputFile->text() ) == -1 )
             myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) );
-        if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 )
+        if( myProjectItem->scope->variableValues("DESTDIR").tqfindIndex( targetpath ) == -1 )
             myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) );
     }else
     {
@@ -442,8 +442,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     }
 
     myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) );
-    myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) );
-    myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) );
+    myProjectItem->updateValues( "TQMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) );
+    myProjectItem->updateValues( "TQMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) );
 
     //add selected includes
     TQStringList values;
@@ -497,7 +497,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
         {
 
             TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() );
-            if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
+            if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
             {
                 //add path if shared lib is linked
                 TQString tmpPath = insideItem->prjItem->getLibAddPath(
@@ -550,14 +550,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     {
         if ( insideItem->isOn() )
         {
-            if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1
-                 || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex("dll") == -1
-                      && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).findIndex("lib") != -1 ) )
+            if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1
+                 || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex("dll") == -1
+                      && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).tqfindIndex("lib") != -1 ) )
             {
                 values << insideItem->prjItem->getLibAddObject(
                     myProjectItem->scope->projectDir() );
             }
-            else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
+            else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
             {
                 values << insideItem->prjItem->getSharedLibAddObject(
                     myProjectItem->scope->projectDir() );
@@ -576,7 +576,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     values.clear();
     //change build order
     lvItem = buildorder_listview->firstChild();
-    if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
+    if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
     {
 
         while ( lvItem )
@@ -603,7 +603,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
     // intermediate locations
     myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) );
     myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) );
-    myProjectItem->scope->setEqualOp( "MOC_DIR", TQStringList( mocdir_url->url() ) );
+    myProjectItem->scope->setEqualOp( "TQMOC_DIR", TQStringList( tqmocdir_url->url() ) );
     myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) );
 
     //CORBA
@@ -648,14 +648,14 @@ void ProjectConfigurationDlg::updateControls()
     TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" );
     //if( !myProjectItem->isScope )
     //{
-    if ( templateValues.findIndex( "lib" ) != -1 )
+    if ( templateValues.tqfindIndex( "lib" ) != -1 )
     {
         groupLibraries->setEnabled( true );
 
         radioLibrary->setChecked( true );
         staticRadio->setChecked( true ); //default
 
-        if ( configValues.findIndex( "staticlib" ) != -1 )
+        if ( configValues.tqfindIndex( "staticlib" ) != -1 )
         {
             staticRadio->setChecked( true );
             checkPlugin->setEnabled( false );
@@ -663,11 +663,11 @@ void ProjectConfigurationDlg::updateControls()
         }
         else
             staticRadio->setChecked( false );
-        if ( configValues.findIndex( "dll" ) != -1 )
+        if ( configValues.tqfindIndex( "dll" ) != -1 )
         {
             sharedRadio->setChecked( true );
             checkPlugin->setEnabled( true );
-            if( prjWidget->m_part->isQt4Project() )
+            if( prjWidget->m_part->isTQt4Project() )
                 checkDesigner->setEnabled( true );
             m_targetLibraryVersion->setText( myProjectItem->scope->variableValues( "VERSION" ).front() );
         }
@@ -684,33 +684,33 @@ void ProjectConfigurationDlg::updateControls()
             checkDesigner->setEnabled( false );
 	}
 
-        if ( configValues.findIndex( "plugin" ) != -1 )
+        if ( configValues.tqfindIndex( "plugin" ) != -1 )
             checkPlugin->setChecked( true );
         else
             checkPlugin->setChecked( false );
-        if ( configValues.findIndex( "designer" ) != -1 )
+        if ( configValues.tqfindIndex( "designer" ) != -1 )
             checkDesigner->setChecked( true );
         else
             checkDesigner->setChecked( false );
-        if ( configValues.findIndex( "compile_libtool" ) != -1 )
+        if ( configValues.tqfindIndex( "compile_libtool" ) != -1 )
             checkLibtool->setChecked( true );
         else
             checkLibtool->setChecked( false );
     }
-    else if ( templateValues.findIndex( "subdirs" ) != -1 )
+    else if ( templateValues.tqfindIndex( "subdirs" ) != -1 )
     {
         radioSubdirs->setChecked( true );
     }else
     {
         //Default is app mode
         radioApplication->setChecked( true );
-        if ( configValues.findIndex( "console" ) != -1 )
+        if ( configValues.tqfindIndex( "console" ) != -1 )
         {
             checkConsole->setChecked( true );
         }
         TQString targetname = prjWidget->getCurrentOutputFilename();
-        if( targetname.findRev("/") != -1 )
-            targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 );
+        if( targetname.tqfindRev("/") != -1 )
+            targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 );
         m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) );
 
         TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" );
@@ -731,15 +731,15 @@ void ProjectConfigurationDlg::updateControls()
             TQString destdir = myProjectItem->m_widget->getCurrentDestDir();
             if( !destdir.startsWith( "/" ) )
                 destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir;
-            m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) );
-            m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.findRev("/") ) ) );
+            m_CWDEdit->setURL( destdir.left( destdir.tqfindRev("/") ) );
+            m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.tqfindRev("/") ) ) );
         }
         m_editDebugArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/debugarguments/"+targetname, "" ) );
     }
 
     // Buildmode
-    int debugidx = configValues.findIndex( "debug" );
-    int releaseidx = configValues.findIndex( "release" );
+    int debugidx = configValues.tqfindIndex( "debug" );
+    int releaseidx = configValues.tqfindIndex( "release" );
     if ( debugidx != -1 && debugidx > releaseidx )
     {
         radioDebugMode->setChecked( true );
@@ -748,138 +748,138 @@ void ProjectConfigurationDlg::updateControls()
     {
         radioReleaseMode->setChecked( true );
     }
-    if ( configValues.findIndex( "debug_and_release" ) != -1 )
+    if ( configValues.tqfindIndex( "debug_and_release" ) != -1 )
     {
         checkDebugReleaseMode->setChecked( true );
     }
 
     // Requirements
-    if ( configValues.findIndex( "qt" ) != -1 )
+    if ( configValues.tqfindIndex( "qt" ) != -1 )
         checkQt->setChecked( true );
     else
         checkQt->setChecked( false );
-    if ( configValues.findIndex( "opengl" ) != -1 )
+    if ( configValues.tqfindIndex( "opengl" ) != -1 )
         checkOpenGL->setChecked( true );
     else
         checkOpenGL->setChecked( false );
-    if ( configValues.findIndex( "thread" ) != -1 )
+    if ( configValues.tqfindIndex( "thread" ) != -1 )
         checkThread->setChecked( true );
     else
         checkThread->setChecked( false );
-    if ( configValues.findIndex( "x11" ) != -1 )
+    if ( configValues.tqfindIndex( "x11" ) != -1 )
         checkX11->setChecked( true );
     else
         checkX11->setChecked( false );
-    if ( configValues.findIndex( "ordered" ) != -1 )
+    if ( configValues.tqfindIndex( "ordered" ) != -1 )
         checkOrdered->setChecked( true );
     else
         checkOrdered->setChecked( false );
-    if ( configValues.findIndex( "exceptions" ) != -1 )
+    if ( configValues.tqfindIndex( "exceptions" ) != -1 )
         exceptionCheck->setChecked( true );
     else
         exceptionCheck->setChecked( false );
-    if ( configValues.findIndex( "stl" ) != -1 )
+    if ( configValues.tqfindIndex( "stl" ) != -1 )
         stlCheck->setChecked( true );
     else
         stlCheck->setChecked( false );
-    if ( configValues.findIndex( "rtti" ) != -1 )
+    if ( configValues.tqfindIndex( "rtti" ) != -1 )
         rttiCheck->setChecked( true );
     else
         rttiCheck->setChecked( false );
-    if ( configValues.findIndex( "precompile_header" ) != -1 )
+    if ( configValues.tqfindIndex( "precompile_header" ) != -1 )
         checkPCH->setChecked( true );
     else
         checkPCH->setChecked( false );
     // Warnings
-    if ( configValues.findIndex( "warn_on" ) != -1 )
+    if ( configValues.tqfindIndex( "warn_on" ) != -1 )
     {
         checkWarning->setChecked( true );
     }
-    if ( configValues.findIndex( "warn_off" ) != -1 )
+    if ( configValues.tqfindIndex( "warn_off" ) != -1 )
     {
         checkWarning->setChecked( false );
     }
 
-    if ( configValues.findIndex( "windows" ) != -1 )
+    if ( configValues.tqfindIndex( "windows" ) != -1 )
         checkWindows->setChecked( true );
     else
         checkWindows->setChecked( false );
 
-    //Qt4 libs
-    if ( prjWidget->m_part->isQt4Project() )
+    //TQt4 libs
+    if ( prjWidget->m_part->isTQt4Project() )
     {
 
-        if ( configValues.findIndex( "assistant" ) != -1 )
+        if ( configValues.tqfindIndex( "assistant" ) != -1 )
             checkAssistant->setChecked( true );
         else
             checkAssistant->setChecked( false );
-        if ( configValues.findIndex( "qtestlib" ) != -1 )
+        if ( configValues.tqfindIndex( "qtestlib" ) != -1 )
             checkTestlib->setChecked( true );
         else
             checkTestlib->setChecked( false );
-        if ( configValues.findIndex( "uitools" ) != -1 )
+        if ( configValues.tqfindIndex( "uitools" ) != -1 )
             checkUiTools->setChecked( true );
         else
             checkUiTools->setChecked( false );
-        if ( configValues.findIndex( "dbus" ) != -1 )
+        if ( configValues.tqfindIndex( "dbus" ) != -1 )
             checkQDBus->setChecked( true );
         else
             checkQDBus->setChecked( false );
-        if ( configValues.findIndex( "build_all" ) != -1 )
+        if ( configValues.tqfindIndex( "build_all" ) != -1 )
             checkBuildAll->setChecked( true );
         else
             checkBuildAll->setChecked( false );
-        if ( configValues.findIndex( "help" ) != -1 )
+        if ( configValues.tqfindIndex( "help" ) != -1 )
             checkQtHelp->setChecked( true );
         else
             checkQtHelp->setChecked( false );
 
         TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" );
-        if ( qtLibs.findIndex( "core" ) != -1 )
+        if ( qtLibs.tqfindIndex( "core" ) != -1 )
             checkQt4Core->setChecked( true );
         else
             checkQt4Core->setChecked( false );
-        if ( qtLibs.findIndex( "gui" ) != -1 )
+        if ( qtLibs.tqfindIndex( "gui" ) != -1 )
             checkQt4Gui->setChecked( true );
         else
             checkQt4Gui->setChecked( false );
-        if ( qtLibs.findIndex( "sql" ) != -1 )
+        if ( qtLibs.tqfindIndex( "sql" ) != -1 )
             checkQt4SQL->setChecked( true );
         else
             checkQt4SQL->setChecked( false );
-        if ( qtLibs.findIndex( "xml" ) != -1 )
+        if ( qtLibs.tqfindIndex( "xml" ) != -1 )
             checkQt4XML->setChecked( true );
         else
             checkQt4XML->setChecked( false );
-        if ( qtLibs.findIndex( "network" ) != -1 )
+        if ( qtLibs.tqfindIndex( "network" ) != -1 )
             checkQt4Network->setChecked( true );
         else
             checkQt4Network->setChecked( false );
-        if ( qtLibs.findIndex( "svg" ) != -1 )
+        if ( qtLibs.tqfindIndex( "svg" ) != -1 )
             checkQt4SVG->setChecked( true );
         else
             checkQt4SVG->setChecked( false );
-        if ( qtLibs.findIndex( "opengl" ) != -1 )
+        if ( qtLibs.tqfindIndex( "opengl" ) != -1 )
             checkQt4OpenGL->setChecked( true );
         else
             checkQt4OpenGL->setChecked( false );
-        if ( qtLibs.findIndex( "qt3support" ) != -1 )
+        if ( qtLibs.tqfindIndex( "qt3support" ) != -1 )
             checkQt3Support->setChecked( true );
         else
             checkQt3Support->setChecked( false );
-        if ( qtLibs.findIndex( "script" ) != -1 )
+        if ( qtLibs.tqfindIndex( "script" ) != -1 )
             checkQtScript->setChecked( true );
         else
             checkQtScript->setChecked( false );
-        if ( qtLibs.findIndex( "phonon" ) != -1 )
+        if ( qtLibs.tqfindIndex( "phonon" ) != -1 )
             checkPhonon->setChecked( true );
         else
             checkPhonon->setChecked( false );
-        if ( qtLibs.findIndex( "webkit" ) != -1 )
+        if ( qtLibs.tqfindIndex( "webkit" ) != -1 )
             checkQtWebKit->setChecked( true );
         else
             checkQtWebKit->setChecked( false );
-        if ( qtLibs.findIndex( "xmlpatterns" ) != -1 )
+        if ( qtLibs.tqfindIndex( "xmlpatterns" ) != -1 )
             checkQtXmlPatterns->setChecked( true );
         else
             checkQtXmlPatterns->setChecked( false );
@@ -895,7 +895,7 @@ void ProjectConfigurationDlg::updateControls()
     TQStringList extraValues;
     for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it )
     {
-        if ( Scope::KnownConfigValues.findIndex( *it ) == -1 )
+        if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 )
         {
             extraValues << *it;
         }
@@ -914,7 +914,7 @@ void ProjectConfigurationDlg::updateControls()
     }
     makefile_url->setURL( dir );
 
-    if ( myProjectItem->scope->variableValues( "INSTALLS" ).findIndex( "target" ) != -1 )
+    if ( myProjectItem->scope->variableValues( "INSTALLS" ).tqfindIndex( "target" ) != -1 )
     {
         checkInstallTarget->setChecked( true );
         m_InstallTargetPath->setEnabled( true );
@@ -941,8 +941,8 @@ void ProjectConfigurationDlg::updateControls()
     m_targetPath->setURL( dir );
 
     m_defines->setText( myProjectItem->scope->variableValues( "DEFINES" ).join( " " ) );
-    m_debugFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_DEBUG" ).join( " " ) );
-    m_releaseFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_RELEASE" ).join( " " ) );
+    m_debugFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_DEBUG" ).join( " " ) );
+    m_releaseFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_RELEASE" ).join( " " ) );
 
     updateIncludeControl();
     updateLibControls();
@@ -971,17 +971,17 @@ void ProjectConfigurationDlg::updateControls()
         uidir_url->fileDialog()->setURL( KURL( dir ) );
     }
     uidir_url->setURL( dir );
-    dir = myProjectItem->scope->variableValues( "MOC_DIR" ).front();
+    dir = myProjectItem->scope->variableValues( "TQMOC_DIR" ).front();
     if( TQFileInfo(dir).isRelative() )
     {
-        mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() );
-        mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) );
+        tqmocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() );
+        tqmocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) );
     }else
     {
-        mocdir_url->completionObject()->setDir( dir );
-        mocdir_url->fileDialog()->setURL( KURL( dir ) );
+        tqmocdir_url->completionObject()->setDir( dir );
+        tqmocdir_url->fileDialog()->setURL( KURL( dir ) );
     }
-    mocdir_url->setURL( dir );
+    tqmocdir_url->setURL( dir );
     dir = myProjectItem->scope->variableValues( "RC_DIR" ).front();
     if( TQFileInfo(dir).isRelative() )
     {
@@ -1023,10 +1023,10 @@ void ProjectConfigurationDlg::updateControls()
     groupTemplateChanged(0);
 }
 
-TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects()
+TQPtrList<TQMakeScopeItem> ProjectConfigurationDlg::getAllProjects()
 {
-    TQPtrList <QMakeScopeItem> tmpPrjList;
-    QMakeScopeItem *item = static_cast<QMakeScopeItem*>( prjList->firstChild() );
+    TQPtrList <TQMakeScopeItem> tmpPrjList;
+    TQMakeScopeItem *item = static_cast<TQMakeScopeItem*>( prjList->firstChild() );
     while ( item )
     {
         if ( item->scope->scopeType() == Scope::ProjectScope )
@@ -1035,15 +1035,15 @@ TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects()
                 tmpPrjList.append( item );
             getAllSubProjects( item, &tmpPrjList );
         }
-        item = static_cast<QMakeScopeItem*>( item->nextSibling() );
+        item = static_cast<TQMakeScopeItem*>( item->nextSibling() );
     }
     return ( tmpPrjList );
 }
 
-void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList <QMakeScopeItem> *itemList )
+void ProjectConfigurationDlg::getAllSubProjects( TQMakeScopeItem *item, TQPtrList <TQMakeScopeItem> *itemList )
 {
 
-    QMakeScopeItem * subItem = static_cast<QMakeScopeItem*>( item->firstChild() );
+    TQMakeScopeItem * subItem = static_cast<TQMakeScopeItem*>( item->firstChild() );
     while ( subItem )
     {
         if ( subItem->scope->scopeType() == Scope::ProjectScope )
@@ -1052,7 +1052,7 @@ void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList
                 itemList->append( subItem );
             getAllSubProjects( subItem, itemList );
         }
-        subItem = static_cast<QMakeScopeItem*>( subItem->nextSibling() );
+        subItem = static_cast<TQMakeScopeItem*>( subItem->nextSibling() );
     }
 }
 
@@ -1066,12 +1066,12 @@ void ProjectConfigurationDlg::updateIncludeControl()
     TQStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" );
     TQStringList intIncList = incList;
     TQMap<TQString, InsideCheckListItem*> items;
-    TQPtrList <QMakeScopeItem> itemList = getAllProjects();
-    QMakeScopeItem *item = itemList.first();
+    TQPtrList <TQMakeScopeItem> itemList = getAllProjects();
+    TQMakeScopeItem *item = itemList.first();
     while ( item )
     {
-        if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 ||
-                item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 )
+        if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 ||
+                item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) != -1 )
         {
             TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() );
             tmpInc = TQDir::cleanDirPath( tmpInc );
@@ -1079,7 +1079,7 @@ void ProjectConfigurationDlg::updateIncludeControl()
                                            insideinc_listview->lastItem(), item, this );
 
             items[tmpInc] = newItem;
-            if ( incList.findIndex( tmpInc ) != -1 )
+            if ( incList.tqfindIndex( tmpInc ) != -1 )
             {
                 incList.remove( tmpInc );
                 newItem->setOn( true );
@@ -1112,7 +1112,7 @@ void ProjectConfigurationDlg::updateIncludeControl()
 void ProjectConfigurationDlg::updateLibControls()
 {
 
-    TQPtrList <QMakeScopeItem> itemList = getAllProjects();
+    TQPtrList <TQMakeScopeItem> itemList = getAllProjects();
 
     insidelib_listview->setSorting( -1, false );
     outsidelib_listview->setSorting( -1, false );
@@ -1125,10 +1125,10 @@ void ProjectConfigurationDlg::updateLibControls()
     TQStringList libList = myProjectItem->scope->variableValues( "LIBS" );
     TQStringList intLibList = libList;
     TQMap<TQString, InsideCheckListItem*> items;
-    QMakeScopeItem* item = itemList.first();
+    TQMakeScopeItem* item = itemList.first();
     while ( item )
     {
-        if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 )
+        if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 )
         {
             if ( item != myProjectItem )
             {
@@ -1141,11 +1141,11 @@ void ProjectConfigurationDlg::updateLibControls()
                 items[tmpLib] = newItem;
                 TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() );
                 kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl;
-                if ( libList.findIndex( "-L" + tmpLibDir ) != -1 )
+                if ( libList.tqfindIndex( "-L" + tmpLibDir ) != -1 )
                 {
                     libList.remove( "-L" + tmpLibDir );
                 }
-                if ( libList.findIndex( tmpLib ) != -1 )
+                if ( libList.tqfindIndex( tmpLib ) != -1 )
                 {
                     libList.remove( tmpLib );
                     newItem->setOn( true );
@@ -1185,7 +1185,7 @@ void ProjectConfigurationDlg::updateLibControls()
 
 void ProjectConfigurationDlg::updateDependenciesControl( )
 {
-    TQPtrList <QMakeScopeItem> itemList = getAllProjects();
+    TQPtrList <TQMakeScopeItem> itemList = getAllProjects();
 
     intDeps_view->setSorting( -1, false );
     extDeps_view->setSorting( -1, false );
@@ -1195,24 +1195,24 @@ void ProjectConfigurationDlg::updateDependenciesControl( )
     TQStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" );
     TQStringList intDepList = depsList;
     TQMap<TQString,InsideCheckListItem*> items;
-    QMakeScopeItem *item = itemList.first();
+    TQMakeScopeItem *item = itemList.first();
     while ( item )
     {
         TQStringList templateval = item->scope->variableValues( "TEMPLATE" );
-        if ( templateval.findIndex( "lib" ) != -1
-                || templateval.findIndex( "app" ) != -1 )
+        if ( templateval.tqfindIndex( "lib" ) != -1
+                || templateval.tqfindIndex( "app" ) != -1 )
         {
             TQString tmpLib;
             TQStringList values = item->scope->variableValues( "CONFIG" );
-            if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 )
+            if ( templateval.tqfindIndex( "lib" ) != -1 && values.tqfindIndex( "dll" ) != -1 )
                 tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() );
-            else if ( templateval.findIndex( "lib" ) != -1 )
+            else if ( templateval.tqfindIndex( "lib" ) != -1 )
                 tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() );
             else
                 tmpLib = item->getApplicationObject( myProjectItem->scope->projectDir() );
             InsideCheckListItem * newItem = new InsideCheckListItem( intDeps_view, intDeps_view->lastItem(), item, this );
             items[tmpLib] = newItem;
-            if ( depsList.findIndex( tmpLib ) != -1 )
+            if ( depsList.tqfindIndex( tmpLib ) != -1 )
             {
                 depsList.remove( tmpLib );
                 newItem->setOn( true );
@@ -1248,16 +1248,16 @@ void ProjectConfigurationDlg::updateDependenciesControl( )
 void ProjectConfigurationDlg::updateBuildOrderControl()
 {
     //sort build order only if subdirs
-    if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 )
+    if ( myProjectItem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 )
     {
 
-        TQPtrList <QMakeScopeItem> itemList;
+        TQPtrList <TQMakeScopeItem> itemList;
 
-        QMakeScopeItem *item = static_cast<QMakeScopeItem*>( myProjectItem->firstChild() );
+        TQMakeScopeItem *item = static_cast<TQMakeScopeItem*>( myProjectItem->firstChild() );
         while ( item )
         {
             itemList.append( item );
-            item = static_cast<QMakeScopeItem*>( item->nextSibling() );
+            item = static_cast<TQMakeScopeItem*>( item->nextSibling() );
         }
 
         incaddTab->setEnabled( false );
@@ -1379,7 +1379,7 @@ void ProjectConfigurationDlg::outsideIncAddClicked()
 {
     KURLRequesterDlg dialog( "", i18n( "Add include directory:" ), 0, 0 );
     dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly );
-    dialog.urlRequester() ->setURL( TQString::null );
+    dialog.urlRequester() ->setURL( TQString() );
     dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() );
     dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) );
     if ( dialog.exec() != TQDialog::Accepted )
@@ -1463,7 +1463,7 @@ void ProjectConfigurationDlg::outsideLibAddClicked()
     KURLRequesterDlg dialog( "", i18n( "Add Library: Either choose the .a/.so file or give -l<libname>" ), 0, 0 );
     dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
     dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") );
-    dialog.urlRequester() ->setURL( TQString::null );
+    dialog.urlRequester() ->setURL( TQString() );
     dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() );
     dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) );
     if ( dialog.exec() != TQDialog::Accepted )
@@ -1546,7 +1546,7 @@ void ProjectConfigurationDlg::outsideLibDirAddClicked()
 {
     KURLRequesterDlg dialog( "", i18n( "Add library directory:" ), 0, 0 );
     dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly );
-    dialog.urlRequester() ->setURL( TQString::null );
+    dialog.urlRequester() ->setURL( TQString() );
     dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() );
     dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) );
     if ( dialog.exec() != TQDialog::Accepted )
@@ -1686,7 +1686,7 @@ void ProjectConfigurationDlg::extAdd_button_clicked( )
 {
     KURLRequesterDlg dialog( "", i18n( "Add target:" ), 0, 0 );
     dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly );
-    dialog.urlRequester() ->setURL( TQString::null );
+    dialog.urlRequester() ->setURL( TQString() );
     dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() );
     dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) );
     if ( dialog.exec() != TQDialog::Accepted )
@@ -1882,7 +1882,7 @@ void ProjectConfigurationDlg::groupLibrariesChanged( int )
         checkPlugin->setEnabled( true );
         checkDesigner->setEnabled( checkPlugin->isChecked() );
     }
-    else if ( checkPlugin->isChecked() && prjWidget->m_part->isQt4Project() )
+    else if ( checkPlugin->isChecked() && prjWidget->m_part->isTQt4Project() )
     {
         checkDesigner->setEnabled( true );
     }
@@ -1978,7 +1978,7 @@ void ProjectConfigurationDlg::groupTemplateChanged( int )
 
 void ProjectConfigurationDlg::groupRequirementsChanged( int )
 {
-    if ( checkQt->isChecked() && prjWidget->m_part->isQt4Project() )
+    if ( checkQt->isChecked() && prjWidget->m_part->isTQt4Project() )
     {
         groupQt4Libs->setEnabled( true );
     }
@@ -2036,17 +2036,17 @@ void ProjectConfigurationDlg::removeSharedLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
+        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
         TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
 
-        if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 )
+        if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_lib"]) != -1 )
             prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]);
-        if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_libdir"]) != -1 )
+        if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_libdir"]) != -1 )
             prjItem->scope->removeFromPlusOp("LIBS", infos["shared_libdir"]);
-        if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 )
+        if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 )
         {
             prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["shared_depend"]);
 
@@ -2060,14 +2060,14 @@ void ProjectConfigurationDlg::addStaticLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
+        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
         TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
 
-        if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1
-            || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 )
+        if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1
+            || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 )
         {
             prjItem->scope->addToPlusOp("LIBS", infos["static_lib"]);
             prjItem->scope->addToPlusOp("TARGETDEPS", infos["static_depend"]);
@@ -2081,16 +2081,16 @@ void ProjectConfigurationDlg::removeStaticLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
+        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
 
         TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
 
-        if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 )
+        if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["static_lib"]) != -1 )
             prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]);
-        if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 )
+        if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 )
         {
             prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["static_depend"]);
             prjItem->scope->saveToFile();
@@ -2103,13 +2103,13 @@ void ProjectConfigurationDlg::addSharedLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
+        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
         TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
-        if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1
-            || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 )
+        if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1
+            || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 )
         {
             prjItem->scope->addToPlusOp("LIBS", infos["shared_lib"]);
             prjItem->scope->addToPlusOp("LIBS", infos["shared_libdir"]);
@@ -2124,13 +2124,13 @@ void ProjectConfigurationDlg::removeAppDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
+        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
         TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
 
-        if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 )
+        if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 )
         {
             prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["app_depend"]);
             prjItem->scope->saveToFile();
@@ -2143,14 +2143,14 @@ void ProjectConfigurationDlg::addAppDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
+        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
         TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
 
-        if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1
-            || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 )
+        if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1
+            || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 )
         {
             prjItem->scope->addToPlusOp("TARGETDEPS", infos["app_depend"]);
 
@@ -2171,4 +2171,4 @@ void ProjectConfigurationDlg::customVarChanged()
     activateApply( 0 );
 }
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h
index 313882c4..29c41b07 100644
--- a/buildtools/qmake/projectconfigurationdlg.h
+++ b/buildtools/qmake/projectconfigurationdlg.h
@@ -25,19 +25,19 @@
 #include <klistview.h>
 #include <tqmap.h>
 
-class QMakeScopeItem;
+class TQMakeScopeItem;
 class KListViewItem;
 class qProjectItem;
 class ProjectConfigurationDlg;
 class TrollProjectWidget;
 
-class InsideCheckListItem : public QCheckListItem
+class InsideCheckListItem : public TQCheckListItem
 {
 public:
-    InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config );
+    InsideCheckListItem( TQListView *tqparent, TQMakeScopeItem *item, ProjectConfigurationDlg *config );
 
-    InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config );
-    QMakeScopeItem *prjItem;
+    InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, TQMakeScopeItem *item, ProjectConfigurationDlg *config );
+    TQMakeScopeItem *prjItem;
     ProjectConfigurationDlg *m_config;
 
 protected:
@@ -56,11 +56,11 @@ class CustomVarListItem : public KListViewItem
 class ProjectConfigurationDlg : public ProjectConfigurationDlgBase
 {
 public:
-    ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~ProjectConfigurationDlg();
     void updateControls();
-    void updateSubproject( QMakeScopeItem* _item );
-    QMakeScopeItem* currentProjectItem() { return myProjectItem; }
+    void updateSubproject( TQMakeScopeItem* _item );
+    TQMakeScopeItem* currentProjectItem() { return myProjectItem; }
 
 public slots:
     //  virtual void           radioLibrarytoggled(bool);
@@ -126,10 +126,10 @@ public slots:
 
 protected:
     TQListView *prjList;
-    QMakeScopeItem *myProjectItem;
-    TQPtrList <QMakeScopeItem> getAllProjects();
+    TQMakeScopeItem *myProjectItem;
+    TQPtrList <TQMakeScopeItem> getAllProjects();
     TrollProjectWidget* prjWidget;
-    void getAllSubProjects( QMakeScopeItem *item, TQPtrList<QMakeScopeItem> *itemList );
+    void getAllSubProjects( TQMakeScopeItem *item, TQPtrList<TQMakeScopeItem> *itemList );
 
 private:
     void removeSharedLibDeps();
@@ -142,4 +142,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index d447210d..0ce31c82 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ProjectConfigurationDlgBase</class>
 <author>Jakob Simon-Gaarde</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ProjectConfigurationDlgBase</cstring>
     </property>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>260</width>
                     <height>16</height>
@@ -72,7 +72,7 @@
                 <string>&amp;Apply</string>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>TabBuild</cstring>
             </property>
@@ -82,7 +82,7 @@
             <property name="margin">
                 <number>0</number>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>buildTab</cstring>
                 </property>
@@ -93,7 +93,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>groupTemplate</cstring>
                         </property>
@@ -104,7 +104,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3">
+                            <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>radioLibrary</cstring>
                                 </property>
@@ -115,7 +115,7 @@
                                     <string>Create a library</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="2" column="0">
+                            <widget class="TQRadioButton" row="2" column="0">
                                 <property name="name">
                                     <cstring>radioSubdirs</cstring>
                                 </property>
@@ -126,7 +126,7 @@
                                     <string>This project holds subdirectories</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="1">
+                            <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>checkOrdered</cstring>
                                 </property>
@@ -150,14 +150,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>101</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="3">
+                            <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>radioApplication</cstring>
                                 </property>
@@ -173,7 +173,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>targetGroupbox</cstring>
                         </property>
@@ -184,7 +184,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel1_2</cstring>
                                 </property>
@@ -195,7 +195,7 @@
                                     <cstring>m_targetPath</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -218,7 +218,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>targetInstGroupbox</cstring>
                         </property>
@@ -234,7 +234,7 @@
                                     <cstring>m_InstallTargetPath</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>checkInstallTarget</cstring>
                                 </property>
@@ -242,7 +242,7 @@
                                     <string>I&amp;nstall</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="1">
+                            <widget class="TQLabel" row="0" column="1">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
@@ -255,7 +255,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox6</cstring>
                         </property>
@@ -273,7 +273,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>argumentsGroupBox</cstring>
                         </property>
@@ -287,7 +287,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_6</cstring>
                                 </property>
@@ -305,7 +305,7 @@
                                     <cstring>m_editDebugArguments</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel2_2</cstring>
                                 </property>
@@ -313,7 +313,7 @@
                                     <string>Debug Arguments:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>textLabel2_2_2</cstring>
                                 </property>
@@ -338,7 +338,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>120</height>
@@ -347,7 +347,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>configTab</cstring>
                 </property>
@@ -358,7 +358,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>groupBuildMode</cstring>
                         </property>
@@ -375,15 +375,15 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout147</cstring>
+                                    <cstring>tqlayout147</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>radioDebugMode</cstring>
                                         </property>
@@ -394,7 +394,7 @@
                                             <string>Set project to be built in debug mode</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>radioReleaseMode</cstring>
                                         </property>
@@ -405,7 +405,7 @@
                                             <string>Set project to be built in release mode</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkDebugReleaseMode</cstring>
                                         </property>
@@ -424,15 +424,15 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout30</cstring>
+                                    <cstring>tqlayout30</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkWarning</cstring>
                                         </property>
@@ -443,7 +443,7 @@
                                             <string>Show compiler warnings</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkBuildAll</cstring>
                                         </property>
@@ -461,7 +461,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>groupRequirements</cstring>
                         </property>
@@ -472,7 +472,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>checkOpenGL</cstring>
                                 </property>
@@ -483,7 +483,7 @@
                                     <string>Requires the OpenGL (or Mesa) headers/libraries</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>stlCheck</cstring>
                                 </property>
@@ -491,7 +491,7 @@
                                     <string>STL</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>checkThread</cstring>
                                 </property>
@@ -502,7 +502,7 @@
                                     <string>Requires support for multi-threaded application or library.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>checkQt</cstring>
                                 </property>
@@ -513,7 +513,7 @@
                                     <string>Requires the Qt header files/library</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>checkX11</cstring>
                                 </property>
@@ -524,7 +524,7 @@
                                     <string>Support required for X11 application or library</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="2">
+                            <widget class="TQCheckBox" row="2" column="2">
                                 <property name="name">
                                     <cstring>checkPCH</cstring>
                                 </property>
@@ -532,7 +532,7 @@
                                     <string>Precompiled headers</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="1">
+                            <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>rttiCheck</cstring>
                                 </property>
@@ -540,7 +540,7 @@
                                     <string>RTTI</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0">
+                            <widget class="TQCheckBox" row="3" column="0">
                                 <property name="name">
                                     <cstring>checkWindows</cstring>
                                 </property>
@@ -548,7 +548,7 @@
                                     <string>Windows</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="4" column="0">
+                            <widget class="TQLabel" row="4" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_4</cstring>
                                 </property>
@@ -556,7 +556,7 @@
                                     <string>Custom Configuration</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="2">
+                            <widget class="TQCheckBox" row="0" column="2">
                                 <property name="name">
                                     <cstring>exceptionCheck</cstring>
                                 </property>
@@ -569,7 +569,7 @@
                                     <cstring>editConfigExtra</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="2">
+                            <widget class="TQCheckBox" row="1" column="2">
                                 <property name="name">
                                     <cstring>checkConsole</cstring>
                                 </property>
@@ -588,7 +588,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>groupQt4Libs</cstring>
                         </property>
@@ -602,7 +602,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>checkQt4Gui</cstring>
                                 </property>
@@ -613,7 +613,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>checkQt4XML</cstring>
                                 </property>
@@ -621,7 +621,7 @@
                                     <string>XML</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0">
+                            <widget class="TQCheckBox" row="3" column="0">
                                 <property name="name">
                                     <cstring>checkQt4Network</cstring>
                                 </property>
@@ -629,7 +629,7 @@
                                     <string>Network</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>checkQt4Core</cstring>
                                 </property>
@@ -640,7 +640,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>checkQt4OpenGL</cstring>
                                 </property>
@@ -648,7 +648,7 @@
                                     <string>OpenGL</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>checkUiTools</cstring>
                                 </property>
@@ -656,7 +656,7 @@
                                     <string>QtUiTools</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="1">
+                            <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>checkQt4SQL</cstring>
                                 </property>
@@ -664,7 +664,7 @@
                                     <string>SQL</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="1">
+                            <widget class="TQCheckBox" row="3" column="1">
                                 <property name="name">
                                     <cstring>checkQt4SVG</cstring>
                                 </property>
@@ -672,7 +672,7 @@
                                     <string>SVG</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="2">
+                            <widget class="TQCheckBox" row="0" column="2">
                                 <property name="name">
                                     <cstring>checkTestlib</cstring>
                                 </property>
@@ -680,7 +680,7 @@
                                     <string>QtTest</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="2">
+                            <widget class="TQCheckBox" row="1" column="2">
                                 <property name="name">
                                     <cstring>checkQt3Support</cstring>
                                 </property>
@@ -688,7 +688,7 @@
                                     <string>Qt3 Support</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="2">
+                            <widget class="TQCheckBox" row="2" column="2">
                                 <property name="name">
                                     <cstring>checkQDBus</cstring>
                                 </property>
@@ -696,7 +696,7 @@
                                     <string>QDBus (Qt4.2)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="2">
+                            <widget class="TQCheckBox" row="3" column="2">
                                 <property name="name">
                                     <cstring>checkAssistant</cstring>
                                 </property>
@@ -704,7 +704,7 @@
                                     <string>QtAssistant</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="3">
+                            <widget class="TQCheckBox" row="0" column="3">
                                 <property name="name">
                                     <cstring>checkQtScript</cstring>
                                 </property>
@@ -712,7 +712,7 @@
                                     <string>QtScript (Qt4.3)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="3">
+                            <widget class="TQCheckBox" row="1" column="3">
                                 <property name="name">
                                     <cstring>checkQtWebKit</cstring>
                                 </property>
@@ -720,7 +720,7 @@
                                     <string>QtWebKit (Qt4.4)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="3">
+                            <widget class="TQCheckBox" row="2" column="3">
                                 <property name="name">
                                     <cstring>checkQtXmlPatterns</cstring>
                                 </property>
@@ -728,7 +728,7 @@
                                     <string>QtXmlPatterns (Qt4.4)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="3">
+                            <widget class="TQCheckBox" row="3" column="3">
                                 <property name="name">
                                     <cstring>checkPhonon</cstring>
                                 </property>
@@ -736,7 +736,7 @@
                                     <string>Phonon (Qt4.4)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="4">
+                            <widget class="TQCheckBox" row="0" column="4">
                                 <property name="name">
                                     <cstring>checkQtHelp</cstring>
                                 </property>
@@ -746,7 +746,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>groupLibraries</cstring>
                         </property>
@@ -760,15 +760,15 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout69</cstring>
+                                    <cstring>tqlayout69</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>staticRadio</cstring>
                                         </property>
@@ -779,7 +779,7 @@
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkPlugin</cstring>
                                         </property>
@@ -790,7 +790,7 @@
                                             <string>Plugin</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkLibtool</cstring>
                                         </property>
@@ -816,22 +816,22 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout68</cstring>
+                                    <cstring>tqlayout68</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>sharedRadio</cstring>
                                         </property>
@@ -839,7 +839,7 @@
                                             <string>Build as shared library</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkDesigner</cstring>
                                         </property>
@@ -853,15 +853,15 @@
                                             <string></string>
                                         </property>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout67</cstring>
+                                            <cstring>tqlayout67</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>textLabel1</cstring>
                                                 </property>
@@ -893,7 +893,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -902,7 +902,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>incaddTab</cstring>
                 </property>
@@ -913,7 +913,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
                             <cstring>Layout9</cstring>
                         </property>
@@ -950,7 +950,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -959,7 +959,7 @@
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QListView" row="3" column="0">
+                    <widget class="TQListView" row="3" column="0">
                         <column>
                             <property name="text">
                                 <string>Directories Outside Project</string>
@@ -978,7 +978,7 @@
                             <enum>LastColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QListView" row="1" column="0">
+                    <widget class="TQListView" row="1" column="0">
                         <column>
                             <property name="text">
                                 <string>Directories Inside Project</string>
@@ -997,9 +997,9 @@
                             <enum>LastColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="3" column="1">
+                    <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -1055,7 +1055,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>70</height>
@@ -1066,7 +1066,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>libAddTab</cstring>
                 </property>
@@ -1077,15 +1077,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="1" column="0">
+                    <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>layout12</cstring>
+                            <cstring>tqlayout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView">
+                            <widget class="TQListView">
                                 <column>
                                     <property name="text">
                                         <string>External Library Dirs</string>
@@ -1104,9 +1104,9 @@
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout10</cstring>
+                                    <cstring>tqlayout10</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1162,7 +1162,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>70</height>
@@ -1173,15 +1173,15 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView">
+                            <widget class="TQListView">
                                 <column>
                                     <property name="text">
                                         <string>External Libraries</string>
@@ -1200,9 +1200,9 @@
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1258,7 +1258,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>64</height>
@@ -1269,15 +1269,15 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout10</cstring>
+                            <cstring>tqlayout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView">
+                            <widget class="TQListView">
                                 <column>
                                     <property name="text">
                                         <string>Link Convenience Libraries Inside Project</string>
@@ -1296,7 +1296,7 @@
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout9_3</cstring>
                                 </property>
@@ -1330,7 +1330,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1343,7 +1343,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>depTab</cstring>
                 </property>
@@ -1354,15 +1354,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout26</cstring>
+                            <cstring>tqlayout26</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView">
+                            <widget class="TQListView">
                                 <column>
                                     <property name="text">
                                         <string>Targets in Project</string>
@@ -1381,7 +1381,7 @@
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout9_3_2</cstring>
                                 </property>
@@ -1418,7 +1418,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1429,15 +1429,15 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout27</cstring>
+                            <cstring>tqlayout27</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView">
+                            <widget class="TQListView">
                                 <column>
                                     <property name="text">
                                         <string>Miscellaneous Targets</string>
@@ -1456,9 +1456,9 @@
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9_2</cstring>
+                                    <cstring>tqlayout9_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1514,7 +1514,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>64</height>
@@ -1525,15 +1525,15 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout28_2</cstring>
+                            <cstring>tqlayout28_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QListView">
+                            <widget class="TQListView">
                                 <column>
                                     <property name="text">
                                         <string>Order in Which Sub Projects Are Built</string>
@@ -1552,7 +1552,7 @@
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout9_2</cstring>
                                 </property>
@@ -1589,7 +1589,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1602,7 +1602,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>buildOptsTab</cstring>
                 </property>
@@ -1613,7 +1613,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox2</cstring>
                         </property>
@@ -1632,23 +1632,23 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget" row="0" column="0">
+                            <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout26</cstring>
+                                    <cstring>tqlayout26</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout23</cstring>
+                                            <cstring>tqlayout23</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>TextLabel2_2</cstring>
                                                 </property>
@@ -1659,7 +1659,7 @@
                                                     <cstring>m_debugFlags</cstring>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>TextLabel2_2_2</cstring>
                                                 </property>
@@ -1670,7 +1670,7 @@
                                                     <cstring>m_releaseFlags</cstring>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>TextLabel1</cstring>
                                                 </property>
@@ -1680,9 +1680,9 @@
                                             </widget>
                                         </vbox>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout24</cstring>
+                                            <cstring>tqlayout24</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -1709,7 +1709,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox8</cstring>
                         </property>
@@ -1720,26 +1720,26 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout84</cstring>
+                                    <cstring>tqlayout84</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
-                                            <cstring>mocdir_label</cstring>
+                                            <cstring>tqmocdir_label</cstring>
                                         </property>
                                         <property name="text">
-                                            <string>MOC files:</string>
+                                            <string>TQMOC files:</string>
                                         </property>
                                         <property name="buddy" stdset="0">
-                                            <cstring>mocdir_url</cstring>
+                                            <cstring>tqmocdir_url</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>uidir_label</cstring>
                                         </property>
@@ -1750,7 +1750,7 @@
                                             <cstring>uidir_url</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>objdir_label</cstring>
                                         </property>
@@ -1761,7 +1761,7 @@
                                             <cstring>objdir_url</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>rccdir_label</cstring>
                                         </property>
@@ -1774,9 +1774,9 @@
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout85</cstring>
+                                    <cstring>tqlayout85</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1784,7 +1784,7 @@
                                     </property>
                                     <widget class="KURLRequester">
                                         <property name="name">
-                                            <cstring>mocdir_url</cstring>
+                                            <cstring>tqmocdir_url</cstring>
                                         </property>
                                     </widget>
                                     <widget class="KURLRequester">
@@ -1809,7 +1809,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>idlGroup</cstring>
                         </property>
@@ -1823,7 +1823,7 @@
                             <property name="margin">
                                 <number>11</number>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2_3</cstring>
                                 </property>
@@ -1844,7 +1844,7 @@
                                     <cstring>idlCmdEdit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel1_2_2</cstring>
                                 </property>
@@ -1867,7 +1867,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -1876,7 +1876,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>custVarsTab</cstring>
                 </property>
@@ -1887,9 +1887,9 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout24</cstring>
+                            <cstring>tqlayout24</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1950,17 +1950,17 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout23</cstring>
+                                    <cstring>tqlayout23</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout22</cstring>
+                                            <cstring>tqlayout22</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -2010,7 +2010,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>106</height>
@@ -2021,15 +2021,15 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout33</cstring>
+                            <cstring>tqlayout33</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_3</cstring>
                                 </property>
@@ -2060,15 +2060,15 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout32</cstring>
+                            <cstring>tqlayout32</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_5</cstring>
                                 </property>
@@ -2130,7 +2130,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>250</width>
                                         <height>20</height>
@@ -2139,15 +2139,15 @@
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout34</cstring>
+                            <cstring>tqlayout34</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -2162,7 +2162,7 @@
                                 <property name="text">
                                     <string>Value:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -2242,13 +2242,13 @@
         <slot>activateApply(const QString&amp;)</slot>
     </connection>
     <connection>
-        <sender>mocdir_url</sender>
+        <sender>tqmocdir_url</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
         <slot>activateApply(const QString&amp;)</slot>
     </connection>
     <connection>
-        <sender>mocdir_url</sender>
+        <sender>tqmocdir_url</sender>
         <signal>urlSelected(const QString&amp;)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
         <slot>activateApply(const QString&amp;)</slot>
@@ -2333,39 +2333,39 @@
     </connection>
     <connection>
         <sender>insideinc_listview</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
-        <slot>activateApply(QListViewItem*)</slot>
+        <slot>activateApply(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>insideinc_listview</sender>
-        <signal>spacePressed(QListViewItem*)</signal>
+        <signal>spacePressed(TQListViewItem*)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
-        <slot>activateApply(QListViewItem*)</slot>
+        <slot>activateApply(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>insidelib_listview</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
-        <slot>activateApply(QListViewItem*)</slot>
+        <slot>activateApply(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>insidelib_listview</sender>
-        <signal>spacePressed(QListViewItem*)</signal>
+        <signal>spacePressed(TQListViewItem*)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
-        <slot>activateApply(QListViewItem*)</slot>
+        <slot>activateApply(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>intDeps_view</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
-        <slot>activateApply(QListViewItem*)</slot>
+        <slot>activateApply(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>intDeps_view</sender>
-        <signal>spacePressed(QListViewItem*)</signal>
+        <signal>spacePressed(TQListViewItem*)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
-        <slot>activateApply(QListViewItem*)</slot>
+        <slot>activateApply(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>varAdd_button</sender>
@@ -2768,7 +2768,7 @@
     <tabstop>m_debugFlags</tabstop>
     <tabstop>m_releaseFlags</tabstop>
     <tabstop>m_defines</tabstop>
-    <tabstop>mocdir_url</tabstop>
+    <tabstop>tqmocdir_url</tabstop>
     <tabstop>uidir_url</tabstop>
     <tabstop>objdir_url</tabstop>
     <tabstop>rccdir_url</tabstop>
@@ -2791,7 +2791,7 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>updateProjectConfiguration()</slot>
     <slot>buildorderMoveUpClicked()</slot>
     <slot>buildorderMoveDownClicked()</slot>
@@ -2833,11 +2833,11 @@
     <slot>apply()</slot>
     <slot>activateApply( int )</slot>
     <slot>activateApply( const QString &amp; )</slot>
-    <slot>activateApply( QListViewItem * )</slot>
+    <slot>activateApply( TQListViewItem * )</slot>
     <slot>customVarChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp
index fa7711c9..304bd1e1 100644
--- a/buildtools/qmake/qmakedefaultopts.cpp
+++ b/buildtools/qmake/qmakedefaultopts.cpp
@@ -18,12 +18,12 @@
 
 #include <blockingkprocess.h>
 
-QMakeDefaultOpts::QMakeDefaultOpts()
+TQMakeDefaultOpts::TQMakeDefaultOpts()
 {
 
 }
 
-void QMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& projdir )
+void TQMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& projdir )
 {
     KTempFile makefile (projdir+"/", ".mf");
     KTempFile qmakefile(projdir+"/", ".pro");
@@ -71,21 +71,21 @@ void QMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& pro
     }
 }
 
-QMakeDefaultOpts::~QMakeDefaultOpts()
+TQMakeDefaultOpts::~TQMakeDefaultOpts()
 {
 }
 
-const TQStringList QMakeDefaultOpts::variableValues( const TQString& var ) const
+const TQStringList TQMakeDefaultOpts::variableValues( const TQString& var ) const
 {
 //     TQStringList result;
-    if ( m_variables.contains(var) )
+    if ( m_variables.tqcontains(var) )
         return m_variables[var];
     return TQStringList();
 }
 
-const TQStringList& QMakeDefaultOpts::variables() const
+const TQStringList& TQMakeDefaultOpts::variables() const
 {
     return m_keys;
 }
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h
index f95d5608..121e0cd0 100644
--- a/buildtools/qmake/qmakedefaultopts.h
+++ b/buildtools/qmake/qmakedefaultopts.h
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#ifndef QMAKEDEFAULTOPTS_H
-#define QMAKEDEFAULTOPTS_H
+#ifndef TQMAKEDEFAULTOPTS_H
+#define TQMAKEDEFAULTOPTS_H
 
 #include <tqmap.h>
 #include <tqstringlist.h>
@@ -19,12 +19,12 @@
 // class KTempFile;
 // class BlockingKProcess;
 
-class QMakeDefaultOpts
+class TQMakeDefaultOpts
 {
 public:
-    QMakeDefaultOpts( );
+    TQMakeDefaultOpts( );
 
-    ~QMakeDefaultOpts();
+    ~TQMakeDefaultOpts();
 
     void readVariables( const TQString& qtdir, const TQString& projdir );
 
@@ -46,4 +46,4 @@ private:
 #endif
 
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp
index c2f4cfdd..920d2efd 100644
--- a/buildtools/qmake/qmakeoptionswidget.cpp
+++ b/buildtools/qmake/qmakeoptionswidget.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 
 QMakeOptionsWidget::QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup,
-                                      TQWidget *parent, const char *name )
-        : QMakeOptionsWidgetBase( parent, name ),
+                                      TQWidget *tqparent, const char *name )
+        : QMakeOptionsWidgetBase( tqparent, name ),
         m_dom( dom ), m_configGroup( configGroup ), m_projectDir( projectdir )
 {
     groupBehaviour->setButton( DomUtil::readIntEntry( dom, configGroup+"/qmake/savebehaviour", 2) );
@@ -60,4 +60,4 @@ void QMakeOptionsWidget::accept()
 
 #include "qmakeoptionswidget.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h
index ee50fde6..159547f8 100644
--- a/buildtools/qmake/qmakeoptionswidget.h
+++ b/buildtools/qmake/qmakeoptionswidget.h
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#ifndef QMAKEOPTIONSWIDGET_H
-#define QMAKEOPTIONSWIDGET_H
+#ifndef TQMAKEOPTIONSWIDGET_H
+#define TQMAKEOPTIONSWIDGET_H
 
 #include "qmakeoptionswidgetbase.h"
 
@@ -19,9 +19,10 @@
 class QMakeOptionsWidget : public QMakeOptionsWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup,
-                        TQWidget *parent = 0, const char *name = 0 );
+                        TQWidget *tqparent = 0, const char *name = 0 );
     ~QMakeOptionsWidget();
 
 public slots:
@@ -34,6 +35,6 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
 
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index 0ad833d1..0f3d52d1 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>QMakeOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>QMakeOptionsWidgetBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -29,15 +29,15 @@
 - For changes on this page to take effect the project needs to be reloaded.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_3</cstring>
                     </property>
@@ -59,7 +59,7 @@ Leave this empty to automatically search for a .pro file in the project director
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>groupBehaviour</cstring>
             </property>
@@ -73,18 +73,18 @@ Leave this empty to automatically search for a .pro file in the project director
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
                         <string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioAlwaysSave</cstring>
                     </property>
@@ -98,7 +98,7 @@ Leave this empty to automatically search for a .pro file in the project director
                         <string>Always save the project configuration when selecting a another sub project.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioNeverSave</cstring>
                     </property>
@@ -112,7 +112,7 @@ Leave this empty to automatically search for a .pro file in the project director
                         <string>Never save the project configuration when selecting a another sub project.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioAsk</cstring>
                     </property>
@@ -131,7 +131,7 @@ Leave this empty to automatically search for a .pro file in the project director
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>checkReplacePaths</cstring>
             </property>
@@ -153,7 +153,7 @@ Leave this empty to automatically search for a .pro file in the project director
                 <string>This replaces the relative paths of added files with existing custom variables if the value assigned to it is the same as the path.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>showVariablesInTree</cstring>
             </property>
@@ -161,7 +161,7 @@ Leave this empty to automatically search for a .pro file in the project director
                 <string>Show variables in filenames in the QMake projectmanager view.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>checkFilenamesOnly</cstring>
             </property>
@@ -169,7 +169,7 @@ Leave this empty to automatically search for a .pro file in the project director
                 <string>Display only filenames in the QMake Manager (Project reload is needed after changing this setting)</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>checkDisableDefaultOpts</cstring>
             </property>
@@ -178,7 +178,7 @@ Leave this empty to automatically search for a .pro file in the project director
 This disables the reading of any .qmake.cache files or mkspecs.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>checkShowParseErrors</cstring>
             </property>
@@ -199,7 +199,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -208,7 +208,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string>
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index 73edf730..157b0894 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -2,7 +2,7 @@
 *   Copyright (C) 2006 by Andreas Pakulat                                 *
 *   apaku@gmx.de                                                          *
 *                                                                         *
-*   Part of this file is taken from Qt Designer.                          *
+*   Part of this file is taken from TQt Designer.                          *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
@@ -28,13 +28,13 @@
  * Class qProjectItem
  */
 
-qProjectItem::qProjectItem( Type type, TQListView *parent, const TQString &text )
-        : TQListViewItem( parent, text ), typ( type )
+qProjectItem::qProjectItem( Type type, TQListView *tqparent, const TQString &text )
+        : TQListViewItem( tqparent, text ), typ( type )
 {}
 
 
-qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &text )
-        : TQListViewItem( parent, text ), typ( type )
+qProjectItem::qProjectItem( Type type, qProjectItem *tqparent, const TQString &text )
+        : TQListViewItem( tqparent, text ), typ( type )
 {}
 
 
@@ -43,7 +43,7 @@ qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &tex
  * Class GroupItem
  */
 
-GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem )
+GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, TQMakeScopeItem* spitem )
         : qProjectItem( Group, lv, text )
 {
     this->owner = spitem;
@@ -302,24 +302,24 @@ FileItem::FileItem( TQListView *lv, const TQString &text )
 
 
 /*
- * Class QMakeScopeItem
+ * Class TQMakeScopeItem
  */
 
-QMakeScopeItem::QMakeScopeItem( TQListView *parent, const TQString &text, Scope* s, TrollProjectWidget* widget )
-        : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( widget )
+TQMakeScopeItem::TQMakeScopeItem( TQListView *tqparent, const TQString &text, Scope* s, TrollProjectWidget* widget )
+        : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( widget )
 {
-    //   configuration.m_template = QTMP_APPLICATION;
+    //   configuration.m_template = TQTMP_APPLICATION;
     init();
 }
 
 
-QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* s )
-        : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( parent->m_widget )
+TQMakeScopeItem::TQMakeScopeItem( TQMakeScopeItem *tqparent, const TQString &text, Scope* s )
+        : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( tqparent->m_widget )
 {
     init();
 }
 
-QMakeScopeItem::~QMakeScopeItem()
+TQMakeScopeItem::~TQMakeScopeItem()
 {
     TQMap<GroupItem::GroupType, GroupItem*>::iterator it;
     for ( it = groups.begin() ; it != groups.end() ; ++it )
@@ -331,35 +331,35 @@ QMakeScopeItem::~QMakeScopeItem()
 
 }
 
-TQString QMakeScopeItem::relativePath()
+TQString TQMakeScopeItem::relativePath()
 {
-    if( !scope || !scope->parent() )
+    if( !scope || !scope->tqparent() )
         return "";
     if( scope->scopeType() == Scope::ProjectScope )
     {
-        if( scope->parent() && scope->parent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
+        if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").tqcontains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
         {
-            return URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() );
+            return URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() );
         }else
         {
             return URLUtil::getRelativePath( m_widget->projectDirectory(), scope->projectDir() );
         }
     }else
-        return static_cast<QMakeScopeItem*>( parent() ) ->relativePath();
-//     if( !scope->parent() )
+        return static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath();
+//     if( !scope->tqparent() )
 //         return "";
-//     else if ( !scope->parent()->parent() || scope->scopeType() != Scope::ProjectScope )
+//     else if ( !scope->tqparent()->tqparent() || scope->scopeType() != Scope::ProjectScope )
 //         return scope->scopeName();
 //     else if ( scope->scopeType() == Scope::ProjectScope )
-//         return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath()
+//         return ( static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath()
 //                  + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() );
 //     else
-//         return (  static_cast<QMakeScopeItem*>( parent() ) ->relativePath() );
+//         return (  static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath() );
 }
 
-TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath )
+TQString TQMakeScopeItem::getSharedLibAddObject( TQString basePath )
 {
-    if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
+    if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
     {
         TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
         if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() )
@@ -392,7 +392,7 @@ TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath )
     return "";
 }
 
-TQString QMakeScopeItem::getApplicationObject( TQString basePath )
+TQString TQMakeScopeItem::getApplicationObject( TQString basePath )
 {
     TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
     TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -419,9 +419,9 @@ TQString QMakeScopeItem::getApplicationObject( TQString basePath )
         return tmpPath + TQString( TQChar( TQDir::separator() ) ) + target;
 }
 
-TQString QMakeScopeItem::getLibAddObject( TQString basePath )
+TQString TQMakeScopeItem::getLibAddObject( TQString basePath )
 {
-    if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
+    if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
     {
         TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
         if ( !target.isEmpty() )
@@ -433,8 +433,8 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath )
             return ( "-l" + scope->projectName() );
         }
     }
-    else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1
-            || scope->variableValues("TEMPLATE").findIndex("lib") != -1 )
+    else if ( scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1
+            || scope->variableValues("TEMPLATE").tqfindIndex("lib") != -1 )
     {
         TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
         TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -469,11 +469,11 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath )
 
     return ( "" );
 }
-TQString QMakeScopeItem::getLibAddPath( TQString basePath )
+TQString TQMakeScopeItem::getLibAddPath( TQString basePath )
 {
 
     //PATH only add if shared lib
-    if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" );
+    if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) == -1 ) return ( "" );
 
     TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
     TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -495,7 +495,7 @@ TQString QMakeScopeItem::getLibAddPath( TQString basePath )
 
 }
 
-TQString QMakeScopeItem::getIncAddPath( TQString basePath )
+TQString TQMakeScopeItem::getIncAddPath( TQString basePath )
 {
     TQString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() );
     tmpPath = TQDir::cleanDirPath( tmpPath );
@@ -503,7 +503,7 @@ TQString QMakeScopeItem::getIncAddPath( TQString basePath )
     return ( tmpPath );
 }
 
-void QMakeScopeItem::buildSubTree()
+void TQMakeScopeItem::buildSubTree()
 {
     TQValueList<Scope*>::const_iterator it;
 
@@ -514,14 +514,14 @@ void QMakeScopeItem::buildSubTree()
     for ( it = scopes.begin(); it != scopes.end(); ++it )
     {
         if( (*it)->scopeType() != Scope::InvalidScope )
-            new QMakeScopeItem( this, ( *it )->scopeName(), ( *it ) );
+            new TQMakeScopeItem( this, ( *it )->scopeName(), ( *it ) );
         else
-            kdDebug( 9024 ) << "No QMakeScopeItem created" << endl;
+            kdDebug( 9024 ) << "No TQMakeScopeItem created" << endl;
     }
 }
 
 
-void QMakeScopeItem::init()
+void TQMakeScopeItem::init()
 {
     if ( scope->scopeType() == Scope::SimpleScope )
     {
@@ -540,17 +540,17 @@ void QMakeScopeItem::init()
         TQStringList tmp = scope->variableValues( "TEMPLATE" );
         if( scope->isEnabled() )
         {
-            if ( tmp.findIndex( "subdirs" ) != -1 )
+            if ( tmp.tqfindIndex( "subdirs" ) != -1 )
                 setPixmap( 0, SmallIcon( "folder" ) );
-            else if ( tmp.findIndex( "lib" ) != -1 )
+            else if ( tmp.tqfindIndex( "lib" ) != -1 )
                 setPixmap( 0, SmallIcon( "qmake_lib" ) );
             else
                 setPixmap( 0, SmallIcon( "qmake_app" ) );
         }else
         {
-            if ( tmp.findIndex( "subdirs" ) != -1 )
+            if ( tmp.tqfindIndex( "subdirs" ) != -1 )
                 setPixmap( 0, SmallIcon( "folder_grey" ) );
-            else if ( tmp.findIndex( "lib" ) != -1 )
+            else if ( tmp.tqfindIndex( "lib" ) != -1 )
                 setPixmap( 0, SmallIcon( "qmake_lib_disabled" ) );
             else
                 setPixmap( 0, SmallIcon( "qmake_app_disabled" ) );
@@ -565,19 +565,19 @@ void QMakeScopeItem::init()
     }
 }
 
-GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, QMakeScopeItem* scopeitem )
+GroupItem* TQMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, TQMakeScopeItem* scopeitem )
 {
     GroupItem * item = new GroupItem( scopeitem->listView(), type, label, scopeitem );
     scopeitem->listView() ->takeItem( item );
     return item;
 }
 
-FileItem* QMakeScopeItem::createFileItem( const TQString& name )
+FileItem* TQMakeScopeItem::createFileItem( const TQString& name )
 {
     TQString display = name;
     if( m_widget->showFilenamesOnly() )
     {
-        int dirSepPos = name.findRev( TQChar( TQDir::separator() ) );
+        int dirSepPos = name.tqfindRev( TQChar( TQDir::separator() ) );
         if  ( dirSepPos != - 1 )
             display = name.mid( dirSepPos + 1 );
     }
@@ -593,9 +593,9 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name )
     return fitem;
 }
 
-void QMakeScopeItem::buildGroups()
+void TQMakeScopeItem::buildGroups()
 {
-    if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
+    if( scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
         return;
     TQStringList values;
 
@@ -648,7 +648,7 @@ void QMakeScopeItem::buildGroups()
         item->files.append( createFileItem( *it ) );
     }
 
-    if ( scope->isQt4Project() )
+    if ( scope->isTQt4Project() )
     {
         values = scope->variableValues( "RESOURCES" );
         item = createGroupItem( GroupItem::Resources, "RESOURCES", this );
@@ -720,7 +720,7 @@ void QMakeScopeItem::buildGroups()
 
 }
 
-void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& values )
+void TQMakeScopeItem::removeValues( const TQString& var, const TQStringList& values )
 {
     for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
     {
@@ -728,7 +728,7 @@ void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& valu
     }
 }
 
-void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values )
+void TQMakeScopeItem::addValues( const TQString& var, const TQStringList& values )
 {
     for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
     {
@@ -736,14 +736,14 @@ void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values
     }
 }
 
-void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
+void TQMakeScopeItem::removeValue( const TQString& var, const TQString& value )
 {
-    if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 )
+    if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) != -1 )
     {
-        if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 )
+        if( scope->variableValuesForOp( var, "+=" ).tqfindIndex(value) != -1 )
         {
             scope->removeFromPlusOp( var, TQStringList( value ) );
-            if( scope->variableValues( var ).findIndex( value ) != -1 )
+            if( scope->variableValues( var ).tqfindIndex( value ) != -1 )
             {
                 scope->addToMinusOp( var, TQStringList( value ) );
             }
@@ -755,11 +755,11 @@ void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
     }
 }
 
-void QMakeScopeItem::addValue( const TQString& var, const TQString& value )
+void TQMakeScopeItem::addValue( const TQString& var, const TQString& value )
 {
-    if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 )
+    if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) == -1 )
     {
-        if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 )
+        if( scope->variableValuesForOp( var, "-=" ).tqfindIndex(value) != -1 )
             scope->removeFromMinusOp( var, TQStringList( value ) );
         else
             scope->addToPlusOp( var, TQStringList( value ) );
@@ -769,15 +769,15 @@ void QMakeScopeItem::addValue( const TQString& var, const TQString& value )
     }
 }
 
-void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& values )
+void TQMakeScopeItem::updateValues( const TQString& var, const TQStringList& values )
 {
     TQStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) );
     TQStringList scopeValues = scope->variableValuesForOp( var, "+=" );
     for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it )
     {
-        if ( values.findIndex( *it ) == -1 )
+        if ( values.tqfindIndex( *it ) == -1 )
         {
-            if( scopeValues.findIndex( *it ) != -1 )
+            if( scopeValues.tqfindIndex( *it ) != -1 )
             {
                 scope->removeFromPlusOp( var, TQStringList( *it ) );
                 scopeValues.remove( *it );
@@ -787,7 +787,7 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu
     }
     for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it )
     {
-        if ( scopeValues.findIndex( *it ) != -1 )
+        if ( scopeValues.tqfindIndex( *it ) != -1 )
         {
             scopeValues.remove(*it);
         }
@@ -802,18 +802,18 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu
 //     kdDebug(9024) << "---------------------------------------" << endl;
 }
 
-QMakeScopeItem* QMakeScopeItem::projectFileItem()
+TQMakeScopeItem* TQMakeScopeItem::projectFileItem()
 {
     if( scope->scopeType() != Scope::ProjectScope )
     {
-        QMakeScopeItem* parentitem = dynamic_cast<QMakeScopeItem*>(parent());
-        if( parentitem )
-            return parentitem->projectFileItem();
+        TQMakeScopeItem* tqparentitem = dynamic_cast<TQMakeScopeItem*>(tqparent());
+        if( tqparentitem )
+            return tqparentitem->projectFileItem();
     }
     return this;
 }
 
-void QMakeScopeItem::reloadProject()
+void TQMakeScopeItem::reloadProject()
 {
     kdDebug(9024) << "Reloading Project" << endl;
     TQListViewItem* item = firstChild();
@@ -837,19 +837,19 @@ void QMakeScopeItem::reloadProject()
     init();
 }
 
-void QMakeScopeItem::disableSubprojects( const TQStringList& dirs )
+void TQMakeScopeItem::disableSubprojects( const TQStringList& dirs )
 {
     TQStringList::const_iterator it = dirs.begin();
     for( ; it != dirs.end() ; ++it)
     {
-        if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 )
+        if( scope->variableValues("SUBDIRS").tqfindIndex(*it) != -1 )
         {
             Scope* s = scope->disableSubproject(*it);
             if( !s )
                 return;
             else
             {
-                QMakeScopeItem* newitem = new QMakeScopeItem( this, s->scopeName(), s );
+                TQMakeScopeItem* newitem = new TQMakeScopeItem( this, s->scopeName(), s );
                 TQListViewItem* lastitem = firstChild();
                 while( lastitem && lastitem->nextSibling() )
                     lastitem = lastitem->nextSibling();
@@ -861,9 +861,9 @@ void QMakeScopeItem::disableSubprojects( const TQStringList& dirs )
 
 }
 
-int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
+int TQMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
 {
-    QMakeScopeItem* other = dynamic_cast<QMakeScopeItem*>(i);
+    TQMakeScopeItem* other = dynamic_cast<TQMakeScopeItem*>(i);
     if( !i )
         return -1;
     if( other->scope->getNum() < scope->getNum() )
@@ -874,7 +874,7 @@ int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
         return 0;
 }
 
-TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath )
+TQMap<TQString, TQString> TQMakeScopeItem::getLibInfos( TQString basePath )
 {
 
     TQMap<TQString, TQString> result;
@@ -925,4 +925,4 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath )
     return result;
 }
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h
index 7c02a33a..be42af8f 100644
--- a/buildtools/qmake/qmakescopeitem.h
+++ b/buildtools/qmake/qmakescopeitem.h
@@ -9,27 +9,27 @@
 *                                                                         *
 ***************************************************************************/
 
-#ifndef _QMAKESCOPEITEM_H_
-#define _QMAKESCOPEITEM_H_
+#ifndef _TQMAKESCOPEITEM_H_
+#define _TQMAKESCOPEITEM_H_
 
 #include <tqlistview.h>
 #include <tqstring.h>
 
 class Scope;
-class QMakeScopeItem;
+class TQMakeScopeItem;
 class FileItem;
 class TrollProjectWidget;
 
 /**
  * Base class for all items appearing in ProjectOverview and ProjectDetails.
  */
-class qProjectItem : public QListViewItem
+class qProjectItem : public TQListViewItem
 {
 public:
     enum Type { Subproject, Group, File };
 
-    qProjectItem( Type type, TQListView *parent, const TQString &text );
-    qProjectItem( Type type, qProjectItem *parent, const TQString &text );
+    qProjectItem( Type type, TQListView *tqparent, const TQString &text );
+    qProjectItem( Type type, qProjectItem *tqparent, const TQString &text );
 
     TQString scopeString;
     Type type()
@@ -50,7 +50,7 @@ public:
     static GroupType groupTypeForExtension( const TQString &ext );
     static void groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext );
 
-    GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem );
+    GroupItem( TQListView *lv, GroupType type, const TQString &text, TQMakeScopeItem* spitem );
 
     void removeFileFromScope( const TQString& filename);
     void addFileToScope( const TQString& filename);
@@ -65,7 +65,7 @@ public:
 //     TQStringList str_files_exclude;
     // end qmake INSTALLS support
     GroupType groupType;
-    QMakeScopeItem* owner;
+    TQMakeScopeItem* owner;
 
 protected:
     void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
@@ -85,11 +85,11 @@ public:
 /**
  * Stores one Scope
  */
-class QMakeScopeItem : public qProjectItem
+class TQMakeScopeItem : public qProjectItem
 {
 public:
-    QMakeScopeItem( TQListView *parent, const TQString &text, Scope *s, TrollProjectWidget* widget );
-    QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* );
+    TQMakeScopeItem( TQListView *tqparent, const TQString &text, Scope *s, TrollProjectWidget* widget );
+    TQMakeScopeItem( TQMakeScopeItem *tqparent, const TQString &text, Scope* );
     void updateValues( const TQString& var, const TQStringList& values );
     void addValue( const TQString& var, const TQString& value );
     void removeValue( const TQString& var, const TQString& value );
@@ -98,7 +98,7 @@ public:
     void disableSubprojects( const TQStringList& );
     void reloadProject();
     int compare( TQListViewItem* i, int col, bool ascending ) const;
-    ~QMakeScopeItem();
+    ~TQMakeScopeItem();
 
     TQMap<GroupItem::GroupType, GroupItem*> groups;
 
@@ -110,10 +110,10 @@ public:
     TQString getApplicationObject( TQString );
     TQString getIncAddPath( TQString downDirs );
     FileItem* createFileItem(const TQString& file);
-    GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, QMakeScopeItem* scopeitem);
+    GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, TQMakeScopeItem* scopeitem);
     TQMap<TQString, TQString> getLibInfos( TQString );
 
-    QMakeScopeItem* projectFileItem();
+    TQMakeScopeItem* projectFileItem();
 
     TrollProjectWidget* m_widget;
 private:
@@ -125,4 +125,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 3f182ded..e332edd2 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -31,7 +31,7 @@
 #include "trollprojectpart.h"
 #include "qmakedefaultopts.h"
 
-const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "MOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ;
+const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "TQMAKE_CXXFLAGS_DEBUG" << "TQMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "TQMOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ;
 
 const TQStringList Scope::KnownConfigValues = TQStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help";
 
@@ -42,7 +42,7 @@ Scope::Scope( const TQMap<TQString, TQString>& env, const TQString &filename, Tr
     {
         if( !TQFileInfo( filename ).exists() )
         {
-            m_root = new QMake::ProjectAST();
+            m_root = new TQMake::ProjectAST();
             m_root->setFileName( filename );
         }else
         {
@@ -80,25 +80,25 @@ Scope::~Scope()
 }
 
 // Simple/Function Scopes
-Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* scope,
-              QMakeDefaultOpts* defaultopts, TrollProjectPart* part )
-    : m_root( scope ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( true ),
+Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* scope,
+              TQMakeDefaultOpts* defaultopts, TrollProjectPart* part )
+    : m_root( scope ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( true ),
         m_part(part), m_defaultopts(defaultopts), m_environment( env )
 {
     init();
 }
 
 //Subdirs
-Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename,
+Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename,
               TrollProjectPart* part, bool isEnabled )
-    : m_root( 0 ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( isEnabled ),
+    : m_root( 0 ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( isEnabled ),
     m_part(part), m_defaultopts(0), m_environment( env )
 {
     if ( !loadFromFile( filename ) )
     {
         if( !TQFileInfo( filename ).exists() && TQFileInfo( TQFileInfo( filename ).dirPath( true ) ).exists() )
         {
-            m_root = new QMake::ProjectAST();
+            m_root = new TQMake::ProjectAST();
             m_root->setFileName( filename );
         }else
         {
@@ -114,15 +114,15 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* par
 }
 
 //Include Scope
-Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path,
-              const TQString& incfile, QMakeDefaultOpts* defaultopts, TrollProjectPart* part )
-    : m_root( 0 ), m_incast( incast ), m_parent( parent ), m_num(num), m_isEnabled( true ),
+Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path,
+              const TQString& incfile, TQMakeDefaultOpts* defaultopts, TrollProjectPart* part )
+    : m_root( 0 ), m_incast( incast ), m_parent( tqparent ), m_num(num), m_isEnabled( true ),
     m_part(part), m_defaultopts(defaultopts), m_environment( env )
 {
     TQString absfilename;
     TQString tmp = incfile.stripWhiteSpace();
-    if( tmp.contains(")" ) )
-        tmp = tmp.mid(0, tmp.find(")") );
+    if( tmp.tqcontains(")" ) )
+        tmp = tmp.mid(0, tmp.tqfind(")") );
 
     if( tmp.startsWith( "\"" ) )
         tmp = tmp.mid( 1, tmp.length()-2 );
@@ -136,7 +136,7 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* par
     {
         if( !TQFileInfo( absfilename ).exists() && TQFileInfo( TQFileInfo( absfilename ).dirPath( true ) ).exists() )
         {
-            m_root = new QMake::ProjectAST();
+            m_root = new TQMake::ProjectAST();
             m_root->setFileName( absfilename );
         }else
         {
@@ -152,13 +152,13 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* par
 
 bool Scope::loadFromFile( const TQString& filename )
 {
-    if ( !TQFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 )
+    if ( !TQFileInfo(filename).exists() || TQMake::Driver::parseFile( filename, &m_root, 0 ) != 0 )
     {
         kdDebug( 9024 ) << "Couldn't parse project: " << filename << endl;
         if( DomUtil::readBoolEntry( *m_part->projectDom(),
             "/kdevtrollproject/qmake/showParseErrors", true ) )
         {
-            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ),
+            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ),
                     i18n( "Could not parse project file" ) );
         }
         m_root = 0;
@@ -198,7 +198,7 @@ void Scope::saveToFile() const
         file.close();
     }else
     {
-        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ),
+        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ),
                 i18n( "Could not write project file" ) );
     }
 #ifdef DEBUG
@@ -291,13 +291,13 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri
     if( !m_root )
         return result;
 
-    TQValueList<QMake::AST*>::const_iterator it;
-    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it;
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
     {
-        QMake::AST* ast = *it;
-        if ( ast->nodeType() == QMake::AST::AssignmentAST )
+        TQMake::AST* ast = *it;
+        if ( ast->nodeType() == TQMake::AST::AssignmentAST )
         {
-            QMake::AssignmentAST * assign = static_cast<QMake::AssignmentAST*>( ast );
+            TQMake::AssignmentAST * assign = static_cast<TQMake::AssignmentAST*>( ast );
             if ( assign->scopedID == variable && assign->op == op )
             {
                 result += assign->values;
@@ -315,7 +315,7 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen
     if ( !m_root )
         return result;
 
-    if( m_varCache.contains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) )
+    if( m_varCache.tqcontains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) )
     {
         return m_varCache[variable];
     }
@@ -329,15 +329,15 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen
     return result;
 }
 
-void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const
+void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& result, bool checkIncParent, TQMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const
 {
     if( !m_root )
         return;
 
     /* For variables that we don't know and which are not QT/CONFIG find the default value */
     if( setDefault && m_defaultopts
-        && m_defaultopts->variables().findIndex(variable) != -1
-        && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) )
+        && m_defaultopts->variables().tqfindIndex(variable) != -1
+        && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.tqfindIndex(variable) == -1 || variable == "CONFIG" ) )
     {
         result = m_defaultopts->variableValues(variable);
     }
@@ -351,15 +351,15 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
         m_parent->calcValuesFromStatements( variable, result, true, this->m_incast, fetchFromParent, setDefault, evaluateSubScopes );
     }
 
-    TQValueList<QMake::AST*>::const_iterator it;
-    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it;
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
     {
         if ( stopHere && *it == stopHere )
             return ;
-        QMake::AST* ast = *it;
-        if ( ast->nodeType() == QMake::AST::AssignmentAST )
+        TQMake::AST* ast = *it;
+        if ( ast->nodeType() == TQMake::AST::AssignmentAST )
         {
-            QMake::AssignmentAST * assign = static_cast<QMake::AssignmentAST*>( ast );
+            TQMake::AssignmentAST * assign = static_cast<TQMake::AssignmentAST*>( ast );
             if ( assign->scopedID == variable )
             {
                 if ( assign->op == "=" )
@@ -370,7 +370,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
                 {
                     for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit )
                     {
-                        if ( result.findIndex( *sit ) == -1 )
+                        if ( result.tqfindIndex( *sit ) == -1 )
                             result.append( *sit );
                     }
                 }
@@ -378,21 +378,21 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
                 {
                     for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit )
                     {
-                        if ( result.findIndex( *sit ) != -1 )
+                        if ( result.tqfindIndex( *sit ) != -1 )
                             result.remove( *sit );
                     }
                 }
             }
         }else if( evaluateSubScopes )
         {
-            if( ast->nodeType() == QMake::AST::IncludeAST )
+            if( ast->nodeType() == TQMake::AST::IncludeAST )
             {
-                QMake::IncludeAST* iast = static_cast<QMake::IncludeAST*>(ast);
+                TQMake::IncludeAST* iast = static_cast<TQMake::IncludeAST*>(ast);
                 TQValueList<unsigned int> l = m_scopes.keys();
                 for( unsigned int i = 0; i < l.count(); ++i )
                 {
                     int num = l[ i ];
-                    if( m_scopes.contains( num ) )
+                    if( m_scopes.tqcontains( num ) )
                     {
                         Scope* s = m_scopes[num];
                         if( s && s->scopeType() == IncludeScope && s->m_incast == iast )
@@ -403,16 +403,16 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
                 }
 
             }
-            else if( ast->nodeType() == QMake::AST::ProjectAST )
+            else if( ast->nodeType() == TQMake::AST::ProjectAST )
             {
-                QMake::ProjectAST* past = static_cast<QMake::ProjectAST*>(ast);
+                TQMake::ProjectAST* past = static_cast<TQMake::ProjectAST*>(ast);
                 if( past->isFunctionScope() || past->isScope() )
                 {
                     TQValueList<unsigned int> l = m_scopes.keys();
                     for( unsigned int i = 0; i < l.count(); ++i )
                     {
                         int num = l[ i ];
-                        if( m_scopes.contains( num ) )
+                        if( m_scopes.tqcontains( num ) )
                         {
                             Scope* s = m_scopes[num];
                             if( s && s->m_root == past && s->m_root->scopedID == past->scopedID  )
@@ -486,13 +486,13 @@ Scope* Scope::createFunctionScope( const TQString& funcName, const TQString& arg
     if ( !m_root )
         return 0;
 
-    QMake::ProjectAST* ast = new QMake::ProjectAST( QMake::ProjectAST::FunctionScope );
+    TQMake::ProjectAST* ast = new TQMake::ProjectAST( TQMake::ProjectAST::FunctionScope );
     ast->scopedID = funcName;
     ast->args = args;
     ast->setDepth( m_root->depth() );
-    ast->addChildAST( new QMake::NewLineAST() );
+    ast->addChildAST( new TQMake::NewLineAST() );
     m_root->addChildAST( ast );
-    m_root->addChildAST( new QMake::NewLineAST() );
+    m_root->addChildAST( new TQMake::NewLineAST() );
     Scope* funcScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part );
     if( funcScope->scopeType() != Scope::InvalidScope )
     {
@@ -508,14 +508,14 @@ Scope* Scope::createSimpleScope( const TQString& scopename )
     if ( !m_root )
         return 0;
 
-    QMake::ProjectAST* ast = new QMake::ProjectAST( QMake::ProjectAST::Scope );
+    TQMake::ProjectAST* ast = new TQMake::ProjectAST( TQMake::ProjectAST::Scope );
     ast->scopedID = scopename;
-    ast->addChildAST( new QMake::NewLineAST() );
+    ast->addChildAST( new TQMake::NewLineAST() );
     ast->setDepth( m_root->depth() );
     m_root->addChildAST( ast );
-    m_root->addChildAST( new QMake::NewLineAST() );
+    m_root->addChildAST( new TQMake::NewLineAST() );
     /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows.
-    if ( m_part->isQt4Project() )
+    if ( m_part->isTQt4Project() )
         addToPlusOp( "CONFIG", TQStringList( scopename ) );
     */
     Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part );
@@ -547,7 +547,7 @@ Scope* Scope::createIncludeScope( const TQString& includeFile, bool negate )
     if( funcScope == 0 )
         return 0;
 
-    QMake::IncludeAST* ast = new QMake::IncludeAST();
+    TQMake::IncludeAST* ast = new TQMake::IncludeAST();
     ast->setDepth( m_root->depth() );
     ast->projectName = includeFile;
     Scope* incScope = new Scope( m_environment, funcScope->getNextScopeNum(), funcScope, ast, projectDir(), resolveVariables( ast->projectName ), m_defaultopts, m_part );
@@ -571,17 +571,17 @@ Scope* Scope::createSubProject( const TQString& projname )
     if( !m_root )
         return 0;
 
-    if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 )
+    if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( projname ) != -1 )
         removeFromMinusOp( "SUBDIRS", projname );
 
     TQString realprojname = resolveVariables(projname);
 
-    if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 )
+    if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( realprojname ) != -1 )
         removeFromMinusOp( "SUBDIRS", realprojname );
 
     TQDir curdir( projectDir() );
 
-    if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )
+    if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 )
     {
         TQString filename;
         if( !realprojname.endsWith(".pro") )
@@ -592,7 +592,7 @@ Scope* Scope::createSubProject( const TQString& projname )
             curdir.cd( realprojname );
             TQStringList entries = curdir.entryList("*.pro", TQDir::Files);
 
-            if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 )
+            if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) == -1 )
                 filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first();
             else
                 filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro";
@@ -622,13 +622,13 @@ Scope* Scope::createSubProject( const TQString& projname )
 
 bool Scope::deleteFunctionScope( unsigned int num )
 {
-    if ( !m_root || !m_scopes.contains( num ) )
+    if ( !m_root || !m_scopes.tqcontains( num ) )
         return false;
 
     Scope* funcScope = m_scopes[ num ];
     if ( funcScope )
     {
-        QMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( funcScope->m_root ) ];
         if( !ast )
             return false;
         m_scopes.remove( num );
@@ -642,13 +642,13 @@ bool Scope::deleteFunctionScope( unsigned int num )
 
 bool Scope::deleteSimpleScope( unsigned int num )
 {
-    if ( !m_root || !m_scopes.contains( num ) )
+    if ( !m_root || !m_scopes.tqcontains( num ) )
         return false;
 
     Scope* simpleScope = m_scopes[ num ];
     if ( simpleScope )
     {
-        QMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( simpleScope->m_root ) ];
         if( !ast )
             return false;
         m_scopes.remove( num );
@@ -663,13 +663,13 @@ bool Scope::deleteSimpleScope( unsigned int num )
 
 bool Scope::deleteIncludeScope( unsigned int num )
 {
-    if ( !m_root || !m_scopes.contains( num ) )
+    if ( !m_root || !m_scopes.tqcontains( num ) )
         return false;
 
     Scope * incScope = m_scopes[ num ];
     if( !incScope )
         return false;
-    QMake::AST* ast = incScope->m_incast;
+    TQMake::AST* ast = incScope->m_incast;
     if( !ast )
         return false;
     m_scopes.remove( num );
@@ -682,14 +682,14 @@ bool Scope::deleteIncludeScope( unsigned int num )
 
 bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
 {
-    if ( !m_root || !m_scopes.contains( num ) )
+    if ( !m_root || !m_scopes.tqcontains( num ) )
         return false;
 
-    TQValueList<QMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
-    if ( it != m_root->m_children.end() )
+    TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
+    if ( it != m_root->m_tqchildren.end() )
     {
-        QMake::AssignmentAST * tempast = static_cast<QMake::AssignmentAST*>( *it );
-        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() )
+        TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
+        if ( tempast->values.tqfindIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() )
         {
             Scope* project = m_scopes[ num ];
             if( !project )
@@ -722,12 +722,12 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
                     kdDebug(9024) << "removed subproject?:" << d.remove( dir ) << endl;
                 }
             }
-            TQValueList<QMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" );
-            if ( foundit != m_root->m_children.end() )
+            TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" );
+            if ( foundit != m_root->m_tqchildren.end() )
             {
-                QMake::AssignmentAST * ast = static_cast<QMake::AssignmentAST*>( *foundit );
+                TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit );
                 updateValues( ast->values, TQStringList( projdir ), true, ast->indent );
-                if( m_varCache.contains( "SUBDIRS" ) )
+                if( m_varCache.tqcontains( "SUBDIRS" ) )
                     m_varCache.erase( "SUBDIRS" );
             }else
                 return false;
@@ -746,7 +746,7 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue
 
     for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it )
     {
-        if ( origValues.findIndex( *it ) == -1 && !remove )
+        if ( origValues.tqfindIndex( *it ) == -1 && !remove )
         {
             while ( !origValues.isEmpty() && origValues.last() == getLineEndingString() )
                 origValues.pop_back();
@@ -769,17 +769,17 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue
                 origValues.append(" ");
             TQString newval = *it;
             TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)");
-            newval.replace(re, "\\1$(\\2)\\3");
-            if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") )
+            newval.tqreplace(re, "\\1$(\\2)\\3");
+            if( (newval).tqcontains(" ") || (newval).tqcontains("\t") || (newval).tqcontains( getLineEndingString() ) || (newval).tqcontains("#") )
                 origValues.append( "\""+newval+"\"" );
             else
                 origValues.append( newval );
             origValues.append( getLineEndingString() );
-        } else if ( origValues.findIndex( *it ) != -1 && remove )
+        } else if ( origValues.tqfindIndex( *it ) != -1 && remove )
         {
-            TQStringList::iterator posit = origValues.find( *it );
+            TQStringList::iterator posit = origValues.tqfind( *it );
             posit = origValues.remove( posit );
-            while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1
+            while( posit != origValues.end() && ( (*posit).tqfind( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1
                     || (*posit).stripWhiteSpace() == "" ) )
             {
                 posit = origValues.remove( posit );
@@ -790,9 +790,9 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue
             || origValues.last() == getLineEndingString()
             || origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() )
         origValues.pop_back();
-    if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 )
-        origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") );
-    if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 )
+    if( !origValues.isEmpty() && origValues.last().tqfind( TQRegExp("\\\\[ \t]*#") ) != -1 )
+        origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].tqfind( "#") );
+    if( !origValues.isEmpty() && origValues.last().tqfind( getLineEndingString() ) == -1 )
         origValues.append(getLineEndingString());
 }
 
@@ -801,14 +801,14 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
     if ( !m_root || listIsEmpty( values ) )
         return ;
 
-    if( m_varCache.contains( variable ) )
+    if( m_varCache.tqcontains( variable ) )
         m_varCache.erase( variable );
 
-    for ( int i = m_root->m_children.count() - 1; i >= 0; --i )
+    for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i )
     {
-        if ( m_root->m_children[ i ] ->nodeType() == QMake::AST::AssignmentAST )
+        if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            QMake::AssignmentAST * assignment = static_cast<QMake::AssignmentAST*>( m_root->m_children[ i ] );
+            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] );
             if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) )
             {
                 updateValues( assignment->values, values, removeFromOp, assignment->indent );
@@ -823,7 +823,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
             {
                 for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it )
                 {
-                    if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 )
+                    if ( op == "+=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 )
                     {
                         if ( assignment->op == "=" )
                         {
@@ -841,7 +841,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
                             }
                         }
                     }
-                    else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 )
+                    else if ( op == "-=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 )
                     {
                         updateValues( assignment->values, TQStringList( *it ), true, assignment->indent );
                         if ( listIsEmpty( assignment->values ) )
@@ -858,7 +858,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
                             m_root->removeChildAST( assignment );
                             delete assignment;
                         }
-                        else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 )
+                        else if ( assignment->op == "+=" && assignment->values.tqfindIndex( *it ) != -1 )
                         {
                             updateValues( assignment->values, TQStringList( *it ), true, assignment->indent );
                             if ( listIsEmpty( assignment->values ) )
@@ -876,7 +876,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
 
     if ( !removeFromOp )
     {
-        QMake::AssignmentAST * ast = new QMake::AssignmentAST();
+        TQMake::AssignmentAST * ast = new TQMake::AssignmentAST();
         ast->scopedID = variable;
         ast->op = op;
         updateValues( ast->values, values );
@@ -885,31 +885,31 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
         else
             ast->setDepth( m_root->depth()+1 );
         m_root->addChildAST( ast );
-        if ( values.findIndex( getLineEndingString() ) == -1 )
+        if ( values.tqfindIndex( getLineEndingString() ) == -1 )
         {
             ast->values.append( getLineEndingString() );
         }
     }
 }
 
-TQValueList<QMake::AST*>::iterator Scope::findExistingVariable( const TQString& variable )
+TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString& variable )
 {
-    TQValueList<QMake::AST*>::iterator it;
+    TQValueList<TQMake::AST*>::iterator it;
     TQStringList ops;
     ops << "=" << "+=";
 
-    for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it )
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it )
     {
-        if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST )
+        if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            QMake::AssignmentAST * assignment = static_cast<QMake::AssignmentAST*>( *it );
-            if ( assignment->scopedID == variable && ops.findIndex( assignment->op ) != -1 )
+            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( *it );
+            if ( assignment->scopedID == variable && ops.tqfindIndex( assignment->op ) != -1 )
             {
                 return it;
             }
         }
     }
-    return m_root->m_children.end();
+    return m_root->m_tqchildren.end();
 }
 
 void Scope::init()
@@ -920,17 +920,17 @@ void Scope::init()
     kdDebug(9024) << "Initializing Scope: " << scopeName() << this << endl;
     m_maxCustomVarNum = 1;
 
-    TQValueList<QMake::AST*>::const_iterator it;
-    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it;
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
     {
-        if ( ( *it ) ->nodeType() == QMake::AST::ProjectAST )
+        if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST )
         {
-            QMake::ProjectAST * p = static_cast<QMake::ProjectAST*>( *it );
+            TQMake::ProjectAST * p = static_cast<TQMake::ProjectAST*>( *it );
             m_scopes.insert( getNextScopeNum(), new Scope( m_environment, getNextScopeNum(), this, p, m_defaultopts, m_part ) );
         }
-        else if ( ( *it ) ->nodeType() == QMake::AST::IncludeAST )
+        else if ( ( *it ) ->nodeType() == TQMake::AST::IncludeAST )
         {
-            QMake::IncludeAST * i = static_cast<QMake::IncludeAST*>( *it );
+            TQMake::IncludeAST * i = static_cast<TQMake::IncludeAST*>( *it );
             TQString filename = i->projectName;
             if( i->projectName.stripWhiteSpace().startsWith("$") )
             {
@@ -938,11 +938,11 @@ void Scope::init()
             }
             m_scopes.insert( getNextScopeNum(), new Scope( m_environment, getNextScopeNum(), this, i, projectDir(), filename, m_defaultopts, m_part ) );
         }
-        else if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST )
+        else if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            QMake::AssignmentAST * m = static_cast<QMake::AssignmentAST*>( *it );
+            TQMake::AssignmentAST * m = static_cast<TQMake::AssignmentAST*>( *it );
             // Check wether TEMPLATE==subdirs here too!
-            if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 )
+            if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
             {
                 for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit )
                 {
@@ -977,7 +977,7 @@ void Scope::init()
                             }else
                                 continue;
                         }
-                        if ( subproject.entryList().isEmpty() || subproject.entryList().findIndex( str + ".pro" ) != -1 )
+                        if ( subproject.entryList().isEmpty() || subproject.entryList().tqfindIndex( str + ".pro" ) != -1 )
                             projectfile = (str) + ".pro";
                         else
                             projectfile = subproject.entryList().first();
@@ -992,16 +992,16 @@ void Scope::init()
             else
             {
                 if ( !(
-                         KnownVariables.findIndex( m->scopedID ) != -1
+                         KnownVariables.tqfindIndex( m->scopedID ) != -1
                          && ( m->op == "=" || m->op == "+=" || m->op == "-=")
                        )
                       && !(
-                            ( m->scopedID.contains( ".files" ) || m->scopedID.contains( ".path" ) )
-                            && variableValues("INSTALLS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) )
+                            ( m->scopedID.tqcontains( ".files" ) || m->scopedID.tqcontains( ".path" ) )
+                            && variableValues("INSTALLS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) )
                           )
                       && !(
-                            ( m->scopedID.contains( ".subdir" ) )
-                            && variableValues("SUBDIRS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) )
+                            ( m->scopedID.tqcontains( ".subdir" ) )
+                            && variableValues("SUBDIRS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) )
                           )
                     )
                 {
@@ -1040,7 +1040,7 @@ const TQMap<unsigned int, TQMap<TQString, TQString> > Scope::customVariables() c
     if( !m_root )
         return result;
 
-    TQMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin();
+    TQMap<unsigned int, TQMake::AssignmentAST*>::const_iterator it = m_customVariables.begin();
     for ( ; it != m_customVariables.end(); ++it )
     {
         TQMap<TQString,TQString> temp;
@@ -1056,11 +1056,11 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T
 {
     if( !m_root )
         return;
-    if ( id > 0 && m_customVariables.contains( id ) )
+    if ( id > 0 && m_customVariables.tqcontains( id ) )
     {
         m_customVariables[ id ] ->values.clear();
         updateValues( m_customVariables[ id ] ->values, newvalues.stripWhiteSpace() );
-        if( m_varCache.contains( m_customVariables[ id ]->scopedID ) )
+        if( m_varCache.tqcontains( m_customVariables[ id ]->scopedID ) )
             m_varCache.erase( m_customVariables[ id ]->scopedID );
         m_customVariables[ id ] ->op = newop;
         m_customVariables[ id ] ->scopedID = name;
@@ -1069,7 +1069,7 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T
 
 unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, const TQString& values )
 {
-    QMake::AssignmentAST* newast = new QMake::AssignmentAST();
+    TQMake::AssignmentAST* newast = new TQMake::AssignmentAST();
     newast->scopedID = var;
     newast->op = op;
     newast->values.append(values.stripWhiteSpace());
@@ -1084,11 +1084,11 @@ unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op,
 
 void Scope::removeCustomVariable( unsigned int id )
 {
-    if( m_customVariables.contains(id) )
+    if( m_customVariables.tqcontains(id) )
     {
-        QMake::AssignmentAST* m = m_customVariables[id];
+        TQMake::AssignmentAST* m = m_customVariables[id];
         m_customVariables.remove(id);
-        m_root->m_children.remove( m );
+        m_root->m_tqchildren.remove( m );
     }
 }
 
@@ -1097,12 +1097,12 @@ bool Scope::isVariableReset( const TQString& var )
     bool result = false;
     if( !m_root )
         return result;
-    TQValueList<QMake::AST*>::const_iterator it = m_root->m_children.begin();
-    for ( ; it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin();
+    for ( ; it != m_root->m_tqchildren.end(); ++it )
     {
-        if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST )
+        if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            QMake::AssignmentAST * ast = static_cast<QMake::AssignmentAST*>( *it );
+            TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *it );
             if ( ast->scopedID == var && ast->op == "=" )
             {
                 result = true;
@@ -1118,18 +1118,18 @@ void Scope::removeVariable( const TQString& var, const TQString& op )
     if ( !m_root )
         return ;
 
-    QMake::AssignmentAST* ast = 0;
+    TQMake::AssignmentAST* ast = 0;
 
-    TQValueList<QMake::AST*>::iterator it = m_root->m_children.begin();
-    for ( ; it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin();
+    for ( ; it != m_root->m_tqchildren.end(); ++it )
     {
-        if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST )
+        if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            ast = static_cast<QMake::AssignmentAST*>( *it );
+            ast = static_cast<TQMake::AssignmentAST*>( *it );
             if ( ast->scopedID == var && ast->op == op )
             {
-                m_root->m_children.remove( ast );
-                it = m_root->m_children.begin();
+                m_root->m_tqchildren.remove( ast );
+                it = m_root->m_tqchildren.begin();
             }
         }
     }
@@ -1182,9 +1182,9 @@ TQStringList Scope::cleanStringList(const TQStringList& list) const
     return result;
 }
 
-bool Scope::isQt4Project() const
+bool Scope::isTQt4Project() const
 {
-    return m_part->isQt4Project();
+    return m_part->isTQt4Project();
 }
 
 void Scope::reloadProject()
@@ -1209,7 +1209,7 @@ void Scope::reloadProject()
         delete m_root;
     if ( !loadFromFile( filename ) && !TQFileInfo( filename ).exists() )
     {
-        m_root = new QMake::ProjectAST();
+        m_root = new TQMake::ProjectAST();
         m_root->setFileName( filename );
     }
     init();
@@ -1220,20 +1220,20 @@ Scope* Scope::disableSubproject( const TQString& dir)
     if( !m_root || ( m_root->isProject() && !m_incast ) )
         return 0;
 
-    if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").findIndex( dir ) != -1 )
+    if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").tqfindIndex( dir ) != -1 )
         removeFromPlusOp( "SUBDIRS", dir );
     else if( scopeType() != Scope::IncludeScope )
         removeFromPlusOp( "SUBDIRS", dir );
 
     TQDir curdir( projectDir() );
 
-    if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )
+    if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 )
     {
         curdir.cd(dir);
         TQString filename;
         TQStringList entries = curdir.entryList("*.pro", TQDir::Files);
 
-        if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" )  != -1 )
+        if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" )  != -1 )
             filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first();
         else
             filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro";
@@ -1255,12 +1255,12 @@ TQString Scope::resolveVariables( const TQString& value ) const
 }
 
 
-TQString Scope::resolveVariables( const TQString& value, QMake::AST* stopHere ) const
+TQString Scope::resolveVariables( const TQString& value, TQMake::AST* stopHere ) const
 {
     return resolveVariables(TQStringList(value),  stopHere).front();
 }
 
-TQStringList Scope::variableValues( const TQString& variable, QMake::AST* stopHere, bool fetchFromParent ) const
+TQStringList Scope::variableValues( const TQString& variable, TQMake::AST* stopHere, bool fetchFromParent ) const
 {
     TQStringList result;
 
@@ -1272,7 +1272,7 @@ TQStringList Scope::variableValues( const TQString& variable, QMake::AST* stopHe
     return result;
 }
 
-TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* stopHere ) const
+TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* stopHere ) const
 {
     TQStringList result = values;
     TQMap<TQString, TQStringList> variables;
@@ -1285,7 +1285,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st
             pos = re.search( (*it), pos );
             if( pos > -1 )
             {
-                if( !variables.contains( re.cap(1) ) )
+                if( !variables.tqcontains( re.cap(1) ) )
                 {
                     variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) );
                     if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" )
@@ -1303,7 +1303,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st
             pos = re.search( (*it), pos );
             if( pos > -1 )
             {
-                if( !variables.contains( re.cap(1) ) )
+                if( !variables.tqcontains( re.cap(1) ) )
                 {
                     variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) );
                     if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" )
@@ -1322,8 +1322,8 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st
             pos = re.search( (*it), pos );
             if( pos > -1 )
             {
-                if( !envvars.contains( re.cap(1) ) )
-                    if( m_environment.contains( re.cap(1) ) != -1 )
+                if( !envvars.tqcontains( re.cap(1) ) )
+                    if( m_environment.tqcontains( re.cap(1) ) != -1 )
                         envvars[re.cap(1)] = m_environment[ re.cap(1) ];
                     else if ( ::getenv( re.cap(1).local8Bit() ) != 0 )
                         envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) );
@@ -1332,14 +1332,14 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st
         }
         for( TQMap<TQString, TQString>::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 )
         {
-            (*it).replace("$$("+it2.key()+")", it2.data() );
+            (*it).tqreplace("$$("+it2.key()+")", it2.data() );
         }
         for( TQMap<TQString, TQStringList>::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 )
         {
             for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 )
             {
-                (*it).replace("$$"+it2.key(), *it3 );
-                (*it).replace("$${"+it2.key()+"}", *it3 );
+                (*it).tqreplace("$$"+it2.key(), *it3 );
+                (*it).tqreplace("$${"+it2.key()+"}", *it3 );
             }
         }
     }
@@ -1353,7 +1353,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
     TQString file;
     TQStringList values;
     TQString header = "";
-    if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 )
+    if( variableValues("TEMPLATE",false ).tqfindIndex("subdirs") == -1 )
     {
         values = variableValues( "INSTALLS" ,false, false );
         TQStringList::const_iterator it;
@@ -1368,7 +1368,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
             {
                 file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit;
                 file = resolveVariables( file );
-                if( file.contains("*") )
+                if( file.tqcontains("*") )
                 {
                     TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file );
                     TQDir absDir = fi.dir( true );
@@ -1408,7 +1408,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
         {
             file = myRelPath + TQString(TQChar(TQDir::separator())) + *it;
             file = resolveVariables( file );
-            if( file.contains("*") )
+            if( file.tqcontains("*") )
             {
                 TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file );
                 TQDir absDir = fi.dir( true );
@@ -1426,7 +1426,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
             }
         }
 
-        if ( isQt4Project() )
+        if ( isTQt4Project() )
         {
             values = variableValues( "RESOURCES" ,false, false );
             for ( it = values.begin(); it != values.end(); ++it )
@@ -1481,7 +1481,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
                 file = resolveVariables( file );
                 res.insert( TQDir::cleanDirPath( file ) );
 
-                if( !m_part->isQt4Project())
+                if( !m_part->isTQt4Project())
                 {
                     header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h";
                     if( TQFileInfo(header).exists() )
@@ -1493,7 +1493,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
                 else
                 {
                     header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it;
-                    header.replace(TQRegExp("\\.ui$"),".h");
+                    header.tqreplace(TQRegExp("\\.ui$"),".h");
                     if( TQFileInfo(header).exists() )
                         res.insert( TQDir::cleanDirPath( header ) );
                 }
@@ -1541,7 +1541,7 @@ TQString Scope::findCustomVarForPath( const TQString& path )
     if( !m_root )
         return result;
 
-    TQMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin();
+    TQMap<unsigned int, TQMake::AssignmentAST*>::const_iterator it = m_customVariables.begin();
     for( ; it != m_customVariables.end(); ++it )
     {
         kdDebug(9024) << "Checking " << path << " against " << cleanStringList(it.data()->values) << endl;
@@ -1552,7 +1552,7 @@ TQString Scope::findCustomVarForPath( const TQString& path )
     }
     if( scopeType() != ProjectScope )
     {
-        return parent()->findCustomVarForPath( path );
+        return tqparent()->findCustomVarForPath( path );
     }
     return result;
 }
@@ -1561,7 +1561,7 @@ void Scope::loadDefaultOpts()
 {
     if( !m_defaultopts && m_root )
     {
-        m_defaultopts = new QMakeDefaultOpts();
+        m_defaultopts = new TQMakeDefaultOpts();
         if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/disableDefaultOpts", true ) )
         {
             m_defaultopts->readVariables( m_part->qmakePath(), TQFileInfo( m_root->fileName() ).dirPath( true ) );
@@ -1576,13 +1576,13 @@ TQString Scope::getLineEndingString() const
     {
         switch( m_root->lineEnding() )
         {
-            case QMake::ProjectAST::Windows:
+            case TQMake::ProjectAST::Windows:
                 return TQString("\r\n");
                 break;
-            case QMake::ProjectAST::MacOS:
+            case TQMake::ProjectAST::MacOS:
                 return TQString("\r");
                 break;
-            case QMake::ProjectAST::Unix:
+            case TQMake::ProjectAST::Unix:
                 return TQString("\n");
                 break;
         }
@@ -1595,13 +1595,13 @@ TQString Scope::getLineEndingString() const
 
 TQString Scope::replaceWs(TQString s)
 {
-    return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc");
+    return s.tqreplace( getLineEndingString(), "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc");
 }
 
 bool Scope::containsContinue(const TQString& s ) const
 {
-    return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1
-            || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 );
+    return( s.tqfind( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1
+            || s.tqfind( TQRegExp( "\\\\\\s*#" ) ) != -1 );
 }
 
 bool Scope::isComment( const TQString& s) const
@@ -1616,86 +1616,86 @@ void Scope::printTree()
     p.processProject(m_root);
 }
 
-Scope::PrintAST::PrintAST() : QMake::ASTVisitor()
+Scope::PrintAST::PrintAST() : TQMake::ASTVisitor()
 {
     indent = 0;
 }
 
-void Scope::PrintAST::processProject( QMake::ProjectAST* p )
+void Scope::PrintAST::processProject( TQMake::ProjectAST* p )
 {
-    QMake::ASTVisitor::processProject(p);
+    TQMake::ASTVisitor::processProject(p);
 }
 
-void Scope::PrintAST::enterRealProject( QMake::ProjectAST* p )
+void Scope::PrintAST::enterRealProject( TQMake::ProjectAST* p )
 {
     kdDebug(9024) << getIndent() << "--------- Entering Project: " << replaceWs(p->fileName()) << " --------------" << endl;
     indent += 4;
-    QMake::ASTVisitor::enterRealProject(p);
+    TQMake::ASTVisitor::enterRealProject(p);
 }
 
-void Scope::PrintAST::leaveRealProject( QMake::ProjectAST* p )
+void Scope::PrintAST::leaveRealProject( TQMake::ProjectAST* p )
 {
     indent -= 4;
     kdDebug(9024) << getIndent() << "--------- Leaving Project: " << replaceWs(p->fileName()) << " --------------" << endl;
-    QMake::ASTVisitor::leaveRealProject(p);
+    TQMake::ASTVisitor::leaveRealProject(p);
 }
 
-void Scope::PrintAST::enterScope( QMake::ProjectAST* p )
+void Scope::PrintAST::enterScope( TQMake::ProjectAST* p )
 {
     kdDebug(9024) << getIndent() << "--------- Entering Scope: " << replaceWs(p->scopedID) << " --------------" << endl;
     indent += 4;
-    QMake::ASTVisitor::enterScope(p);
+    TQMake::ASTVisitor::enterScope(p);
 }
 
-void Scope::PrintAST::leaveScope( QMake::ProjectAST* p )
+void Scope::PrintAST::leaveScope( TQMake::ProjectAST* p )
 {
     indent -= 4;
     kdDebug(9024) << getIndent() << "--------- Leaving Scope: " << replaceWs(p->scopedID) << " --------------" << endl;
-    QMake::ASTVisitor::leaveScope(p);
+    TQMake::ASTVisitor::leaveScope(p);
 }
 
-void Scope::PrintAST::enterFunctionScope( QMake::ProjectAST* p )
+void Scope::PrintAST::enterFunctionScope( TQMake::ProjectAST* p )
 {
     kdDebug(9024) << getIndent() << "--------- Entering FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl;
     indent += 4;
-    QMake::ASTVisitor::enterFunctionScope(p);
+    TQMake::ASTVisitor::enterFunctionScope(p);
 }
 
-void Scope::PrintAST::leaveFunctionScope( QMake::ProjectAST* p )
+void Scope::PrintAST::leaveFunctionScope( TQMake::ProjectAST* p )
 {
     indent -= 4;
     kdDebug(9024) << getIndent() << "--------- Leaving FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl;
-    QMake::ASTVisitor::leaveFunctionScope(p);
+    TQMake::ASTVisitor::leaveFunctionScope(p);
 }
 
 TQString Scope::PrintAST::replaceWs(TQString s)
 {
-    return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc");
+    return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc");
 }
 
-void Scope::PrintAST::processAssignment( QMake::AssignmentAST* a)
+void Scope::PrintAST::processAssignment( TQMake::AssignmentAST* a)
 {
     kdDebug(9024) << getIndent() << "Assignment: " << replaceWs(a->scopedID) << " " << replaceWs(a->op) << " "
         << replaceWs(a->values.join("|"))<< endl;
-    QMake::ASTVisitor::processAssignment(a);
+    TQMake::ASTVisitor::processAssignment(a);
 }
 
-void Scope::PrintAST::processNewLine( QMake::NewLineAST* n)
+void Scope::PrintAST::processNewLine( TQMake::NewLineAST* n)
 {
     kdDebug(9024) << getIndent() << "Newline " << endl;
-    QMake::ASTVisitor::processNewLine(n);
+    TQMake::ASTVisitor::processNewLine(n);
 }
 
-void Scope::PrintAST::processComment( QMake::CommentAST* a)
+void Scope::PrintAST::processComment( TQMake::CommentAST* a)
 {
     kdDebug(9024) << getIndent() << "Comment: " << replaceWs(a->comment) << endl;
-    QMake::ASTVisitor::processComment(a);
+    TQMake::ASTVisitor::processComment(a);
 }
 
-void Scope::PrintAST::processInclude( QMake::IncludeAST* a)
+void Scope::PrintAST::processInclude( TQMake::IncludeAST* a)
 {
     kdDebug(9024) << getIndent() << "Include: " << replaceWs(a->projectName) << endl;
-    QMake::ASTVisitor::processInclude(a);
+    TQMake::ASTVisitor::processInclude(a);
 }
 
 TQString Scope::PrintAST::getIndent()
@@ -1707,4 +1707,4 @@ TQString Scope::PrintAST::getIndent()
 }
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h
index 5cc609ce..a01adaad 100644
--- a/buildtools/qmake/scope.h
+++ b/buildtools/qmake/scope.h
@@ -64,7 +64,7 @@ public:
     TQStringList variableValuesForOp( const TQString& variable, const TQString& op ) const;
 
     // Fetch the variable values by running over the statements and adding/removing/setting
-    // as the encountered op's say, begin with the parent projects variableValues list
+    // as the encountered op's say, begin with the tqparent projects variableValues list
     TQStringList variableValues( const TQString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false );
 
     // Remove a variable+Op combination from the scope, if existant
@@ -86,8 +86,8 @@ public:
     // Returns the absolute path of the dir containing the .pro file
     TQString projectDir() const;
 
-    // get the parent Scope
-    Scope* parent() const { return m_parent; }
+    // get the tqparent Scope
+    Scope* tqparent() const { return m_parent; }
 
     // Fetching sub-scopes
     const TQValueList<Scope*> scopesInOrder() const { return m_scopes.values(); }
@@ -105,7 +105,7 @@ public:
      * creates a new function scope at the end of this (Sub-)AST
      * and a new include scope inside the new function scope.
      * It returns the Scope wrapping the include-AST, the function scope AST
-     * can be accessed easily using the parent() method.
+     * can be accessed easily using the tqparent() method.
      */
     Scope* createIncludeScope( const TQString& includeFile, bool negate = false );
 
@@ -125,8 +125,8 @@ public:
     /* deletes the subproject (including the subdir if deleteSubdir is true) */
     bool deleteSubProject( unsigned int, bool deleteSubdir );
 
-    /* find out wether the project is Qt4 or Qt3 */
-    bool isQt4Project() const ;
+    /* find out wether the project is TQt4 or TQt3 */
+    bool isTQt4Project() const ;
 
     /* Provide a Map of Custom variables */
     const TQMap<unsigned int, TQMap<TQString, TQString> > customVariables() const;
@@ -195,29 +195,29 @@ private:
     /*
      * Finds an existing variable, returns the end() of the statemenst if it is not found
      */
-    TQValueList<QMake::AST*>::iterator findExistingVariable( const TQString& variable );
+    TQValueList<TQMake::AST*>::iterator findExistingVariable( const TQString& variable );
 
     // Private constructors for easier subscope creation
     /*
      * just initializes the lists from the scope
      */
-    Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* root, QMakeDefaultOpts*, TrollProjectPart* part );
+    Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* root, TQMakeDefaultOpts*, TrollProjectPart* part );
     /*
      * reads the given filename and parses it. If it doesn't exist creates an empty
      * ProjectAST with the given filename
      */
-    Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true );
+    Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true );
     /*
      * Creates a scope for an include statement, parses the file and initializes the Scope
      * Create an empty ProjectAST if the file cannot be found or parsed.
      */
-    Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, const TQString& incfile, QMakeDefaultOpts*, TrollProjectPart* part );
+    Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts*, TrollProjectPart* part );
 
 
     // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0),
     // using the given list as startvalue
     // Changes the list using the +=, -=, = operations accordingly
-    void calcValuesFromStatements( const TQString& variable, TQStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const;
+    void calcValuesFromStatements( const TQString& variable, TQStringList& result, bool, TQMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const;
 
     // Check wether the two operators are compatible
     static bool isCompatible( const TQString& op1, const TQString& op2);
@@ -228,15 +228,15 @@ private:
     // Load and Save project files, these only work on ProjectScope's
     bool loadFromFile( const TQString& filename );
 
-    TQString funcScopeKey( QMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; }
+    TQString funcScopeKey( TQMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; }
 
     unsigned int getNextScopeNum() { if( m_scopes.isEmpty() ) return 0; else return (m_scopes.keys().last()+1); }
 
     TQStringList lookupVariable( const TQString& var );
 
-    TQStringList resolveVariables( const TQStringList&, QMake::AST* = 0 ) const;
-    TQStringList variableValues( const TQString& variable, QMake::AST*, bool fetchFromParent = true ) const;
-    TQString resolveVariables( const TQString& , QMake::AST* ) const;
+    TQStringList resolveVariables( const TQStringList&, TQMake::AST* = 0 ) const;
+    TQStringList variableValues( const TQString& variable, TQMake::AST*, bool fetchFromParent = true ) const;
+    TQString resolveVariables( const TQString& , TQMake::AST* ) const;
 
     // This function determines the currently used String for fileending, it can be \n, \r or \r\n
     TQString getLineEndingString() const;
@@ -246,9 +246,9 @@ private:
 
     void loadDefaultOpts();
 
-    QMake::ProjectAST* m_root;
-    QMake::IncludeAST* m_incast;
-    TQMap<unsigned int, QMake::AssignmentAST*> m_customVariables;
+    TQMake::ProjectAST* m_root;
+    TQMake::IncludeAST* m_incast;
+    TQMap<unsigned int, TQMake::AssignmentAST*> m_customVariables;
     TQMap<unsigned int, Scope*> m_scopes;
     Scope* m_parent;
     unsigned int m_maxCustomVarNum;
@@ -256,40 +256,40 @@ private:
     TQString replaceWs(TQString);
 
 
-    // The "position" inside the parent scope that this scope starts at
+    // The "position" inside the tqparent scope that this scope starts at
     unsigned int m_num;
     bool m_isEnabled;
     TrollProjectPart* m_part;
-    QMakeDefaultOpts* m_defaultopts;
+    TQMakeDefaultOpts* m_defaultopts;
     TQMap<TQString, TQStringList> m_varCache;
     TQMap<TQString,TQString> m_environment;
 
 #ifdef DEBUG
-    class PrintAST : QMake::ASTVisitor
+    class PrintAST : TQMake::ASTVisitor
     {
 
     public:
         PrintAST();
-        virtual void processProject( QMake::ProjectAST* p );
-        virtual void enterRealProject( QMake::ProjectAST* p );
+        virtual void processProject( TQMake::ProjectAST* p );
+        virtual void enterRealProject( TQMake::ProjectAST* p );
 
-        virtual void leaveRealProject( QMake::ProjectAST* p );
+        virtual void leaveRealProject( TQMake::ProjectAST* p );
 
-        virtual void enterScope( QMake::ProjectAST* p );
+        virtual void enterScope( TQMake::ProjectAST* p );
 
-        virtual void leaveScope( QMake::ProjectAST* p );
+        virtual void leaveScope( TQMake::ProjectAST* p );
 
-        virtual void enterFunctionScope( QMake::ProjectAST* p );
+        virtual void enterFunctionScope( TQMake::ProjectAST* p );
 
-        virtual void leaveFunctionScope( QMake::ProjectAST* p );
+        virtual void leaveFunctionScope( TQMake::ProjectAST* p );
 
-        virtual void processAssignment( QMake::AssignmentAST* a);
+        virtual void processAssignment( TQMake::AssignmentAST* a);
 
-        virtual void processNewLine( QMake::NewLineAST* n);
+        virtual void processNewLine( TQMake::NewLineAST* n);
 
-        virtual void processComment( QMake::CommentAST* a);
+        virtual void processComment( TQMake::CommentAST* a);
 
-        virtual void processInclude( QMake::IncludeAST* a);
+        virtual void processInclude( TQMake::IncludeAST* a);
 
         TQString replaceWs(TQString);
 
@@ -304,5 +304,5 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
diff --git a/buildtools/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp
index 3bf99a0e..adca9d44 100644
--- a/buildtools/qmake/trolllistview.cpp
+++ b/buildtools/qmake/trolllistview.cpp
@@ -20,9 +20,9 @@
 #include "trolllistview.h"
 
 
-TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent,
+TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *tqparent,
     TrollProjectWidget::TrollProjectView view, const char *name)
-    :KListView(parent, name), m_widget(widget), m_view(view)
+    :KListView(tqparent, name), m_widget(widget), m_view(view)
 {
 }
 
diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h
index 5fd79b30..9d843cb7 100644
--- a/buildtools/qmake/trolllistview.h
+++ b/buildtools/qmake/trolllistview.h
@@ -27,8 +27,9 @@
 class TrollListView : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0);
+    TrollListView(TrollProjectWidget *widget, TQWidget *tqparent, TrollProjectWidget::TrollProjectView view, const char *name = 0);
     ~TrollListView();
 protected:
     virtual void focusOutEvent(TQFocusEvent *e);
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index d59c5b4b..54d31735 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -60,8 +60,8 @@ typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
 static const KDevPluginInfo data("kdevtrollproject");
 K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
 
-TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
-    : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
+TrollProjectPart::TrollProjectPart(TQObject *tqparent, const char *name, const TQStringList& args )
+    : KDevBuildTool(&data, tqparent, name ? name : "TrollProjectPart")
 {
     setInstance(TrollProjectFactory::instance());
 
@@ -79,20 +79,20 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
 
     m_widget = new TrollProjectWidget(this);
     m_widget->setIcon(SmallIcon("qmakerun"));
-    m_widget->setCaption(i18n("QMake Manager"));
-    TQWhatsThis::add(m_widget, i18n("<b>QMake manager</b><p>"
-                                   "The QMake manager project tree consists of two parts. The 'overview' "
+    m_widget->setCaption(i18n("TQMake Manager"));
+    TQWhatsThis::add(m_widget, i18n("<b>TQMake manager</b><p>"
+                                   "The TQMake manager project tree consists of two parts. The 'overview' "
                                    "in the upper half shows the subprojects, each one having a "
                                    ".pro file. The 'details' view in the lower half shows the "
                                    "list of files for the active subproject selected in the overview."));
 
-    mainWindow()->embedSelectViewRight(m_widget, i18n("QMake Manager"), i18n("QMake manager"));
+    mainWindow()->embedSelectViewRight(m_widget, i18n("TQMake Manager"), i18n("TQMake manager"));
 
     KAction *action;
 
     const TQIconSet icon(SmallIcon("compfile"));
     action = new KAction( i18n("Compile &File"), "compfile", 0,
-                          m_widget, TQT_SLOT(slotBuildOpenFile()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildOpenFile()),
                           actionCollection(),"build_compilefile"  );
     action->setToolTip(i18n("Compile file"));
     action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>"
@@ -101,7 +101,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
 
 
     action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8,
-                          m_widget, TQT_SLOT(slotBuildProject()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildProject()),
                           actionCollection(), "build_build_project" );
     action->setToolTip(i18n("Build project"));
     action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>"
@@ -109,7 +109,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Rebuild Project"),"rebuild" , 0,
-                          m_widget, TQT_SLOT(slotRebuildProject()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildProject()),
                           actionCollection(),"build_rebuild_project"  );
     action->setToolTip(i18n("Rebuild project"));
     action->setWhatsThis(i18n("<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>"
@@ -117,7 +117,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Install Project"),"install" , 0,
-                          m_widget, TQT_SLOT(slotInstallProject()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallProject()),
                           actionCollection(),"build_install_project"  );
     action->setToolTip(i18n("Install project"));
     action->setWhatsThis(i18n("<b>Install project</b><p>Runs <b>make install</b> from the project directory.<br>"
@@ -125,7 +125,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Clean Project"), 0,
-                          m_widget, TQT_SLOT(slotCleanProject()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanProject()),
                           actionCollection(), "build_clean_project" );
     action->setToolTip(i18n("Clean project"));
     action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>"
@@ -133,7 +133,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Dist-Clean Project"), 0,
-                          m_widget, TQT_SLOT(slotDistCleanProject()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanProject()),
                           actionCollection(), "build_distclean_project" );
     action->setToolTip(i18n("Dist-Clean project"));
     action->setWhatsThis(i18n("<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the "
@@ -147,47 +147,47 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
     action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently selected subproject if it is an application or the program specified in project settings, <b>Run Options</b> tab."));
 
     action = new KAction( i18n("&Build Subproject"), "make_kdevelop", Key_F7,
-                          m_widget, TQT_SLOT(slotBuildTarget()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildTarget()),
                           actionCollection(), "build_build_target" );
     action->setToolTip(i18n("Build subproject"));
     action->setWhatsThis(i18n("<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. "
-                              "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>"
+                              "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>"
                               "Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Rebuild Subproject"), "rebuild", 0,
-                          m_widget, TQT_SLOT(slotRebuildTarget()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildTarget()),
                           actionCollection(),"build_rebuild_target"  );
     action->setToolTip(i18n("Rebuild subproject"));
     action->setWhatsThis(i18n("<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. "
-                              "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>"
+                              "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>"
                               "Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Install Subproject"), "install", 0,
-                          m_widget, TQT_SLOT(slotInstallTarget()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallTarget()),
                           actionCollection(),"build_install_target"  );
     action->setToolTip(i18n("Install subproject"));
     action->setWhatsThis(i18n("<b>Install subproject</b><p>Runs <b>make install</b> from the current subproject directory. "
-                              "The current subproject is the subproject selected in the <b>QMake manager</b> 'overview' window.<br>"
+                              "The current subproject is the subproject selected in the <b>TQMake manager</b> 'overview' window.<br>"
                               "Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Clean Subproject"), 0,
-                          m_widget, TQT_SLOT(slotCleanTarget()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanTarget()),
                           actionCollection(), "build_clean_target" );
     action->setToolTip(i18n("Clean subproject"));
     action->setWhatsThis(i18n("<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject directory. "
-                              "The current subproject is the subproject selected in the <b>QMake manager</b> 'overview' window.<br>"
+                              "The current subproject is the subproject selected in the <b>TQMake manager</b> 'overview' window.<br>"
                               "Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
     action = new KAction( i18n("&Dist-Clean Subproject"), 0,
-                          m_widget, TQT_SLOT(slotDistCleanTarget()),
+                          TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanTarget()),
                           actionCollection(), "build_distclean_target" );
     action->setToolTip(i18n("Dist-Clean subproject"));
     action->setWhatsThis(i18n("<b>Dist-Clean subproject</b><p>Runs <b>make distclean</b> from the current"
-                              " subproject directory. The current subproject is the subproject selected in the <b>QMake manager</b> 'overview' window.<br>"
+                              " subproject directory. The current subproject is the subproject selected in the <b>TQMake manager</b> 'overview' window.<br>"
                               "Environment variables and make arguments can be specified "
                               "in the project settings dialog, <b>Make Options</b> tab."));
 
@@ -205,15 +205,15 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
     connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)),
              this, TQT_SLOT(slotCommandFinished(const TQString&)) );
 
-    TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
+    TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
     TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "");
     TQString qtversion = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/version", "3");
 
-    if( m_defaultQtDir.isEmpty() || !isValidQtDir( m_defaultQtDir ) )
+    if( m_defaultTQtDir.isEmpty() || !isValidTQtDir( m_defaultTQtDir ) )
     {
-        m_defaultQtDir = findQtDir();
-        kdDebug(9024) << "Setting default dir to: " << m_defaultQtDir << endl;
-        DomUtil::writeEntry(*projectDom(), "/kdevcppsupport/qt/root", m_defaultQtDir );
+        m_defaultTQtDir = findTQtDir();
+        kdDebug(9024) << "Setting default dir to: " << m_defaultTQtDir << endl;
+        DomUtil::writeEntry(*projectDom(), "/kdevcppsupport/qt/root", m_defaultTQtDir );
     }
     if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) )
     {
@@ -244,10 +244,10 @@ TQString TrollProjectPart::makeEnvironment()
 
     TQString environstr;
     DomUtil::PairList::ConstIterator it;
-    bool hasQtDir = false;
+    bool hasTQtDir = false;
     for (it = envvars.begin(); it != envvars.end(); ++it) {
-        if( (*it).first == "QTDIR" )
-	    hasQtDir = true;
+        if( (*it).first == "TQTDIR" )
+	    hasTQtDir = true;
 
         environstr += (*it).first;
         environstr += "=";
@@ -255,9 +255,9 @@ TQString TrollProjectPart::makeEnvironment()
         environstr += " ";
     }
 
-    if( !hasQtDir && !isQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() )
+    if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() )
     {
-         environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$QTDIR/bin:$PATH " );
+         environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " );
     }
 
     KConfigGroup grp( kapp->config(), "MakeOutputView" );
@@ -276,7 +276,7 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg)
     vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", KIcon::SizeMedium ));
     MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevtrollproject", vbox);
 
-    vbox = dlg->addVBoxPage(i18n("QMake Manager"), i18n("QMake Manager"), BarIcon( "make", KIcon::SizeMedium ));
+    vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", KIcon::SizeMedium ));
     QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox);
 
 
@@ -290,32 +290,32 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
 {
     mainWindow()->statusBar()->message( i18n("Loading Project...") );
 
-    TQString defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
-    if( !isQt4Project() && ( defaultQtDir.isEmpty() || !isValidQtDir( defaultQtDir ) ) )
+    TQString defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
+    if( !isTQt4Project() && ( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) )
     {
         bool doask = true;
         while( doask )
         {
-            KURLRequesterDlg dlg( i18n("Choose Qt3 directory"),
-                i18n("Choose the Qt3 directory to use. This directory needs to have an include directory containing tqt.h.")
+            KURLRequesterDlg dlg( i18n("Choose TQt3 directory"),
+                i18n("Choose the TQt3 directory to use. This directory needs to have an include directory containing tqt.h.")
                                   , m_widget, 0);
             dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly );
-            dlg.urlRequester() ->setURL( TQString::null );
+            dlg.urlRequester() ->setURL( TQString() );
             dlg.urlRequester() ->completionObject() ->setDir( "/" );
 
             if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() )
             {
                 TQString qtdir = dlg.urlRequester()->url();
-                if( !isValidQtDir( qtdir ) )
+                if( !isValidTQtDir( qtdir ) )
                 {
                     if( KMessageBox::warningYesNo( m_widget,
-                                                i18n("The directory you gave is not a proper Qt directory, the "
+                                                i18n("The directory you gave is not a proper TQt directory, the "
                                                     "project might not work properly without one.\nPlease make "
                                                     "sure you give a directory that contains a bin with the "
-                                                    "qmake binary in it and for Qt3 project also contains an "
+                                                    "qmake binary in it and for TQt3 project also contains an "
                                                     "include directory with tqt.h in it.\nDo you want to try "
-                                                    "setting a Qt directory again?"),
-                                                i18n("Wrong Qt directory given"))
+                                                    "setting a TQt directory again?"),
+                                                i18n("Wrong TQt directory given"))
                         == KMessageBox::Yes
                     )
                     doask = true;
@@ -323,17 +323,17 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
                     doask = false;
                 }else
                 {
-                    defaultQtDir = qtdir;
+                    defaultTQtDir = qtdir;
                     doask = false;
                 }
 
             }else
             {
                 if( KMessageBox::warningYesNo( m_widget,
-                                               i18n("You did not specify a Qt directory, and the project might not "
-                                                   "work properly without one.\nDo you want to try setting a Qt"
+                                               i18n("You did not specify a TQt directory, and the project might not "
+                                                   "work properly without one.\nDo you want to try setting a TQt"
                                                    " directory again?"),
-                                               i18n("No Qt directory given"))
+                                               i18n("No TQt directory given"))
                         == KMessageBox::Yes
                     )
                     doask = true;
@@ -348,10 +348,10 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
         bool doask = true;
         while( doask )
         {
-            KURLRequesterDlg dlg( i18n("Choose QMake executable"),
-                i18n("Choose the QMake binary to use. QMake is used to generate Makefiles from the project files."), m_widget, 0);
+            KURLRequesterDlg dlg( i18n("Choose TQMake executable"),
+                i18n("Choose the TQMake binary to use. TQMake is used to generate Makefiles from the project files."), m_widget, 0);
             dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly );
-            dlg.urlRequester() ->setURL( TQString::null );
+            dlg.urlRequester() ->setURL( TQString() );
             dlg.urlRequester() ->completionObject() ->setDir( "/" );
 
             if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() )
@@ -363,8 +363,8 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
                                                 i18n("The binary you gave is not executable, the "
                                                     "project might not work properly.\nPlease make "
                                                     "sure you give a qmake binary that is executable.\nDo you want to try "
-                                                    "setting the QMake binary again?"),
-                                                i18n("Wrong QMake binary given"))
+                                                    "setting the TQMake binary again?"),
+                                                i18n("Wrong TQMake binary given"))
                         == KMessageBox::Yes
                     )
                     doask = true;
@@ -379,10 +379,10 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
             }else
             {
                 if( KMessageBox::warningYesNo( m_widget,
-                                               i18n("You did not specify a QMake binary, and the project might not "
-                                                   "work properly without one.\nDo you want to try setting a QMake"
+                                               i18n("You did not specify a TQMake binary, and the project might not "
+                                                   "work properly without one.\nDo you want to try setting a TQMake"
                                                    " binary again?"),
-                                               i18n("No QMake binary given"))
+                                               i18n("No TQMake binary given"))
                         == KMessageBox::Yes
                     )
                     doask = true;
@@ -391,7 +391,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj
             }
         }
     }
-    DomUtil::writeEntry( *projectDom(), "/kdevcppsupport/qt/root", defaultQtDir );
+    DomUtil::writeEntry( *projectDom(), "/kdevcppsupport/qt/root", defaultTQtDir );
     DomUtil::writeEntry( *projectDom(), "/kdevcppsupport/qt/qmake", qmakePath );
 
     m_projectName = projectName;
@@ -479,8 +479,8 @@ TQString TrollProjectPart::runDirectory() const
     }else
     {
         TQString name = m_widget->getCurrentOutputFilename();
-        if( name.findRev("/") != -1 )
-            name = name.right( name.length()-name.findRev("/")-1 );
+        if( name.tqfindRev("/") != -1 )
+            name = name.right( name.length()-name.tqfindRev("/")-1 );
         cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name );
     }
     if( cwd.isEmpty() )
@@ -490,7 +490,7 @@ TQString TrollProjectPart::runDirectory() const
         {
             destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath;
         }
-        destpath = destpath.left( destpath.findRev("/") );
+        destpath = destpath.left( destpath.tqfindRev("/") );
         cwd = destpath;
     }
 
@@ -535,17 +535,17 @@ TQString TrollProjectPart::mainProgram() const
             KMessageBox::error( m_widget, "There's no selected subproject!\n"
                                 "Unable to determine the main program", "No selected subproject found" );
             kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl;
-            return TQString::null;
+            return TQString();
         }
 
-        if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 )
+        if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 )
         {
             KMessageBox::error( m_widget, "Selected Subproject \""+m_widget->currentSubproject()->scope->projectName()+"\"isn't binary ( " + m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") + " ) !\n"
                                 "Unable to determine the main program. If you want this\n"
                                 "to be the selected subproject, set a main program under\n"
                                 "Project -> Project Options -> Run Options", "Selected subproject is not a library" );
             kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") << ") ! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl;
-            return TQString::null;
+            return TQString();
         }
 
         TQString destpath = m_widget->getCurrentTarget();
@@ -647,10 +647,10 @@ void TrollProjectPart::startMakeCommand(const TQString &dir, const TQString &tar
 
     TQFileInfo fi(dir + "/Makefile");
     if (!fi.exists()) {
-        int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), TQString::null, i18n("Run qmake"), i18n("Do Not Run"));
+        int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), TQString(), i18n("Run qmake"), i18n("Do Not Run"));
         if (r == KMessageBox::No)
             return;
-        startQMakeCommand(dir);
+        startTQMakeCommand(dir);
     }
     TQDomDocument &dom = *projectDom();
 
@@ -692,7 +692,7 @@ void TrollProjectPart::startMakeCommand(const TQString &dir, const TQString &tar
 }
 */
 
-void TrollProjectPart::startQMakeCommand(const TQString &dir, bool recursive)
+void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive)
 {
     TQFileInfo fi(dir);
     TQString cmdline;
@@ -705,24 +705,24 @@ void TrollProjectPart::startQMakeCommand(const TQString &dir, bool recursive)
         cmdline = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "")+" ";
     }
 
-    if(isQt4Project() && recursive)
+    if(isTQt4Project() && recursive)
     {
         cmdline += " -recursive ";
     }
 
-    //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " );
+    //TQString cmdline = TQString::tqfromLatin1( isTMakeProject() ? "tmake " : "qmake " );
 //    cmdline += fi.baseName() + ".pro";
     TQDir d(dir);
     TQStringList l = d.entryList("*.pro");
 
-    if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) )
+    if( l.isEmpty() || ( l.count() && l.tqfindIndex( projectName() + ".pro" ) != -1 ) )
         cmdline += projectName()+".pro";
-    else if( l.isEmpty() || (l.count() && l.findIndex( fi.baseName() + ".pro" ) != -1 ) )
+    else if( l.isEmpty() || (l.count() && l.tqfindIndex( fi.baseName() + ".pro" ) != -1 ) )
         cmdline += fi.baseName() + ".pro";
     else
         cmdline += l[0];
 
-//    cmdline += TQString::fromLatin1( " -o Makefile" );
+//    cmdline += TQString::tqfromLatin1( " -o Makefile" );
 
     TQString dircmd = "cd ";
     dircmd += KProcess::quote(dir);
@@ -744,7 +744,7 @@ void TrollProjectPart::slotCommandFinished( const TQString& command )
 //     if( m_buildCommand != command )
 //         return;
 //
-//     m_buildCommand = TQString::null;
+//     m_buildCommand = TQString();
 
     m_timestamp.clear();
     TQStringList fileList = allFiles();
@@ -778,7 +778,7 @@ bool TrollProjectPart::isDirty()
         TQString fileName = *it;
         ++it;
 
-        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName );
+        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName );
         TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified();
         if( it == m_timestamp.end() || *it != t ){
             return true;
@@ -790,37 +790,37 @@ bool TrollProjectPart::isDirty()
 
 KDevProject::Options TrollProjectPart::options( ) const
 {
-    return UsesQMakeBuildSystem;
+    return UsesTQMakeBuildSystem;
 }
 
-bool TrollProjectPart::isValidQtDir( const TQString& path ) const
+bool TrollProjectPart::isValidTQtDir( const TQString& path ) const
 {
     TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+
                    "include"+TQString( TQChar( TQDir::separator() ) )+
                    "tqt.h" );
-    return ( isQt4Project() || ( !isQt4Project() && inc.exists() ) );
+    return ( isTQt4Project() || ( !isTQt4Project() && inc.exists() ) );
 }
 
 void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const
 {
-    if( !isQt4Project() )
+    if( !isTQt4Project() )
     {
-        TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
-        if( !m_defaultQtDir.isEmpty() )
-            dirs << (m_defaultQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" );
-        dirs << ( ::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" );
+        TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "");
+        if( !m_defaultTQtDir.isEmpty() )
+            dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" );
+        dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" );
     }
     TQStringList paths = TQStringList::split(":",::getenv("PATH"));
     dirs += paths;
     TQString binpath = TQDir::rootDirPath() + "bin";
-    if( dirs.findIndex( binpath ) != -1 )
+    if( dirs.tqfindIndex( binpath ) != -1 )
         dirs << binpath;
 
     binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin";
-    if( dirs.findIndex( binpath ) != -1 )
+    if( dirs.tqfindIndex( binpath ) != -1 )
         dirs << binpath;
     binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin";
-    if( dirs.findIndex( binpath ) != -1 )
+    if( dirs.tqfindIndex( binpath ) != -1 )
         dirs << binpath;
 }
 
@@ -847,21 +847,21 @@ bool TrollProjectPart::isExecutable( const TQString& path ) const
     return( fi.exists() && fi.isExecutable() );
 }
 
-TQString TrollProjectPart::findQtDir()
+TQString TrollProjectPart::findTQtDir()
 {
     TQStringList qtdirs;
-    if( !isQt4Project() )
-        qtdirs.push_back( ::getenv("QTDIR") );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    if( !isTQt4Project() )
+        qtdirs.push_back( ::getenv("TQTDIR") );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr" );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );
 
     for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it )
     {
         TQString qtdir = *it;
-        if( !qtdir.isEmpty() && isValidQtDir(qtdir) )
+        if( !qtdir.isEmpty() && isValidTQtDir(qtdir) )
         {
             return qtdir;
         }
@@ -874,8 +874,8 @@ TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir
 {
 	TQStringList fileList;
 
-	if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." )
-		&& !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") )
+	if( !currDir.tqcontains( TQString( TQChar ( TQDir::separator() ) ) +".." )
+		&& !currDir.tqcontains( TQString( TQChar( TQDir::separator() ) )+".") )
 	{
 		TQDir dir(currDir);
 		TQStringList dirList = dir.entryList(TQDir::Dirs );
@@ -909,7 +909,7 @@ TQStringList TrollProjectPart::distFiles() const
 	return sourceList + files;
 }
 
-bool TrollProjectPart::isQt4Project() const
+bool TrollProjectPart::isTQt4Project() const
 {
 	return ( DomUtil::readIntEntry( *projectDom(), "kdevcppsupport/qt/version", 3 ) == 4 );
 }
@@ -926,6 +926,6 @@ void TrollProjectPart::slotBuild()
 
 #include "trollprojectpart.moc"
 
-//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
 
diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h
index 945fb10a..baeddc90 100644
--- a/buildtools/qmake/trollprojectpart.h
+++ b/buildtools/qmake/trollprojectpart.h
@@ -26,18 +26,19 @@
 class KDialogBase;
 class TrollProjectWidget;
 class KDirWatch;
-class QMakeDefaultOpts;
+class TQMakeDefaultOpts;
 
 class TrollProjectPart : public KDevBuildTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TrollProjectPart( TQObject *parent, const char *name, const TQStringList &args );
+    TrollProjectPart( TQObject *tqparent, const char *name, const TQStringList &args );
     ~TrollProjectPart();
 
     bool isTMakeProject() const { return m_tmakeProject; }
-    bool isQt4Project() const;
+    bool isTQt4Project() const;
     bool isDirty();
     KDirWatch* dirWatch();
     virtual Options options() const;
@@ -74,15 +75,15 @@ private slots:
 
 private:
 //    void startMakeCommand(const TQString &dir, const TQString &target);
-    void startQMakeCommand(const TQString &dir, bool recursive = false );
+    void startTQMakeCommand(const TQString &dir, bool recursive = false );
 //     void execute(const TQString &directory, const TQString &command);
     void queueCmd(const TQString &dir, const TQString &cmd);
     TQString makeEnvironment();
 
-    TQString findQtDir();
+    TQString findTQtDir();
     TQString findExecutable( const TQString& path ) const;
     void buildBinDirs( TQStringList& ) const;
-    bool isValidQtDir( const TQString& path ) const;
+    bool isValidTQtDir( const TQString& path ) const;
     bool isExecutable( const TQString& path ) const;
 
     TQGuardedPtr<TrollProjectWidget> m_widget;
@@ -98,7 +99,7 @@ private:
 
     friend class TrollProjectWidget;
     friend class ProjectRunOptionsDlg;
-    friend class QMakeDefaultOpts;
+    friend class TQMakeDefaultOpts;
 };
 
 #endif
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 087367bd..b6ec8f5e 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -12,7 +12,7 @@
 *   Copyright (C) 2006 by Andreas Pakulat                                 *
 *   apaku@gmx.de                                                          *
 *                                                                         *
-*   Part of this file is taken from Qt Designer.                          *
+*   Part of this file is taken from TQt Designer.                          *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
@@ -84,7 +84,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
         m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false)
 {
 
-    TQSplitter * splitter = new TQSplitter( Vertical, this );
+    TQSplitter * splitter = new TQSplitter(Qt::Vertical, this );
 
     //////////////////
     // PROJECT VIEW //
@@ -93,7 +93,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     overviewContainer = new TQVBox( splitter, "Projects" );
     overviewContainer->setMargin ( 2 );
     overviewContainer->setSpacing ( 2 );
-    //    overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+    //    overviewContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
     //    splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint);
 
     projectTools = new TQHBox( overviewContainer, "Project buttons" );
@@ -102,7 +102,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Add subdir
     addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" );
     addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) );
-    addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) );
+    addSubdirButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) );
     addSubdirButton->setEnabled ( true );
     TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) );
     TQWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
@@ -111,15 +111,15 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Create scope
     createScopeButton = new TQToolButton ( projectTools, "Create scope button" );
     createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) );
-    createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) );
+    createScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) );
     createScopeButton->setEnabled ( true );
     TQToolTip::add( createScopeButton, i18n( "Create scope" ) );
-    TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates QMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) );
+    TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) );
 
     // build
     buildProjectButton = new TQToolButton ( projectTools, "Make button" );
     buildProjectButton->setPixmap ( SmallIcon ( "make_kdevelop" ) );
-    buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) );
+    buildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) );
     buildProjectButton->setEnabled ( true );
     TQToolTip::add( buildProjectButton, i18n( "Build project" ) );
     TQWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>"
@@ -128,7 +128,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // rebuild
     rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" );
     rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) );
-    rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) );
+    rebuildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) );
     rebuildProjectButton->setEnabled ( true );
     TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) );
     TQWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>"
@@ -138,7 +138,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // run
     executeProjectButton = new TQToolButton ( projectTools, "Run button" );
     executeProjectButton->setPixmap ( SmallIcon ( "exec" ) );
-    executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
+    executeProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
     executeProjectButton->setEnabled ( true );
     TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) );
     TQWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) );
@@ -148,10 +148,10 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Project configuration
     projectconfButton = new TQToolButton ( projectTools, "Project configuration button" );
     projectconfButton->setPixmap ( SmallIcon ( "configure" ) );
-    projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) );
+    projectconfButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) );
     projectconfButton->setEnabled ( true );
     TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) );
-    TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog for the currently selected subproject. "
+    TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently selected subproject. "
                          "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
                          "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
 
@@ -172,7 +172,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
 //     overview->setResizeMode( TQListView::LastColumn );
     overview->setSorting( -1 );
     overview->header() ->hide();
-    overview->addColumn( TQString::null );
+    overview->addColumn( TQString() );
 
     // Project tree connections
     connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
@@ -189,7 +189,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     detailContainer = new TQVBox( splitter, "Details" );
     detailContainer->setMargin ( 2 );
     detailContainer->setSpacing ( 2 );
-    //    detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    //    detailContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 
     // Details Toolbar
     fileTools = new TQHBox( detailContainer, "Detail buttons" );
@@ -199,7 +199,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Add new file button
     newfileButton = new TQToolButton ( fileTools, "Create new file" );
     newfileButton->setPixmap ( SmallIcon ( "filenew" ) );
-    newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) );
+    newfileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) );
     newfileButton->setEnabled ( true );
     TQToolTip::add( newfileButton, i18n( "Create new file" ) );
     TQWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
@@ -207,7 +207,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Add existing files button
     addfilesButton = new TQToolButton ( fileTools, "Add existing files" );
     addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) );
-    addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) );
+    addfilesButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) );
     addfilesButton->setEnabled ( true );
     TQToolTip::add( addfilesButton, i18n( "Add existing files" ) );
     TQWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
@@ -217,7 +217,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // remove file button
     removefileButton = new TQToolButton ( fileTools, "Remove file" );
     removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) );
-    removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) );
+    removefileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) );
     removefileButton->setEnabled ( true );
     TQToolTip::add( removefileButton, i18n( "Remove file" ) );
     TQWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) );
@@ -225,7 +225,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // build selected file
     buildFileButton = new TQToolButton ( fileTools, "Make file button" );
     buildFileButton->setPixmap ( SmallIcon ( "compfile" ) );
-    buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) );
+    buildFileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) );
     buildFileButton->setEnabled ( true );
     TQToolTip::add( buildFileButton, i18n( "Compile file" ) );
     TQWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>"
@@ -235,28 +235,28 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // build
     buildTargetButton = new TQToolButton ( fileTools, "Make sp button" );
     buildTargetButton->setPixmap ( SmallIcon ( "make_kdevelop" ) );
-    buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) );
+    buildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) );
     buildTargetButton->setEnabled ( true );
     TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) );
     TQWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. "
-                         "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>"
+                         "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>"
                          "Environment variables and make arguments can be specified "
                          "in the project settings dialog, <b>Make Options</b> tab." ) );
     // rebuild
     rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" );
     rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) );
-    rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) );
+    rebuildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) );
     rebuildTargetButton->setEnabled ( true );
     TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) );
     TQWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. "
-                         "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>"
+                         "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>"
                          "Environment variables and make arguments can be specified "
                          "in the project settings dialog, <b>Make Options</b> tab." ) );
 
     // run
     executeTargetButton = new TQToolButton ( fileTools, "Run sp button" );
     executeTargetButton->setPixmap ( SmallIcon ( "exec" ) );
-    executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
+    executeTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
     executeTargetButton->setEnabled ( true );
     TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) );
     TQWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. "
@@ -271,7 +271,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Configure file button
     excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" );
     excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) );
-    excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) );
+    excludeFileFromScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) );
     excludeFileFromScopeButton->setEnabled ( true );
     TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) );
     TQWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) );
@@ -282,7 +282,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     details->setResizeMode( TQListView::LastColumn );
     details->setSorting( -1 );
     details->header() ->hide();
-    details->addColumn( TQString::null );
+    details->addColumn( TQString() );
     // Detail button connections
     connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) );
     connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) );
@@ -339,9 +339,9 @@ void TrollProjectWidget::openProject( const TQString &dirName )
         TQStringList l = dir.entryList( "*.pro" );
 
         TQString profile;
-        if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1  )
+        if( l.count() && l.tqfindIndex( m_part->projectName() + ".pro") != -1  )
             profile = m_part->projectName()+".pro";
-        else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1  ) )
+        else if( l.isEmpty() || ( l.count() && l.tqfindIndex( fi.baseName() + ".pro") != -1  ) )
             profile = fi.baseName()+".pro";
         else
           profile = l[0];
@@ -358,11 +358,11 @@ void TrollProjectWidget::openProject( const TQString &dirName )
     if( m_rootScope->scopeType() != Scope::InvalidScope )
     {
 
-        m_rootSubproject = new QMakeScopeItem( overview, m_rootScope->scopeName(), m_rootScope, this );
+        m_rootSubproject = new TQMakeScopeItem( overview, m_rootScope->scopeName(), m_rootScope, this );
 
 
         m_rootSubproject->setOpen( true );
-        if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
+        if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 )
         {
             overview->setSelected( m_rootSubproject->firstChild(), true );
         }
@@ -380,7 +380,7 @@ void TrollProjectWidget::openProject( const TQString &dirName )
 
 }
 
-void TrollProjectWidget::createQMakeScopeItems()
+void TrollProjectWidget::createTQMakeScopeItems()
 {
 
 }
@@ -407,7 +407,7 @@ TQStringList TrollProjectWidget::allFiles()
 TQString TrollProjectWidget::projectDirectory()
 {
     if ( !m_rootScope )
-        return TQString::null; //confused
+        return TQString(); //confused
 
     return m_rootScope->projectDir();
 }
@@ -416,7 +416,7 @@ TQString TrollProjectWidget::projectDirectory()
 TQString TrollProjectWidget::subprojectDirectory()
 {
     if ( !m_shownSubproject )
-        return TQString::null;
+        return TQString();
 
     return m_shownSubproject->scope->projectDir();
 }
@@ -433,11 +433,11 @@ void TrollProjectWidget::setupContext()
 
     TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" );
 
-    if ( tmpl.findIndex( "lib" ) != -1 )
+    if ( tmpl.tqfindIndex( "lib" ) != -1 )
     {
         runable = false;
     }
-    else if ( tmpl.findIndex( "subdirs" ) != -1 )
+    else if ( tmpl.tqfindIndex( "subdirs" ) != -1 )
     {
         hasSubdirs = true;
         runable = false;
@@ -480,7 +480,7 @@ void TrollProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
         return ;
     }
     cleanDetailView( m_shownSubproject );
-    m_shownSubproject = static_cast<QMakeScopeItem*>( item );
+    m_shownSubproject = static_cast<TQMakeScopeItem*>( item );
     setupContext();
     buildProjectDetailTree( m_shownSubproject, details );
 
@@ -519,7 +519,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
     if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() )
     {
         TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName());
-        return exe.replace( TQRegExp( "\\.pro$" ), "" );
+        return exe.tqreplace( TQRegExp( "\\.pro$" ), "" );
     }
     else
     {
@@ -527,9 +527,9 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
     }
 }
 
-void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
+void TrollProjectWidget::cleanDetailView( TQMakeScopeItem *item )
 {
-    // If no children in detailview
+    // If no tqchildren in detailview
     // it is a subdir template
     if ( item && details->childCount() )
     {
@@ -545,7 +545,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 //         {
 //             // After AddTargetDialog, it can happen that an
 //             // item is not yet in the list view, so better check...
-//             if ( it1.data() ->parent() )
+//             if ( it1.data() ->tqparent() )
 //                 while ( it1.data() ->firstChild() )
 //                     it1.data() ->takeItem( it1.data() ->firstChild() );
 //             details->takeItem( it1.data() );
@@ -553,11 +553,11 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
     }
 }
 
-void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl )
+void TrollProjectWidget::buildProjectDetailTree( TQMakeScopeItem *item, KListView *listviewControl )
 {
 
-    // Insert all GroupItems and all of their children into the view
-    if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
+    // Insert all GroupItems and all of their tqchildren into the view
+    if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 )
         return ;
 
     TQMapIterator<GroupItem::GroupType, GroupItem*> it2 = item->groups.begin();
@@ -628,7 +628,7 @@ void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item )
     TQString filePath;
     if( m_shownSubproject->scope->scopeType() == Scope::IncludeScope )
     {
-        filePath = m_shownSubproject->scope->parent()->projectDir();
+        filePath = m_shownSubproject->scope->tqparent()->projectDir();
     }else
     {
         filePath = m_shownSubproject->scope->projectDir();
@@ -669,7 +669,7 @@ void TrollProjectWidget::slotExecuteTarget()
 
 
     // Only run application projects
-    if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) == -1 )
+    if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) == -1 )
         return ;
 
     //only run once
@@ -689,7 +689,7 @@ void TrollProjectWidget::slotExecuteTarget()
     TQString program = KProcess::quote( "." + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename() );
 
     // Build environment variables to prepend to the executable path
-    TQString runEnvVars = TQString::null;
+    TQString runEnvVars = TQString();
     DomUtil::PairList list =
         DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" );
 
@@ -820,7 +820,7 @@ void TrollProjectWidget::slotRebuildTarget()
     m_part->queueCmd( dir, dircmd + rebuildcmd );
 }
 
-void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem )
+void TrollProjectWidget::slotCreateScope( TQMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
@@ -835,7 +835,7 @@ void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem )
     return ;
 }
 
-void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem )
+void TrollProjectWidget::slotAddSubproject( TQMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
@@ -850,7 +850,7 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem )
     KURLRequesterDlg dialog( i18n( "Add Subproject" ), i18n( "Please enter a name for the subproject: " ), this, 0 );
     KURLRequester* req = dialog.urlRequester();
     req->setMode( KFile::Directory | KFile::File | KFile::LocalOnly );
-    req->setFilter( "*.pro|QMake Project Files (*.pro)" );
+    req->setFilter( "*.pro|TQMake Project Files (*.pro)" );
     req->setURL( TQString() );
     req->fileDialog()->setURL( KURL::fromPathOrURL( projectdir ) );
     req->completionObject() ->setDir( projectdir );
@@ -898,12 +898,12 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem )
     }
 }
 
-void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQString& subdirname )
+void TrollProjectWidget::addSubprojectToItem( TQMakeScopeItem* spitem, const TQString& subdirname )
 {
     TQListViewItem* item = spitem->firstChild();
     while( item )
     {
-        QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item);
+        TQMakeScopeItem* sitem = static_cast<TQMakeScopeItem*>(item);
         if( sitem->scope->scopeName() == subdirname )
         {
             if( sitem->scope->isEnabled() )
@@ -913,7 +913,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt
             {
                 spitem->scope->removeFromMinusOp( "SUBDIRS", subdirname );
                 delete item;
-                if( spitem->scope->variableValues( "SUBDIRS" ).findIndex( subdirname ) != -1 )
+                if( spitem->scope->variableValues( "SUBDIRS" ).tqfindIndex( subdirname ) != -1 )
                     return;
             }
         }
@@ -923,7 +923,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt
     Scope* subproject = spitem->scope->createSubProject( subdirname );
     if( subproject )
     {
-        new QMakeScopeItem( spitem, subproject->scopeName(), subproject );
+        new TQMakeScopeItem( spitem, subproject->scopeName(), subproject );
 //             TQListViewItem* lastitem = spitem->firstChild();
 //             while( lastitem->nextSibling() != 0 )
 //                 lastitem = lastitem->nextSibling();
@@ -938,11 +938,11 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt
     spitem->sortChildItems( 0, true );
 }
 
-void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem )
+void TrollProjectWidget::slotRemoveSubproject( TQMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
-    else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->parent() ) ) != NULL )
+    else if ( ( spitem = dynamic_cast<TQMakeScopeItem *>( m_shownSubproject->tqparent() ) ) != NULL )
     {
 
         m_filesCached = false;
@@ -971,10 +971,10 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     if ( !item )
         return ;
 
-    QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item );
+    TQMakeScopeItem *spitem = static_cast<TQMakeScopeItem*>( item );
 
     KPopupMenu popup( this );
-    popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) );
+    popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) );
 
     int idBuild = -2;
     int idRebuild = -2;
@@ -991,75 +991,75 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     int idAddScope = -2;
 
 
-    if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) )
+    if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->tqparent() || spitem->scope->tqparent()->scopeType() == Scope::ProjectScope ) )
     {
         idBuild = popup.insertItem( SmallIcon( "make_kdevelop" ), i18n( "Build" ) );
-        popup.setWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
+        popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
                                            "Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
         idInstall = popup.insertItem( i18n( "Install" ) );
-        popup.setWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>"
+        popup.tqsetWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>"
                                            "Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
         idClean = popup.insertItem( i18n( "Clean" ) );
-        popup.setWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
+        popup.tqsetWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
                                            "directory.<br> Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
         idDistClean = popup.insertItem( i18n( "Dist-Clean" ) );
-        popup.setWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project "
+        popup.tqsetWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project "
                                            "directory.<br> Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
 
         idRebuild = popup.insertItem( SmallIcon( "rebuild" ), i18n( "Rebuild" ) );
-        popup.setWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
+        popup.tqsetWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
                                              "the project directory.<br>Environment variables and make arguments can be "
                                              "specified in the project settings dialog, <b>Make Options</b> tab." ) );
         idQmake = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake" ) );
-        popup.setWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) );
+        popup.tqsetWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) );
         idQmakeRecursive = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake recursively" ) );
-        popup.setWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected "
+        popup.tqsetWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected "
                             "subproject directory and recurses into all subproject directories. "
                             "This creates or regenerates Makefile." ) );
 
         popup.insertSeparator();
         idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) );
-        popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
+        popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
                             "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be "
                             "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
-        if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
+        if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idAddSubproject, false );
         idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) );
-        popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
-        if ( spitem->parent() == NULL )
+        popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
+        if ( spitem->tqparent() == NULL )
             popup.setItemEnabled( idRemoveSubproject, false );
         idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
-        popup.setWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates QMake scope in the project file of the currently selected subproject." ) );
+        popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) );
         popup.insertSeparator();
         idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Subproject Settings" ) );
-        popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog. "
+        popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
                             "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
                             "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
     }
     else
     {
         idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
-        popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates QMake scope in the currently selected scope." ) );
+        popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) );
         idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) );
-        popup.setWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) );
+        popup.tqsetWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) );
         popup.insertSeparator();
         idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) );
-        popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
+        popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
                             "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be "
                             "defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
-        if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
+        if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idAddSubproject, false );
         idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) );
-        popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
-        if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
+        popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
+        if( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idDisableSubproject, false );
         popup.insertSeparator();
         idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) );
-        popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog. "
+        popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
                             "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
                             "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
     }
@@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     else if ( r == idBuild )
     {
         slotBuildTarget();
-        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1(""));
+        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1(""));
     }
     else if ( r == idInstall )
     {
         slotInstallTarget();
-        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1(""));
+        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1(""));
     }
     else if ( r == idRebuild )
     {
@@ -1112,11 +1112,11 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
 
     else if ( r == idQmake )
     {
-        m_part->startQMakeCommand( projectDirectory() + TQString(TQChar(TQDir::separator())) + relpath );
+        m_part->startTQMakeCommand( projectDirectory() + TQString(TQChar(TQDir::separator())) + relpath );
     }
     else if ( r == idQmakeRecursive )
     {
-        runQMakeRecursive( spitem );
+        runTQMakeRecursive( spitem );
     }
 
     else if ( r == idProjectConfiguration )
@@ -1144,7 +1144,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype,
 
     GroupItem *gitem = 0;
 
-    if ( m_shownSubproject->groups.contains( gtype ) )
+    if ( m_shownSubproject->groups.tqcontains( gtype ) )
         gitem = m_shownSubproject->groups[ gtype ];
 
     if ( !gitem )
@@ -1170,12 +1170,12 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo
         TQString fileName = *it;
         kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl;
 
-        if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") )
+        if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") )
         {
             ChooseSubprojectDlg dlg( this, false );
             if ( dlg.exec() == TQDialog::Accepted )
             {
-                if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )
+                if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 )
                 {
                     fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() ,
                                                 TQDir::cleanDirPath(
@@ -1213,7 +1213,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo
         kdDebug(9024) << "calc filename:" << noPathFileName << endl;
 //         GroupItem *gitem = 0;
 //         GroupItem::GroupType gtype = GroupItem::groupTypeForExtension( ext );
-//         if ( m_shownSubproject->groups.contains( gtype ) )
+//         if ( m_shownSubproject->groups.tqcontains( gtype ) )
 //             gitem = m_shownSubproject->groups[ gtype ];
 
 
@@ -1301,13 +1301,13 @@ void TrollProjectWidget::slotAddFiles()
             case AddFilesDialog::Link:
                 {
                     // Link selected files to current subproject folder
-                    KProcess *proc = new KProcess( this );
+                    KProcess *proc = new KProcess( TQT_TQOBJECT(this) );
                     *proc << "ln";
                     *proc << "-s";
                     *proc << files[ i ];
                     *proc << cleanSubprojectDir;
                     proc->start(KProcess::Block);
-                    TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 );
+                    TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 );
                     // and add them to the filelist
                     TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename );
                     if ( testExist.exists() )
@@ -1331,14 +1331,14 @@ void TrollProjectWidget::slotAddFiles()
     }
 }
 
-GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item )
+GroupItem* TrollProjectWidget::getInstallRoot( TQMakeScopeItem* item )
 {
-    if ( item->groups.contains( GroupItem::InstallRoot ) )
+    if ( item->groups.tqcontains( GroupItem::InstallRoot ) )
         return item->groups[ GroupItem::InstallRoot ];
     return 0;
 }
 
-GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const TQString& objectname )
+GroupItem* TrollProjectWidget::getInstallObject( TQMakeScopeItem* item, const TQString& objectname )
 {
     GroupItem * instroot = getInstallRoot( item );
     if ( !instroot )
@@ -1363,7 +1363,7 @@ void TrollProjectWidget::slotNewFile()
 
     if( !gitem )
     {
-        gitem = dynamic_cast<GroupItem*>( details->currentItem()->parent() );
+        gitem = dynamic_cast<GroupItem*>( details->currentItem()->tqparent() );
     }
 
     if ( gitem )
@@ -1376,7 +1376,7 @@ void TrollProjectWidget::slotNewFile()
                                       i18n( "Insert New Filepattern" ),
                                       i18n( "Please enter a filepattern relative the current "
                                             "subproject (example docs/*.html):" ),
-                                      TQString::null, &ok, this );
+                                      TQString(), &ok, this );
             if ( ok && !filepattern.isEmpty() )
             {
                 addFileToCurrentSubProject( gitem, filepattern );
@@ -1391,7 +1391,7 @@ void TrollProjectWidget::slotNewFile()
             TQString install_obj = KInputDialog::getText(
                                       i18n( "Insert New Install Object" ),
                                       i18n( "Please enter a name for the new object:" ),
-                                      TQString::null, &ok, this );
+                                      TQString(), &ok, this );
             if ( ok && !install_obj.isEmpty() )
             {
                 gitem->addInstallObject( install_obj );
@@ -1416,7 +1416,7 @@ void TrollProjectWidget::slotNewFile()
                 fcext = "h";
                 break;
             case GroupItem::Forms:
-                if ( !m_part->isQt4Project() )
+                if ( !m_part->isTQt4Project() )
                     fcext = "ui-widget";
                 else
                     fcext = "ui-widget-qt4";
@@ -1434,7 +1434,7 @@ void TrollProjectWidget::slotNewFile()
                 fcext = "qrc";
                 break;
             default:
-                fcext = TQString::null;
+                fcext = TQString();
         }
     }
     KDevCreateFile::CreatedFile crFile =
@@ -1469,7 +1469,7 @@ void TrollProjectWidget::slotExcludeFileFromScopeButton()
         return ;
     FileItem *fitem = static_cast<FileItem*>( pvitem );
 
-    GroupItem *gitem = static_cast<GroupItem*>( fitem->parent() );
+    GroupItem *gitem = static_cast<GroupItem*>( fitem->tqparent() );
 
     gitem->removeFileFromScope( fitem->text( 0 ) );
 }
@@ -1544,41 +1544,41 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         if ( titem->groupType == GroupItem::InstallRoot )
         {
             idInsInstallObject = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Install Object..." ) );
-            popup.setWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates QMake install object. "
+            popup.tqsetWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. "
                                 "It is possible to define a list of files to install and installation locations for each object. Warning! "
                                 "Install objects without path specified will not be saved to a project file." ) );
         }
         else if ( titem->groupType == GroupItem::InstallObject )
         {
             idSetInstObjPath = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Install Path..." ) );
-            popup.setWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) );
+            popup.tqsetWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) );
             idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Pattern of Files to Install..." ) );
-            popup.setWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. "
+            popup.tqsetWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. "
                                 "It is possible to use wildcards and relative paths like <i>docs/*</i>." ) );
             idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) );
-            popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) );
+            popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) );
         }
         else if ( titem->groupType == GroupItem::Translations )
         {
             idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) );
-            popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) );
+            popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) );
             idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) );
-            popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is "
+            popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is "
                                 "possible to copy files to a current subproject directory, create symbolic links or "
                                 "add them with the relative path." ) );
             idLUpdate = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Update Translation Files" ) );
-            popup.setWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable "
+            popup.tqsetWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable "
                                                  "messages and saves them into translation files." ) );
             idLRelease = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Release Binary Translations" ) );
-            popup.setWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary "
+            popup.tqsetWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary "
                                                   "translation files that are ready to be loaded at program execution." ) );
         }
         else // File group containing files
         {
             idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) );
-            popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
+            popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
             idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) );
-            popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
+            popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
                                 "possible to copy files to a current subproject directory, create symbolic links or "
                                 "add them with the relative path." ) );
         }
@@ -1604,7 +1604,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
                                       i18n( "Add Pattern of Files to Install" ),
                                       i18n( "Enter a pattern relative to the current "
                                             "subproject (example docs/*.html):" ),
-                                      TQString::null, &ok, this );
+                                      TQString(), &ok, this );
             if ( ok && !filepattern.isEmpty() )
             {
                 addFileToCurrentSubProject( titem, filepattern );
@@ -1645,13 +1645,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
                     case AddFilesDialog::Link:
                         {
                             // Link selected files to current subproject folder
-                            KProcess *proc = new KProcess( this );
+                            KProcess *proc = new KProcess( TQT_TQOBJECT(this) );
                             *proc << "ln";
                             *proc << "-s";
                             *proc << files[ i ];
                             *proc << cleanSubprojectPath;
                             proc->start(KProcess::Block);
-                            TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 );
+                            TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 );
                             // and add them to the filelist
                             TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename );
                             if ( testExist.exists() )
@@ -1694,7 +1694,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
                     fcext = "h";
                     break;
                 case GroupItem::Forms:
-                    if ( !m_part->isQt4Project() )
+                    if ( !m_part->isTQt4Project() )
                         fcext = "ui-widget";
                     else
                         fcext = "ui-widget-qt4";
@@ -1712,7 +1712,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
                     fcext = "qrc";
                     break;
                 default:
-                    fcext = TQString::null;
+                    fcext = TQString();
             }
             KDevCreateFile::CreatedFile crFile =
                 createFileSupport->createNewFile( fcext, cleanSubprojectPath );
@@ -1724,7 +1724,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
             TQString install_obj = KInputDialog::getText(
                                       i18n( "Add Install Object" ),
                                       i18n( "Enter a name for the new object:" ),
-                                      TQString::null, &ok, this );
+                                      TQString(), &ok, this );
             if ( ok && !install_obj.isEmpty() )
             {
                 titem->addInstallObject( install_obj );
@@ -1744,7 +1744,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
             m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false );
         }else if( r == idRemoveFile )
         {
-            static_cast<GroupItem*>(titem->parent())->removeInstallObject( titem );
+            static_cast<GroupItem*>(titem->tqparent())->removeInstallObject( titem );
             slotOverviewSelectionChanged( m_shownSubproject );
         }
     }
@@ -1753,13 +1753,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 
         removefileButton->setEnabled( true );
         FileItem *fitem = static_cast<FileItem*>( pvitem );
-        GroupItem* gitem = static_cast<GroupItem*>( item->parent() );
+        GroupItem* gitem = static_cast<GroupItem*>( item->tqparent() );
 
         KPopupMenu popup( this );
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
-            popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) );
+            popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) );
         else
-            popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) );
+            popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) );
 
         int idRemoveFile = -2;
         int idSubclassWidget = -2;
@@ -1773,37 +1773,37 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         if ( !fitem->uiFileLink.isEmpty() )
         {
             idUpdateWidgetclass = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Edit ui-Subclass..." ) );
-            popup.setWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
+            popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
                                 "and prompts to implement missing in childclass slots and functions." ) );
         }
-        if ( fitem->text( 0 ).contains( ".ui" ) )
+        if ( fitem->text( 0 ).tqcontains( ".ui" ) )
         {
             idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) );
-            popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. "
+            popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. "
                                 "It allows to create a subclass from the class defined in .ui file. "
                                 "There is also possibility to implement slots and functions defined in the base class." ) );
-            if ( !m_part->isQt4Project() )
+            if ( !m_part->isTQt4Project() )
             {
                 idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) );
-                popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) );
+                popup.tqsetWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) );
             }
             idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) );
-            popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. "
+            popup.tqsetWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. "
                                 "There is possibility to add or remove subclasses from the list." ) );
         }
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
         {
             idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) );
-            popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) );
+            popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) );
             idFileProperties = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Exclude File" ) );
-            popup.setWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) );
+            popup.tqsetWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) );
         }
         else
         {
             idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) );
-            popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) );
+            popup.tqsetWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) );
             idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) );
-            popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) );
+            popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) );
         }
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
         {
@@ -1815,7 +1815,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         if ( gitem->groupType == GroupItem::Sources )
         {
             idBuildFile = popup.insertItem( SmallIconSet( "make_kdevelop" ), i18n( "Build File" ) );
-            popup.setWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) );
+            popup.tqsetWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) );
         }
 
         int r = popup.exec( p );
@@ -1827,9 +1827,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         }
         else if ( r == idViewUIH )
         {
-            kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl;
+            kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).tqreplace(".ui","") << endl;
             m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) +
-                    fitem->localFilePath.replace(".ui","") + ".h" ) );
+                    fitem->localFilePath.tqreplace(".ui","") + ".h" ) );
 
         }
         else if ( r == idSubclassWidget )
@@ -1850,7 +1850,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 
                     list << DomUtil::Pair( srcfile_relpath, uifile_relpath );
                     DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list );
-                    //                    newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),"");
+                    //                    newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(projectDirectory()+"/"),"");
                     qWarning( "new file: %s", newFileNames[ i ].latin1() );
                 }
                 m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" ,
@@ -1862,11 +1862,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         else if ( r == idUpdateWidgetclass )
         {
             TQString noext = fitem->text( 0 );
-            if ( noext.findRev( '.' ) > -1 )
-                noext = noext.left( noext.findRev( '.' ) );
+            if ( noext.tqfindRev( '.' ) > -1 )
+                noext = noext.left( noext.tqfindRev( '.' ) );
             TQStringList dummy;
             TQString uifile = fitem->uiFileLink;
-            if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 )
+            if ( uifile.tqfindRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 )
             {
                 TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile );
                 uifile = uisplit[ uisplit.count() - 1 ];
@@ -1898,7 +1898,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         }
         else if ( r == idEditInstallPattern )
         {
-            GroupItem * titem = static_cast<GroupItem*>( item->parent() );
+            GroupItem * titem = static_cast<GroupItem*>( item->tqparent() );
 
             bool ok = FALSE;
             TQString filepattern = KInputDialog::getText(
@@ -1921,9 +1921,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 }
 
 
-void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
+void TrollProjectWidget::removeFile( TQMakeScopeItem *spitem, FileItem *fitem )
 {
-    GroupItem * gitem = static_cast<GroupItem*>( fitem->parent() );
+    GroupItem * gitem = static_cast<GroupItem*>( fitem->tqparent() );
 
     m_filesCached = false;
     m_allFilesCache.clear();
@@ -1932,12 +1932,12 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
     if ( KMessageBox::warningYesNo( this,
                                     "<qt>" +
                                     i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" )
-                                    .arg( fitem->text( 0 ) ) +
+                                    .tqarg( fitem->text( 0 ) ) +
                                     "</qt>",
                                     i18n( "Remove File" ),
                                     KStdGuiItem::remove(),
                                         KStdGuiItem::no(),
-                                        "deleteFileFromQMakeProject" ) == KMessageBox::No )
+                                        "deleteFileFromTQMakeProject" ) == KMessageBox::No )
     {
         return;
     }else
@@ -2028,9 +2028,9 @@ void TrollProjectWidget::slotBuildOpenFile()
     m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() );
     //    m_part->startMakeCommand(buildDir, target);
 
-    TQPtrList<QMakeScopeItem> list = findSubprojectForFile( fi );
+    TQPtrList<TQMakeScopeItem> list = findSubprojectForFile( fi );
 
-    QMakeScopeItem *spitem;
+    TQMakeScopeItem *spitem;
     for ( spitem = list.first(); spitem; spitem = list.next() )
     {
         TQString buildcmd = constructMakeCommandLine( spitem->scope );
@@ -2050,7 +2050,7 @@ void TrollProjectWidget::slotExecuteProject()
     if ( program.isEmpty() )
     {
         KMessageBox::sorry( this, i18n( "Please specify the executable name in the "
-                                        "project options dialog or select an application subproject in the QMake Manager." ), i18n( "No Executable Found" ) );
+                                        "project options dialog or select an application subproject in the TQMake Manager." ), i18n( "No Executable Found" ) );
         return ;
     }
 
@@ -2072,7 +2072,7 @@ void TrollProjectWidget::slotExecuteProject()
 
 
     // Build environment variables to prepend to the executable path
-    TQString runEnvVars = TQString::null;
+    TQString runEnvVars = TQString();
     DomUtil::PairList list =
         DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" );
 
@@ -2112,7 +2112,7 @@ void TrollProjectWidget::slotDistCleanTarget()
     runClean(m_shownSubproject, "distclean");
 }
 
-void TrollProjectWidget::runClean( QMakeScopeItem* item, const TQString& cleantargetname )
+void TrollProjectWidget::runClean( TQMakeScopeItem* item, const TQString& cleantargetname )
 {
     // no subproject selected
     m_part->partController() ->saveAllFiles();
@@ -2165,7 +2165,7 @@ TQString TrollProjectWidget::constructMakeCommandLine( Scope* s )
 }
 
 
-void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item )
+void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, TQMakeScopeItem *item )
 {
     TQFileInfo fi;
     TQFileInfo fi2;
@@ -2183,25 +2183,25 @@ void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScop
     }
     if ( !fi.exists() && !fi2.exists() )
     {
-        int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), TQString::null, i18n( "Run qmake" ), i18n( "Do Not Run" ) );
+        int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), TQString(), i18n( "Run qmake" ), i18n( "Do Not Run" ) );
         if ( r == KMessageBox::No )
             return ;
-        m_part->startQMakeCommand( dir );
+        m_part->startTQMakeCommand( dir );
     }
 }
 
-QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath )
+TQMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath )
 {
     if( !m_rootSubproject )
         return 0;
     TQStringList dirs = TQStringList::split("/", relPath);
-    QMakeScopeItem* pitem = static_cast<QMakeScopeItem*>(m_rootSubproject);
+    TQMakeScopeItem* pitem = static_cast<TQMakeScopeItem*>(m_rootSubproject);
     for( TQStringList::iterator it = dirs.begin(); it != dirs.end(); ++it)
     {
         TQListViewItem* item = pitem->firstChild();
         while( item )
         {
-            QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item);
+            TQMakeScopeItem* sitem = static_cast<TQMakeScopeItem*>(item);
             if( TQFileInfo( sitem->scope->projectDir() ).fileName() == *it )
             {
                 pitem = sitem;
@@ -2212,14 +2212,14 @@ QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPa
     return pitem;
 }
 
-TQPtrList<QMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi )
+TQPtrList<TQMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi )
 {
-    TQPtrList<QMakeScopeItem> list;
+    TQPtrList<TQMakeScopeItem> list;
     findSubprojectForFile( list, m_rootSubproject, fi.absFilePath() );
     return list;
 }
 
-void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath )
+void TrollProjectWidget::findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list, TQMakeScopeItem * item, TQString absFilePath )
 {
     if( !item )
         return;
@@ -2245,7 +2245,7 @@ void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list,
     TQListViewItem * child = item->firstChild();
     while ( child )
     {
-        QMakeScopeItem * spitem = dynamic_cast<QMakeScopeItem*>( child );
+        TQMakeScopeItem * spitem = dynamic_cast<TQMakeScopeItem*>( child );
 
         if ( spitem )
         {
@@ -2256,7 +2256,7 @@ void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list,
     }
 }
 
-void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
+void TrollProjectWidget::slotRemoveScope( TQMakeScopeItem * spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
@@ -2265,7 +2265,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
         m_filesCached = false;
         m_allFilesCache.clear();
 
-        QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->parent() );
+        TQMakeScopeItem* pitem = dynamic_cast<TQMakeScopeItem *>( spitem->tqparent() );
         if ( pitem != 0 )
         {
             switch ( spitem->scope->scopeType() )
@@ -2287,7 +2287,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
                     //                     pitem->scopes.remove( spitem );
                     delete spitem;
                     spitem = pitem;
-                    pitem = dynamic_cast<QMakeScopeItem *>( pitem->parent() );
+                    pitem = dynamic_cast<TQMakeScopeItem *>( pitem->tqparent() );
                     //                     pitem->scopes.remove(spitem);
                     break;
                 case Scope::SimpleScope:
@@ -2311,13 +2311,13 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
     }
 }
 
-QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * scope )
+TQMakeScopeItem * TrollProjectWidget::findSubprojectForScope( TQMakeScopeItem * scope )
 {
-    if ( ( scope == 0 ) || ( scope->parent() == 0 ) )
+    if ( ( scope == 0 ) || ( scope->tqparent() == 0 ) )
         return 0;
     if ( scope->scope->scopeType() == Scope::ProjectScope )
         return scope;
-    return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->parent() ) );
+    return findSubprojectForScope( dynamic_cast<TQMakeScopeItem *>( scope->tqparent() ) );
 }
 
 void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ )
@@ -2338,22 +2338,22 @@ void TrollProjectWidget::setLastFocusedView( TrollProjectView view )
     m_lastFocusedView = view;
 }
 
-void TrollProjectWidget::runQMakeRecursive( QMakeScopeItem* proj )
+void TrollProjectWidget::runTQMakeRecursive( TQMakeScopeItem* proj )
 {
-    if( m_part->isQt4Project() )
+    if( m_part->isTQt4Project() )
     {
-        m_part->startQMakeCommand( proj->scope->projectDir(), true );
+        m_part->startTQMakeCommand( proj->scope->projectDir(), true );
     }else
     {
         if ( proj->scope->scopeType() == Scope::ProjectScope )
         {
-            m_part->startQMakeCommand( proj->scope->projectDir() );
+            m_part->startTQMakeCommand( proj->scope->projectDir() );
         }
-        QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() );
+        TQMakeScopeItem* item = static_cast<TQMakeScopeItem*>( proj->firstChild() );
         while ( item )
         {
-            runQMakeRecursive( item );
-            item = static_cast<QMakeScopeItem*>( item->nextSibling() );
+            runTQMakeRecursive( item );
+            item = static_cast<TQMakeScopeItem*>( item->nextSibling() );
         }
     }
 }
@@ -2371,7 +2371,7 @@ void TrollProjectWidget::slotBuildSelectedFile()
     buildFile( m_shownSubproject, fitem );
 }
 
-void TrollProjectWidget::buildFile( QMakeScopeItem* spitem, FileItem* fitem )
+void TrollProjectWidget::buildFile( TQMakeScopeItem* spitem, FileItem* fitem )
 {
     TQFileInfo fi( spitem->scope->projectDir() + TQChar( TQDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) );
     TQString sourceDir = fi.dirPath();
@@ -2421,12 +2421,12 @@ bool TrollProjectWidget::isTMakeProject()
     return m_part->isTMakeProject();
 }
 
-void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
+void TrollProjectWidget::slotDisableSubproject( TQMakeScopeItem* spitem )
 {
     m_filesCached = false;
     m_allFilesCache.clear();
 
-    if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
+    if( spitem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
     {
         TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" );
         DisableSubprojectDlg dlg( subdirs );
@@ -2436,7 +2436,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
             TQListViewItem* item = spitem->firstChild();
             while( item )
             {
-                if( values.findIndex( item->text(0) ) != -1  )
+                if( values.tqfindIndex( item->text(0) ) != -1  )
                     delete item;
                 item = item->nextSibling();
             }
@@ -2447,11 +2447,11 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
         }
     }else
     {
-        QMakeScopeItem* parent = static_cast<QMakeScopeItem*>(spitem->parent());
-        parent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) );
+        TQMakeScopeItem* tqparent = static_cast<TQMakeScopeItem*>(spitem->tqparent());
+        tqparent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) );
         delete spitem;
-        parent->scope->saveToFile();
-        m_shownSubproject = parent;
+        tqparent->scope->saveToFile();
+        m_shownSubproject = tqparent;
         slotOverviewSelectionChanged( m_shownSubproject );
     }
 }
@@ -2459,14 +2459,14 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
 void TrollProjectWidget::slotProjectDirty(const TQString& path)
 {
     kdDebug(9024) << "File is dirty:" << path << " using method " << endl;
-    if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the QMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
+    if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
     {
         m_part->dirWatch()->stopScan();
         TQListViewItemIterator it(m_rootSubproject);
-        TQValueList<QMakeScopeItem*> itemstoreload;
+        TQValueList<TQMakeScopeItem*> itemstoreload;
         while( it.current() )
         {
-            QMakeScopeItem* projectitem = static_cast<QMakeScopeItem*>( it.current() );
+            TQMakeScopeItem* projectitem = static_cast<TQMakeScopeItem*>( it.current() );
             if( projectitem->scope->scopeType() == Scope::ProjectScope
                 || projectitem->scope->scopeType() == Scope::IncludeScope )
             {
@@ -2479,7 +2479,7 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path)
             it++;
         }
 
-        TQValueList<QMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin();
+        TQValueList<TQMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin();
         for( ; reloadit != itemstoreload.end() ; ++reloadit )
         {
             (*reloadit)->reloadProject();
@@ -2501,7 +2501,7 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path)
 }
 
 
-QMakeScopeItem* TrollProjectWidget::currentSubproject()
+TQMakeScopeItem* TrollProjectWidget::currentSubproject()
 {
     return m_shownSubproject;
 }
@@ -2525,17 +2525,17 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const
 
     TQString environstr;
     DomUtil::PairList::ConstIterator it;
-    bool hasQtDir = false;
+    bool hasTQtDir = false;
     for (it = envvars.begin(); it != envvars.end(); ++it) {
-        if( (*it).first == "QTDIR" )
-            hasQtDir = true;
+        if( (*it).first == "TQTDIR" )
+            hasTQtDir = true;
 
         map[(*it).first] = (*it).second;
     }
 
-    if( !hasQtDir && !m_part->isQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() )
+    if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() )
     {
-         map["QTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "");
+         map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "");
          map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" );
     }
     return map;
@@ -2543,5 +2543,5 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const
 
 #include "trollprojectwidget.moc"
 
-//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h
index 7983f4d7..9c5fac62 100644
--- a/buildtools/qmake/trollprojectwidget.h
+++ b/buildtools/qmake/trollprojectwidget.h
@@ -41,9 +41,10 @@ class TrollProjectPart;
 class KListView;
 class ProjectConfigurationDlg;
 
-class TrollProjectWidget : public QVBox
+class TrollProjectWidget : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     TrollProjectWidget( TrollProjectPart *part );
@@ -93,7 +94,7 @@ public:
     enum TrollProjectView { SubprojectView, DetailsView };
     void setLastFocusedView( TrollProjectView view );
     enum SaveType { AlwaysSave, NeverSave, Ask };
-    QMakeScopeItem* currentSubproject();
+    TQMakeScopeItem* currentSubproject();
 
     bool showFilenamesOnly() const;
     bool showVariablesInTree() const;
@@ -131,43 +132,43 @@ private slots:
     void slotDetailsExecuted( TQListViewItem *item );
     void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p );
     void slotExcludeFileFromScopeButton();
-    void slotAddSubproject( QMakeScopeItem *spitem = 0 );
-    void slotRemoveSubproject( QMakeScopeItem *spitem = 0 );
-    void slotCreateScope( QMakeScopeItem *spitem = 0 );
-    void slotRemoveScope( QMakeScopeItem *spitem = 0 );
-    void slotDisableSubproject( QMakeScopeItem* spitem = 0 );
+    void slotAddSubproject( TQMakeScopeItem *spitem = 0 );
+    void slotRemoveSubproject( TQMakeScopeItem *spitem = 0 );
+    void slotCreateScope( TQMakeScopeItem *spitem = 0 );
+    void slotRemoveScope( TQMakeScopeItem *spitem = 0 );
+    void slotDisableSubproject( TQMakeScopeItem* spitem = 0 );
     void slotProjectDirty( const TQString& );
 
-    void createQMakeScopeItems();
+    void createTQMakeScopeItems();
 
 private:
-    void cleanDetailView( QMakeScopeItem *item );
-    void runClean( QMakeScopeItem*, const TQString& );
-    void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl );
-    void removeFile( QMakeScopeItem *spitem, FileItem *fitem );
-    void addSubprojectToItem( QMakeScopeItem*, const TQString& );
+    void cleanDetailView( TQMakeScopeItem *item );
+    void runClean( TQMakeScopeItem*, const TQString& );
+    void buildProjectDetailTree( TQMakeScopeItem *item, KListView *listviewControl );
+    void removeFile( TQMakeScopeItem *spitem, FileItem *fitem );
+    void addSubprojectToItem( TQMakeScopeItem*, const TQString& );
     void setupContext();
-    //     void parseScope(QMakeScopeItem *item,TQString scopeString, Scope *scope);
-    GroupItem* getInstallRoot( QMakeScopeItem *item );
-    GroupItem* getInstallObject( QMakeScopeItem *item, const TQString& objectname );
+    //     void parseScope(TQMakeScopeItem *item,TQString scopeString, Scope *scope);
+    GroupItem* getInstallRoot( TQMakeScopeItem *item );
+    GroupItem* getInstallObject( TQMakeScopeItem *item, const TQString& objectname );
     TQString constructMakeCommandLine( Scope* s = 0 );
 
-    void createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item );
+    void createMakefileIfMissing( const TQString &dir, TQMakeScopeItem *item );
 
-    void runQMakeRecursive( QMakeScopeItem* proj);
-    void buildFile( QMakeScopeItem* spitem, FileItem* fitem);
+    void runTQMakeRecursive( TQMakeScopeItem* proj);
+    void buildFile( TQMakeScopeItem* spitem, FileItem* fitem);
 
     /*fileName: full base file name like TQFileInfo::baseName ( true )*/
-    TQPtrList<QMakeScopeItem> findSubprojectForFile( TQFileInfo fi );
-    void findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath );
-    QMakeScopeItem* findSubprojectForPath( const TQString& );
+    TQPtrList<TQMakeScopeItem> findSubprojectForFile( TQFileInfo fi );
+    void findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list, TQMakeScopeItem * item, TQString absFilePath );
+    TQMakeScopeItem* findSubprojectForPath( const TQString& );
     //    TQString makeEnvironment();
 
     TrollProjectWidget::SaveType dialogSaveBehaviour() const;
 
-    QMakeScopeItem *findSubprojectForScope( QMakeScopeItem *scope );
+    TQMakeScopeItem *findSubprojectForScope( TQMakeScopeItem *scope );
 
-    void reloadProjectFromFile( QMakeScopeItem* item );
+    void reloadProjectFromFile( TQMakeScopeItem* item );
     TQMap<TQString,TQString> qmakeEnvironment() const;
 
     TQVBox *overviewContainer;
@@ -196,8 +197,8 @@ private:
     TQToolButton *excludeFileFromScopeButton;
 
     DomUtil::PairList m_subclasslist;
-    QMakeScopeItem *m_shownSubproject;
-    QMakeScopeItem *m_rootSubproject;
+    TQMakeScopeItem *m_shownSubproject;
+    TQMakeScopeItem *m_rootSubproject;
     Scope* m_rootScope;
     TrollProjectPart *m_part;
     ProjectConfigurationDlg* m_configDlg;
@@ -215,4 +216,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index 3bfeeee7..41683113 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -30,8 +30,8 @@
 
 
 ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part,
-                                         TQWidget *parent, const char *name)
-    : TQDialog(parent, name, true)
+                                         TQWidget *tqparent, const char *name)
+    : TQDialog(tqparent, name, true)
 {
     setCaption(i18n("New File"));
 
@@ -56,14 +56,14 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part,
     ok_button->setDefault(true);
     connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->layout();
+    buttonbox->tqlayout();
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
-    layout->addWidget(filename_label);
-    layout->addWidget(filename_edit);
-    layout->addWidget(usetemplate_box);
-    layout->addWidget(frame, 0);
-    layout->addWidget(buttonbox, 0);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
+    tqlayout->addWidget(filename_label);
+    tqlayout->addWidget(filename_edit);
+    tqlayout->addWidget(usetemplate_box);
+    tqlayout->addWidget(frame, 0);
+    tqlayout->addWidget(buttonbox, 0);
 
     m_part = part;
 }
@@ -76,7 +76,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog()
 void ScriptNewFileDialog::accept()
 {
     TQString fileName = filename_edit->text();
-    if (fileName.find('/') != -1) {
+    if (fileName.tqfind('/') != -1) {
         KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on."));
         return;
     }
diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h
index 72f433c9..ca60ebd5 100644
--- a/buildtools/script/scriptnewfiledlg.h
+++ b/buildtools/script/scriptnewfiledlg.h
@@ -19,12 +19,13 @@ class KLineEdit;
 class ScriptProjectPart;
 
 
-class ScriptNewFileDialog : public QDialog
+class ScriptNewFileDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *parent=0, const char *name=0 );
+    ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *tqparent=0, const char *name=0 );
     ~ScriptNewFileDialog();
     
 protected:
diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp
index d80cd501..5b0e8cf8 100644
--- a/buildtools/script/scriptoptionswidget.cpp
+++ b/buildtools/script/scriptoptionswidget.cpp
@@ -20,8 +20,8 @@
 
 
 ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part,
-                                         TQWidget *parent, const char *name)
-    : ScriptOptionsWidgetBase(parent, name)
+                                         TQWidget *tqparent, const char *name)
+    : ScriptOptionsWidgetBase(tqparent, name)
 {
     m_part = part;
     
diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h
index 3dc03058..a93d63d1 100644
--- a/buildtools/script/scriptoptionswidget.h
+++ b/buildtools/script/scriptoptionswidget.h
@@ -20,9 +20,10 @@ class KDevPlugin;
 class ScriptOptionsWidget : public ScriptOptionsWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 );
+    ScriptOptionsWidget( KDevPlugin *part, TQWidget *tqparent=0, const char *name=0 );
     ~ScriptOptionsWidget();
 
 public slots:
diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui
index 3a8f7b99..a73c8683 100644
--- a/buildtools/script/scriptoptionswidgetbase.ui
+++ b/buildtools/script/scriptoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ScriptOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>script_project_options</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>includepatterns_label</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <cstring>includepatterns_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -51,7 +51,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -75,14 +75,14 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>excludepatterns_label</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <cstring>excludepatterns_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2_2</cstring>
             </property>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -150,6 +150,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index 2bc19135..e28ef2e4 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -40,8 +40,8 @@ typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
 static const KDevPluginInfo data("kdevscriptproject");
 K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) )
 
-ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
+ScriptProjectPart::ScriptProjectPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevBuildTool(&data, tqparent, name ? name : "ScriptProjectPart")
 {
     setInstance(ScriptProjectFactory::instance());
 
@@ -119,7 +119,7 @@ void ScriptProjectPart::openProject(const TQString &dirName, const TQString &pro
     do {
         dir.setPath(s.pop());
         kdDebug(9015) << "Examining: " << dir.path() << endl;
-        const QFileInfoList *dirEntries = dir.entryInfoList();
+        const TQFileInfoList *dirEntries = dir.entryInfoList();
         if ( dirEntries )
         {
             TQPtrListIterator<TQFileInfo> it(*dirEntries);
@@ -340,7 +340,7 @@ void ScriptProjectPart::rescan()
     do {
         dir.setPath(s.pop());
         kdDebug(9015) << "Examining: " << dir.path() << endl;
-        const QFileInfoList *dirEntries = dir.entryInfoList();
+        const TQFileInfoList *dirEntries = dir.entryInfoList();
         if ( dirEntries )
         {
             TQPtrListIterator<TQFileInfo> it(*dirEntries);
@@ -370,7 +370,7 @@ void ScriptProjectPart::rescan()
         }
     } while (!s.isEmpty());
 
-/*    const QFileInfoList *dirEntries = TQDir(path).entryInfoList();
+/*    const TQFileInfoList *dirEntries = TQDir(path).entryInfoList();
     if ( dirEntries )
     {
         kdDebug() << "1" << endl;
diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h
index b3a748ed..2029c09b 100644
--- a/buildtools/script/scriptprojectpart.h
+++ b/buildtools/script/scriptprojectpart.h
@@ -25,9 +25,10 @@ class ScriptProjectWidget;
 class ScriptProjectPart : public KDevBuildTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ScriptProjectPart( TQObject *parent, const char *name, const TQStringList &args );
+    ScriptProjectPart( TQObject *tqparent, const char *name, const TQStringList &args );
     ~ScriptProjectPart();
     TQStringList distFiles() const;
 
diff --git a/configure.in.in b/configure.in.in
index 3cdfa2df..8f9b1991 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -122,6 +122,6 @@ hpux11*)
     ;;
 esac
 
-AC_CHECK_FILE([$qt_includes/qassistantclient.h], [],[AC_MSG_ERROR([The qassistantclient.h header from Qt3 is needed to build kdevelop, on some systems this header is in a separate package called qt3-apps-dev])])
+dnl AC_CHECK_FILE([$qt_includes/qassistantclient.h], [],[AC_MSG_ERROR([The qassistantclient.h header from Qt3 is needed to build kdevelop, on some systems this header is in a separate package called qt3-apps-dev])])
 
 KDE_INIT_DOXYGEN([KDevelop], [Version $VERSION])
diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui
index 66f46b59..2e2139d7 100644
--- a/editors/editor-chooser/editchooser.ui
+++ b/editors/editor-chooser/editchooser.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>EditChooser</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EditChooser</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -27,12 +27,12 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="0" column="0">
+                <widget class="TQComboBox" row="0" column="0">
                     <property name="name">
                         <cstring>EditorPart</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -43,7 +43,7 @@ already open files.</string>
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>external_changes_group</cstring>
             </property>
@@ -60,7 +60,7 @@ already open files.</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>nothing</cstring>
                     </property>
@@ -71,7 +71,7 @@ already open files.</string>
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>alert</cstring>
                     </property>
@@ -82,7 +82,7 @@ already open files.</string>
                         <string>&amp;Alert the user</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>reload</cstring>
                     </property>
@@ -102,7 +102,7 @@ already open files.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -122,9 +122,9 @@ already open files.</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotEditPartChanged(const QString &amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
index 4dffa96d..ca210b95 100644
--- a/editors/editor-chooser/editorchooser_part.cpp
+++ b/editors/editor-chooser/editorchooser_part.cpp
@@ -16,8 +16,8 @@ typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory;
 static const KDevPluginInfo data("kdeveditorchooser");
 K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) )
 
-EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "EditorChooserPart")
+EditorChooserPart::EditorChooserPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name ? name : "EditorChooserPart")
 {
   setInstance(EditorChooserFactory::instance());
 
diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h
index 810e1066..ebf7ed48 100644
--- a/editors/editor-chooser/editorchooser_part.h
+++ b/editors/editor-chooser/editorchooser_part.h
@@ -16,10 +16,11 @@ class KDialogBase;
 class EditorChooserPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
    
-  EditorChooserPart(TQObject *parent, const char *name, const TQStringList &);
+  EditorChooserPart(TQObject *tqparent, const char *name, const TQStringList &);
   ~EditorChooserPart();
 
   
diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp
index 3a8a3584..25bbb10e 100644
--- a/editors/editor-chooser/editorchooser_widget.cpp
+++ b/editors/editor-chooser/editorchooser_widget.cpp
@@ -12,8 +12,8 @@
 #include "editorchooser_widget.h"
 
 
-EditorChooserWidget::EditorChooserWidget(TQWidget *parent, const char *name)
-        : EditChooser(parent, name)
+EditorChooserWidget::EditorChooserWidget(TQWidget *tqparent, const char *name)
+        : EditChooser(tqparent, name)
 {
     // ask the trader which editors he has to offer
     m_offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
diff --git a/editors/editor-chooser/editorchooser_widget.h b/editors/editor-chooser/editorchooser_widget.h
index 75880af7..471eb3db 100644
--- a/editors/editor-chooser/editorchooser_widget.h
+++ b/editors/editor-chooser/editorchooser_widget.h
@@ -11,10 +11,11 @@
 class EditorChooserWidget : public EditChooser
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    EditorChooserWidget(TQWidget *parent=0, const char *name=0);
+    EditorChooserWidget(TQWidget *tqparent=0, const char *name=0);
 
 public slots:
     virtual void slotEditPartChanged(const TQString &);
diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp
index a89a397f..b9497dfe 100644
--- a/embedded/visualboyadvance/vbaconfigwidget.cpp
+++ b/embedded/visualboyadvance/vbaconfigwidget.cpp
@@ -30,7 +30,7 @@
 
 using namespace VisualBoyAdvance;
 
-VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, const char *name ) : VBAConfigWidgetBase(parent,name) {
+VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *tqparent, const char *name ) : VBAConfigWidgetBase(tqparent,name) {
   m_part = part;
   TQDomDocument &doc = *m_part->projectDom();
   // read 
diff --git a/embedded/visualboyadvance/vbaconfigwidget.h b/embedded/visualboyadvance/vbaconfigwidget.h
index eb0bd8ea..08735172 100644
--- a/embedded/visualboyadvance/vbaconfigwidget.h
+++ b/embedded/visualboyadvance/vbaconfigwidget.h
@@ -29,8 +29,9 @@ namespace VisualBoyAdvance {
 
 class VBAConfigWidget : public VBAConfigWidgetBase  {
    Q_OBJECT
+  TQ_OBJECT
 public: 
-	VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent=0, const char *name=0);
+	VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *tqparent=0, const char *name=0);
 	~VBAConfigWidget();
 public slots:
     void accept();
diff --git a/embedded/visualboyadvance/vbaconfigwidgetbase.ui b/embedded/visualboyadvance/vbaconfigwidgetbase.ui
index fb24e2d7..b65fe38b 100644
--- a/embedded/visualboyadvance/vbaconfigwidgetbase.ui
+++ b/embedded/visualboyadvance/vbaconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>VBAConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VBAConfigWigdet</cstring>
     </property>
@@ -17,12 +17,12 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="1" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>binaryEdit</cstring>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="3" colspan="1">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>ButtonGroup3</cstring>
             </property>
@@ -42,7 +42,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>normalModeButton</cstring>
                     </property>
@@ -50,7 +50,7 @@
                         <string>Normal mode</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>tvModeButton</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <string>TV mode</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>salModeButton</cstring>
                     </property>
@@ -66,7 +66,7 @@
                         <string>2xSaI</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>superSalModeButton</cstring>
                     </property>
@@ -74,7 +74,7 @@
                         <string>Super 2xSal</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>superEagleModeButton</cstring>
                     </property>
@@ -84,7 +84,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -92,12 +92,12 @@
                 <string>GBA binary:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>emuPathEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -105,7 +105,7 @@
                 <string>Additional parameters:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -113,7 +113,7 @@
                 <string>VisualBoy Advance (emulator):</string>
             </property>
         </widget>
-        <widget class="QToolButton" row="0" column="4">
+        <widget class="TQToolButton" row="0" column="4">
             <property name="name">
                 <cstring>emuPathButton</cstring>
             </property>
@@ -125,7 +125,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>22</width>
                     <height>0</height>
@@ -135,7 +135,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="1" rowspan="3" colspan="2">
+        <widget class="TQButtonGroup" row="2" column="1" rowspan="3" colspan="2">
             <property name="name">
                 <cstring>ButtonGroup4</cstring>
             </property>
@@ -147,7 +147,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>120</width>
                     <height>0</height>
@@ -161,7 +161,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling1Button</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         <string>1x</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling2Button</cstring>
                     </property>
@@ -177,7 +177,7 @@
                         <string>2x</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling3Button</cstring>
                     </property>
@@ -185,7 +185,7 @@
                         <string>3x</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling4Button</cstring>
                     </property>
@@ -195,7 +195,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox" row="2" column="3">
+        <widget class="TQCheckBox" row="2" column="3">
             <property name="name">
                 <cstring>fullscreenCheckBox</cstring>
             </property>
@@ -203,7 +203,7 @@
                 <string>Full screen</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="3">
+        <widget class="TQCheckBox" row="3" column="3">
             <property name="name">
                 <cstring>terminalCheckBox</cstring>
             </property>
@@ -222,7 +222,7 @@
                 <enum>Expanding</enum>
             </property>
         </spacer>
-        <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>addOptionsEdit</cstring>
             </property>
@@ -243,7 +243,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 
 </UI>
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index da7acb88..fd8e9ad8 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -23,8 +23,8 @@ typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
 static const KDevPluginInfo data("kdevvisualboyadvance");
 K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
   
-VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name){
+VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name){
   setInstance(VisualBoyAdvanceFactory::instance());
 
   setXMLFile("kdevpart_visualboyadvance.rc");
diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h
index bb231f0d..8618a5a3 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.h
+++ b/embedded/visualboyadvance/visualboyadvance_part.h
@@ -14,10 +14,11 @@ namespace VisualBoyAdvance {
   class VisualBoyAdvancePart : public KDevPlugin
     {
       Q_OBJECT
+  TQ_OBJECT
 	
 	public:
       
-      VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &);
+      VisualBoyAdvancePart(TQObject *tqparent, const char *name, const TQStringList &);
       ~VisualBoyAdvancePart();
       private slots:
 	void slotExecute();
diff --git a/kdevdesigner/LICENSE.GPL b/kdevdesigner/LICENSE.GPL
index c13faf0d..2ad70b8b 100644
--- a/kdevdesigner/LICENSE.GPL
+++ b/kdevdesigner/LICENSE.GPL
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am
index 5b8372f9..e0aacb85 100644
--- a/kdevdesigner/designer/Makefile.am
+++ b/kdevdesigner/designer/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES =  libkdevdesignerpart.la
 libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
 libkdevdesignerpart_la_LIBADD = \
 	$(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \
-	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la -lqassistantclient $(LIB_KFILE) $(LIB_KPARTS)
+	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la -ltqassistantclient $(LIB_KFILE) $(LIB_KPARTS)
 libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp
 partrcdir = $(kde_datadir)/kdevdesignerpart
 partdesktopdir = $(kde_servicesdir)
diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui
index 68980df0..dd27fca8 100644
--- a/kdevdesigner/designer/about.ui
+++ b/kdevdesigner/designer/about.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AboutDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutPixmap</cstring>
             </property>
@@ -66,39 +66,39 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutVersion</cstring>
             </property>
             <property name="text">
                 <string>Version 3.2</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutCopyright</cstring>
             </property>
             <property name="text">
                 <string>Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutLicense</cstring>
             </property>
@@ -113,7 +113,7 @@
             <property name="text">
                 <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -129,14 +129,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -160,14 +160,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -191,7 +191,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -215,5 +215,5 @@
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 347348bd..2bd08500 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -84,7 +84,7 @@ ActionDrag::~ActionDrag()
     the_action = 0;
 }
 
-void QDesignerAction::init()
+void TQDesignerAction::init()
 {
     MetaDataBase::addEntry( this );
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) );
@@ -92,7 +92,7 @@ void QDesignerAction::init()
     WidgetFactory::saveChangedProperties( this, id );
 }
 
-void QDesignerActionGroup::init()
+void TQDesignerActionGroup::init()
 {
     MetaDataBase::addEntry( this );
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) );
@@ -100,12 +100,12 @@ void QDesignerActionGroup::init()
     WidgetFactory::saveChangedProperties( this, id );
 }
 
-bool QDesignerAction::addTo( TQWidget *w )
+bool TQDesignerAction::addTo( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::addTo( w );
 
-    if ( ::qt_cast<TQPopupMenu*>(w) )
+    if ( ::tqqt_cast<TQPopupMenu*>(w) )
 	return FALSE;
 
     widgetToInsert->reparent( w, TQPoint( 0, 0 ), FALSE );
@@ -114,7 +114,7 @@ bool QDesignerAction::addTo( TQWidget *w )
     return TRUE;
 }
 
-bool QDesignerAction::removeFrom( TQWidget *w )
+bool TQDesignerAction::removeFrom( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::removeFrom( w );
@@ -123,72 +123,72 @@ bool QDesignerAction::removeFrom( TQWidget *w )
     return TRUE;
 }
 
-void QDesignerAction::remove()
+void TQDesignerAction::remove()
 {
     if ( !widgetToInsert )
 	return;
-    MainWindow::self->formWindow()->selectWidget( widgetToInsert, FALSE );
+    MainWindow::self->formWindow()->selectWidget( TQT_TQOBJECT(widgetToInsert), FALSE );
     widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE );
 }
 
-QDesignerToolBarSeparator::QDesignerToolBarSeparator(Orientation o , TQToolBar *parent,
+TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent,
                                      const char* name )
-    : TQWidget( parent, name )
+    : TQWidget( tqparent, name )
 {
-    connect( parent, TQT_SIGNAL(orientationChanged(Orientation)),
-             this, TQT_SLOT(setOrientation(Orientation)) );
+    connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)),
+             this, TQT_SLOT(setOrientation(Qt::Orientation)) );
     setOrientation( o );
-    setBackgroundMode( parent->backgroundMode() );
+    setBackgroundMode( tqparent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
 
-void QDesignerToolBarSeparator::setOrientation( Orientation o )
+void TQDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
 {
     orient = o;
 }
 
-void QDesignerToolBarSeparator::styleChange( TQStyle& )
+void TQDesignerToolBarSeparator::styleChange( TQStyle& )
 {
     setOrientation( orient );
 }
 
-TQSize QDesignerToolBarSeparator::sizeHint() const
+TQSize TQDesignerToolBarSeparator::tqsizeHint() const
 {
-    int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+    int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
 				      this );
-    if ( orient == Horizontal )
+    if ( orient ==Qt::Horizontal )
 	return TQSize( extent, 0 );
     else
 	return TQSize( 0, extent );
 }
 
-void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
+void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQStyle::SFlags flags = TQStyle::Style_Default;
 
-    if ( orientation() == Horizontal )
+    if ( orientation() ==Qt::Horizontal )
 	flags |= TQStyle::Style_Horizontal;
 
-    style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
-			   colorGroup(), flags );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+			   tqcolorGroup(), flags );
 }
 
 
 
-QSeparatorAction::QSeparatorAction( TQObject *parent )
-    : TQAction( parent, "qt_designer_separator" ), wid( 0 )
+TQSeparatorAction::TQSeparatorAction( TQObject *tqparent )
+    : TQAction( tqparent, "qt_designer_separator" ), wid( 0 )
 {
 }
 
-bool QSeparatorAction::addTo( TQWidget *w )
+bool TQSeparatorAction::addTo( TQWidget *w )
 {
-    if ( ::qt_cast<TQToolBar*>(w) ) {
+    if ( ::tqqt_cast<TQToolBar*>(w) ) {
 	TQToolBar *tb = (TQToolBar*)w;
-	wid = new QDesignerToolBarSeparator( tb->orientation(), tb );
+	wid = new TQDesignerToolBarSeparator( tb->orientation(), tb );
 	return TRUE;
-    } else if ( ::qt_cast<TQPopupMenu*>(w) ) {
+    } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 	idx = ( (TQPopupMenu*)w )->count();
 	( (TQPopupMenu*)w )->insertSeparator( idx );
 	return TRUE;
@@ -196,34 +196,34 @@ bool QSeparatorAction::addTo( TQWidget *w )
     return FALSE;
 }
 
-bool QSeparatorAction::removeFrom( TQWidget *w )
+bool TQSeparatorAction::removeFrom( TQWidget *w )
 {
-    if ( ::qt_cast<TQToolBar*>(w) ) {
+    if ( ::tqqt_cast<TQToolBar*>(w) ) {
 	delete wid;
 	return TRUE;
-    } else if ( ::qt_cast<TQPopupMenu*>(w) ) {
+    } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 	( (TQPopupMenu*)w )->removeItemAt( idx );
 	return TRUE;
     }
     return FALSE;
 }
 
-TQWidget *QSeparatorAction::widget() const
+TQWidget *TQSeparatorAction::widget() const
 {
     return wid;
 }
 
 
 
-QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw )
+TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw )
     : TQToolBar( mw ), lastIndicatorPos( -1, -1 )
 {
     insertAnchor = 0;
     afterAnchor = TRUE;
     setAcceptDrops( TRUE );
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     lastIndicatorPos = TQPoint( -1, -1 );
-    indicator = new QDesignerIndicatorWidget( this );
+    indicator = new TQDesignerIndicatorWidget( this );
     indicator->hide();
     installEventFilter( this );
     widgetInserting = FALSE;
@@ -231,66 +231,66 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw )
     mw->setDockEnabled( DockTornOff, FALSE );
 }
 
-QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock )
-    : TQToolBar( TQString::null, mw, dock), lastIndicatorPos( -1, -1 )
+TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, Dock dock )
+    : TQToolBar( TQString(), mw, dock), lastIndicatorPos( -1, -1 )
 {
     insertAnchor = 0;
     afterAnchor = TRUE;
     setAcceptDrops( TRUE );
-    indicator = new QDesignerIndicatorWidget( this );
+    indicator = new TQDesignerIndicatorWidget( this );
     indicator->hide();
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     installEventFilter( this );
     widgetInserting = FALSE;
     findFormWindow();
     mw->setDockEnabled( DockTornOff, FALSE );
 }
 
-void QDesignerToolBar::findFormWindow()
+void TQDesignerToolBar::findFormWindow()
 {
     TQWidget *w = this;
     while ( w ) {
-	formWindow = ::qt_cast<FormWindow*>(w);
+	formWindow = ::tqqt_cast<FormWindow*>(w);
 	if ( formWindow )
 	    break;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 }
 
-void QDesignerToolBar::addAction( TQAction *a )
+void TQDesignerToolBar::addAction( TQAction *a )
 {
     actionList.append( a );
     connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) );
-    if ( ::qt_cast<TQActionGroup*>(a) ) {
-	( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
-    } else if ( ::qt_cast<QSeparatorAction*>(a) ) {
-	( (QSeparatorAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
+    if ( ::tqqt_cast<TQActionGroup*>(a) ) {
+	( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
+    } else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
+	( (TQSeparatorAction*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a );
     } else {
-	( (QDesignerAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
+	( (TQDesignerAction*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
     }
 }
 
 static void fixObject( TQObject *&o )
 {
-    while ( o && o->parent() && !::qt_cast<QDesignerToolBar*>(o->parent()) )
-	o = o->parent();
+    while ( o && o->tqparent() && !::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) )
+	o = o->tqparent();
 }
 
-bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
+bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( !o || !e || o->inherits( "QDockWindowHandle" ) || o->inherits( "QDockWindowTitleBar" ) )
+    if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) )
 	return TQToolBar::eventFilter( o, e );
 
-    if ( o == this && e->type() == TQEvent::MouseButtonPress &&
-	 ( ( TQMouseEvent*)e )->button() == LeftButton ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress &&
+	 ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) {
 	mousePressEvent( (TQMouseEvent*)e );
 	return TRUE;
     }
 
-    if ( o == this )
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) )
 	return TQToolBar::eventFilter( o, e );
 
     if ( e->type() == TQEvent::MouseButtonPress ) {
@@ -334,7 +334,7 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
     return TQToolBar::eventFilter( o, e );
 }
 
-void QDesignerToolBar::paintEvent( TQPaintEvent *e )
+void TQDesignerToolBar::paintEvent( TQPaintEvent *e )
 {
     TQToolBar::paintEvent( e );
     if ( e->rect() != rect() )
@@ -342,24 +342,24 @@ void QDesignerToolBar::paintEvent( TQPaintEvent *e )
     lastIndicatorPos = TQPoint( -1, -1 );
 }
 
-void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
+void TQDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
 {
     e->accept();
     TQPopupMenu menu( 0 );
     menu.insertItem( i18n( "Delete Toolbar" ), 1 );
     int res = menu.exec( e->globalPos() );
     if ( res != -1 ) {
-	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ),
+	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ),
 							      formWindow, 0, this );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     }
 }
 
-void QDesignerToolBar::mousePressEvent( TQMouseEvent *e )
+void TQDesignerToolBar::mousePressEvent( TQMouseEvent *e )
 {
     widgetInserting = FALSE;
-    if ( e->button() == LeftButton &&
+    if ( e->button() == Qt::LeftButton &&
 	 MainWindow::self->currentTool() != POINTER_TOOL &&
 	 MainWindow::self->currentTool() != ORDER_TOOL &&
 	 MainWindow::self->currentTool() != CONNECT_TOOL &&
@@ -367,33 +367,33 @@ void QDesignerToolBar::mousePressEvent( TQMouseEvent *e )
 	widgetInserting = TRUE;
 }
 
-void QDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e )
+void TQDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e )
 {
     if ( widgetInserting )
 	doInsertWidget( mapFromGlobal( e->globalPos() ) );
     widgetInserting = FALSE;
 }
 
-void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
+void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
 {
     if ( widgetInserting )
 	doInsertWidget( mapFromGlobal( e->globalPos() ) );
-    else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) {
+    else if ( w->isWidgetType() && formWindow->widgets()->tqfind( w ) ) {
 	formWindow->clearSelection( FALSE );
 	formWindow->selectWidget( w );
     }
     widgetInserting = FALSE;
 }
 
-void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o )
+void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o )
 {
     e->accept();
     TQPopupMenu menu( 0 );
     const int ID_DELETE = 1;
     const int ID_SEP = 2;
     const int ID_DELTOOLBAR = 3;
-    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o );
-    if ( it != actionMap.end() && ::qt_cast<QSeparatorAction*>(*it) )
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
+    if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) )
 	menu.insertItem( i18n( "Delete Separator" ), ID_DELETE );
     else
 	menu.insertItem( i18n( "Delete Item" ), ID_DELETE );
@@ -402,21 +402,21 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
     menu.insertItem( i18n( "Delete Toolbar" ), ID_DELTOOLBAR );
     int res = menu.exec( e->globalPos() );
     if ( res == ID_DELETE ) {
-	TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o );
+	TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
 	if ( it == actionMap.end() )
 	    return;
 	TQAction *a = *it;
-	int index = actionList.find( a );
+	int index = actionList.tqfind( a );
 	RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand(
 	    i18n( "Delete Action '%1' From Toolbar '%2'" ).
-	    arg( a->name() ).arg( caption() ),
+	    tqarg( a->name() ).tqarg( caption() ),
 	    formWindow, a, this, index );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     } else if ( res == ID_SEP ) {
 	calcIndicatorPos( mapFromGlobal( e->globalPos() ) );
-	TQAction *a = new QSeparatorAction( 0 );
-	int index = actionList.findRef( *actionMap.find( insertAnchor ) );
+	TQAction *a = new TQSeparatorAction( 0 );
+	int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
 	if ( index != -1 && afterAnchor )
 	    ++index;
 	if ( !insertAnchor )
@@ -429,21 +429,21 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     } else if ( res == ID_DELTOOLBAR ) {
-	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ),
+	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ),
 							      formWindow, 0, this );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     }
 }
 
-void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
+void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
 {
     widgetInserting = FALSE;
 
-    if ( e->button() == MidButton )
+    if ( e->button() == Qt::MidButton )
 	return;
 
-    if ( e->button() == LeftButton &&
+    if ( e->button() == Qt::LeftButton &&
 	 MainWindow::self->currentTool() != POINTER_TOOL &&
 	 MainWindow::self->currentTool() != ORDER_TOOL &&
 	 MainWindow::self->currentTool() != CONNECT_TOOL &&
@@ -455,16 +455,16 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
     dragStartPos = e->pos();
 }
 
-void QDesignerToolBar::removeWidget( TQWidget *w )
+void TQDesignerToolBar::removeWidget( TQWidget *w )
 {
-    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( w );
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w );
     if ( it == actionMap.end() )
 	return;
     TQAction *a = *it;
-    int index = actionList.find( a );
+    int index = actionList.tqfind( a );
     RemoveActionFromToolBarCommand *cmd =
 	new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ).
-					    arg( a->name() ).arg( caption() ),
+					    tqarg( a->name() ).tqarg( caption() ),
 					    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -472,39 +472,39 @@ void QDesignerToolBar::removeWidget( TQWidget *w )
     adjustSize();
 }
 
-void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
+void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
 {
-    if ( widgetInserting || ( e->state() & LeftButton ) == 0 )
+    if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 )
 	return;
-    if ( QABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() )
+    if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() )
 	return;
-    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o );
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
     if ( it == actionMap.end() )
 	return;
     TQAction *a = *it;
     if ( !a )
 	return;
-    int index = actionList.find( a );
+    int index = actionList.tqfind( a );
     RemoveActionFromToolBarCommand *cmd =
 	new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ).
-					    arg( a->name() ).arg( caption() ),
+					    tqarg( a->name() ).tqarg( caption() ),
 					    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
     TQApplication::sendPostedEvents();
     adjustSize();
 
-    TQString type = ::qt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) :
-	::qt_cast<QSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
+    TQString type = ::tqqt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) :
+	::tqqt_cast<TQSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
     TQStoredDrag *drag = new ActionDrag( type, a, this );
     drag->setPixmap( a->iconSet().pixmap() );
-    if ( ::qt_cast<QDesignerAction*>(a) ) {
-	if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) )
-	    formWindow->selectWidget( ( (QDesignerAction*)a )->widget(), FALSE );
+    if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
+	if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) )
+	    formWindow->selectWidget( ( TQT_TQOBJECT(( (TQDesignerAction*)a )->widget())), FALSE );
     }
     if ( !drag->drag() ) {
 	AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
-									arg( a->name() ).arg( caption() ),
+									tqarg( a->name() ).tqarg( caption() ),
 									formWindow, a, this, index );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -513,9 +513,9 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     indicator->hide();
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
-void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
+void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 {
     widgetInserting = FALSE;
     lastIndicatorPos = TQPoint( -1, -1 );
@@ -523,7 +523,7 @@ void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 	e->accept();
 }
 
-void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
+void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
 {
     if (ActionDrag::canDecode(e)) {
 	e->accept();
@@ -531,14 +531,14 @@ void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
     }
 }
 
-void QDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * )
+void TQDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * )
 {
     indicator->hide();
     insertAnchor = 0;
     afterAnchor = TRUE;
 }
 
-void QDesignerToolBar::dropEvent( TQDropEvent *e )
+void TQDesignerToolBar::dropEvent( TQDropEvent *e )
 {
     if (!ActionDrag::canDecode(e))
 	return;
@@ -547,7 +547,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 
     indicator->hide();
     TQAction *a = 0;
-    int index = actionList.findRef( *actionMap.find( insertAnchor ) );
+    int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
     if ( index != -1 && afterAnchor )
 	++index;
     if ( !insertAnchor )
@@ -555,14 +555,14 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
     if ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-separator" ) ) {
 	if ( e->provides( "application/x-designer-actions" ) )
-	    a = ::qt_cast<QDesignerAction*>(ActionDrag::action());
+	    a = ::tqqt_cast<TQDesignerAction*>(ActionDrag::action());
 	else
-	    a = ::qt_cast<QSeparatorAction*>(ActionDrag::action());
+	    a = ::tqqt_cast<TQSeparatorAction*>(ActionDrag::action());
     } else {
-	a = ::qt_cast<QDesignerActionGroup*>(ActionDrag::action());
+	a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action());
     }
 
-    if ( actionList.findRef( a ) != -1 ) {
+    if ( actionList.tqfindRef( a ) != -1 ) {
 	TQMessageBox::warning( MainWindow::self, i18n( "Insert/Move Action" ),
 			      i18n( "Action '%1' has already been added to this toolbar.\n"
 				  "An Action may only occur once in a given toolbar." ).
@@ -571,7 +571,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
     }
 
     AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
-								    arg( a->name() ).arg( caption() ),
+								    tqarg( a->name() ).tqarg( caption() ),
 								    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -581,44 +581,45 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 
 #endif
 
-void QDesignerToolBar::reInsert()
+void TQDesignerToolBar::reInsert()
 {
     TQAction *a = 0;
     actionMap.clear();
     clear();
     for ( a = actionList.first(); a; a = actionList.next() ) {
 	a->addTo( this );
-	if ( ::qt_cast<TQActionGroup*>(a) ) {
-	    actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
-	    if ( ( (QDesignerActionGroup*)a )->widget() )
-		( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	} else if ( ::qt_cast<QDesignerAction*>(a) ) {
-	    actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
-	    ( (QDesignerAction*)a )->widget()->installEventFilter( this );
-	} else if ( ::qt_cast<QSeparatorAction*>(a) ) {
-	    actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
-	    ( (QSeparatorAction*)a )->widget()->installEventFilter( this );
+	if ( ::tqqt_cast<TQActionGroup*>(a) ) {
+	    actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
+	    if ( ( (TQDesignerActionGroup*)a )->widget() )
+		( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	} else if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
+	    actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
+	    ( (TQDesignerAction*)a )->widget()->installEventFilter( this );
+	} else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
+	    actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a );
+	    ( (TQSeparatorAction*)a )->widget()->installEventFilter( this );
 	}
     }
     TQApplication::sendPostedEvents();
     adjustSize();
 }
 
-void QDesignerToolBar::actionRemoved()
+void TQDesignerToolBar::actionRemoved()
 {
     actionList.removeRef( (TQAction*)sender() );
 }
 
-TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
+TQPoint TQDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
 {
-    if ( orientation() == Horizontal ) {
+    if ( orientation() ==Qt::Horizontal ) {
 	TQPoint pnt( width() - 2, 0 );
 	insertAnchor = 0;
 	afterAnchor = TRUE;
-	if ( !children() )
+	TQObjectList clo = childrenListObject();
+	if ( clo.isEmpty() )
 	    return pnt;
 	pnt = TQPoint( 13, 0 );
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( clo );
 	TQObject * obj;
 	while( (obj=it.current()) != 0 ) {
 	    ++it;
@@ -637,10 +638,11 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
 	TQPoint pnt( 0, height() - 2 );
 	insertAnchor = 0;
 	afterAnchor = TRUE;
-	if ( !children() )
+	TQObjectList clo = childrenListObject();
+	if ( clo.isEmpty() )
 	    return pnt;
 	pnt = TQPoint( 0, 13 );
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( clo );
 	TQObject * obj;
 	while( (obj=it.current()) != 0 ) {
 	    ++it;
@@ -658,12 +660,12 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
     }
 }
 
-void QDesignerToolBar::drawIndicator( const TQPoint &pos )
+void TQDesignerToolBar::drawIndicator( const TQPoint &pos )
 {
     if ( lastIndicatorPos == pos )
 	return;
     bool wasVsisible = indicator->isVisible();
-    if ( orientation() == Horizontal ) {
+    if ( orientation() ==Qt::Horizontal ) {
 	indicator->resize( 3, height() );
 	if ( pos != TQPoint( -1, -1 ) )
 	     indicator->move( pos.x() - 1, 0 );
@@ -682,7 +684,7 @@ void QDesignerToolBar::drawIndicator( const TQPoint &pos )
 	TQApplication::sendPostedEvents();
 }
 
-void QDesignerToolBar::doInsertWidget( const TQPoint &p )
+void TQDesignerToolBar::doInsertWidget( const TQPoint &p )
 {
     if ( formWindow != MainWindow::self->formWindow() )
 	return;
@@ -690,30 +692,30 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
     TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE );
     installEventFilters( w );
     MainWindow::self->formWindow()->insertWidget( w, TRUE );
-    QDesignerAction *a = new QDesignerAction( w, parent() );
-    int index = actionList.findRef( *actionMap.find( insertAnchor ) );
+    TQDesignerAction *a = new TQDesignerAction( w, tqparent() );
+    int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
     if ( index != -1 && afterAnchor )
 	++index;
     if ( !insertAnchor )
 	index = 0;
     AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Widget '%1' to Toolbar '%2'" ).
-								    arg( w->name() ).arg( caption() ),
+								    tqarg( w->name() ).tqarg( caption() ),
 								    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
     MainWindow::self->resetTool();
 }
 
-void QDesignerToolBar::clear()
+void TQDesignerToolBar::clear()
 {
     for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
-	if ( ::qt_cast<QDesignerAction*>(a) )
-	    ( (QDesignerAction*)a )->remove();
+	if ( ::tqqt_cast<TQDesignerAction*>(a) )
+	    ( (TQDesignerAction*)a )->remove();
     }
     TQToolBar::clear();
 }
 
-void QDesignerToolBar::installEventFilters( TQWidget *w )
+void TQDesignerToolBar::installEventFilters( TQWidget *w )
 {
     if ( !w )
 	return;
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index 23c461aa..560bcca4 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,26 +38,28 @@
 #include <tqguardedptr.h>
 #include "../shared/widgetdatabase.h"
 
-//class QDesignerPopupMenu;
-class QDesignerIndicatorWidget;
+//class TQDesignerPopupMenu;
+class TQDesignerIndicatorWidget;
 class FormWindow;
 class TQPopupMenu;
 
-class QDesignerIndicatorWidget : public QWidget
+class TQDesignerIndicatorWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerIndicatorWidget( TQWidget *p )
+    TQDesignerIndicatorWidget( TQWidget *p )
 	: TQWidget( p, "qt_dockwidget_internal" ) {
 	    setBackgroundColor( red );
     }
 
 };
 
-class ActionDrag : public QStoredDrag
+class ActionDrag : public TQStoredDrag
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ActionDrag(const TQString &type, TQAction *action, TQWidget *source);
@@ -77,22 +79,23 @@ private:
     static TQAction *the_action;
 };
 
-class QDesignerActionGroup : public QActionGroup
+class TQDesignerActionGroup : public TQActionGroup
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerActionGroup( TQObject *parent )
-	: TQActionGroup( ::qt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); }
+    TQDesignerActionGroup( TQObject *tqparent )
+	: TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); }
 
     void init();
 
     TQWidget *widget() const { return wid; }
-    TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); }
+    TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); }
     int index() const { return idx; }
 
 protected:
-#if !defined(Q_NO_USING_KEYWORD)
+#if !defined(TQ_NO_USING_KEYWORD)
     using TQActionGroup::addedTo;
 #endif
     void addedTo( TQWidget *w, TQWidget * ) {
@@ -112,15 +115,16 @@ private:
 
 };
 
-class QDesignerAction : public QAction
+class TQDesignerAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerAction( TQObject *parent )
-	: TQAction( ::qt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
-    QDesignerAction( TQWidget *w, TQObject *parent )
-	: TQAction( ::qt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
+    TQDesignerAction( TQObject *tqparent )
+	: TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
+    TQDesignerAction( TQWidget *w, TQObject *tqparent )
+	: TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
 
     void init();
 
@@ -148,31 +152,33 @@ private:
 
 };
 
-class QDesignerToolBarSeparator : public QWidget
+class TQDesignerToolBarSeparator : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
+    TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
 
-    TQSize sizeHint() const;
-    Orientation orientation() const { return orient; }
+    TQSize tqsizeHint() const;
+    Qt::Orientation orientation() const { return orient; }
 public slots:
-   void setOrientation( Orientation );
+   void setOrientation( Qt::Orientation );
 protected:
     void styleChange( TQStyle& );
     void paintEvent( TQPaintEvent * );
 private:
-    Orientation orient;
+    Qt::Orientation orient;
 };
 
 
-class QSeparatorAction : public QAction
+class TQSeparatorAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QSeparatorAction( TQObject *parent );
+    TQSeparatorAction( TQObject *tqparent );
 
     bool addTo( TQWidget *w );
     bool removeFrom( TQWidget *w );
@@ -186,13 +192,14 @@ private:
 };
 
 
-class QDesignerToolBar : public QToolBar
+class TQDesignerToolBar : public TQToolBar
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerToolBar( TQMainWindow *mw );
-    QDesignerToolBar( TQMainWindow *mw, Dock dock );
+    TQDesignerToolBar( TQMainWindow *mw );
+    TQDesignerToolBar( TQMainWindow *mw, Dock dock );
     TQPtrList<TQAction> insertedActions() const { return actionList; }
     void addAction( TQAction *a );
 
@@ -208,7 +215,7 @@ public:
 protected:
     bool eventFilter( TQObject *, TQEvent * );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -238,7 +245,7 @@ private:
     TQPtrList<TQAction> actionList;
     TQMap<TQWidget*, TQAction*> actionMap;
     TQPoint dragStartPos;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     bool widgetInserting;
     FormWindow *formWindow;
 
diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui
index 669c60e0..7db4050b 100644
--- a/kdevdesigner/designer/actioneditor.ui
+++ b/kdevdesigner/designer/actioneditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ActionEditorBase</cstring>
     </property>
@@ -40,7 +40,7 @@
     <property name="caption">
         <string>Edit Actions</string>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -52,7 +52,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonNewAction</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>Create new Action</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonDeleteAction</cstring>
                     </property>
@@ -100,7 +100,7 @@
                         <string>Delete current Action</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonConnect</cstring>
                     </property>
@@ -127,7 +127,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -210,18 +210,18 @@
 <forwards>
     <forward>class QListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">connectionsClicked()</slot>
     <slot access="protected">currentActionChanged( QListViewItem * )</slot>
     <slot access="protected">deleteAction()</slot>
     <slot access="protected">newAction()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp
index ad014c9f..67cb0bdf 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/kdevdesigner/designer/actioneditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -45,8 +45,8 @@
 
 #include <klocale.h>
 
-ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
-    : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
+ActionEditor::ActionEditor( TQWidget* tqparent,  const char* name, WFlags fl )
+    : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ),
     explicitlyClosed(false)
 {
     listActions->addColumn( i18n( "Actions" ) );
@@ -139,7 +139,7 @@ void ActionEditor::deleteAction()
 	++it;
     }
     if ( formWindow ) {
-	formWindow->setActiveObject( formWindow->mainContainer() );
+	formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) );
 	if ( formWindow->formFile() )
 	    formWindow->formFile()->setModified( TRUE );
     }
@@ -149,8 +149,8 @@ void ActionEditor::newAction()
 {
     ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
     if ( actionParent ) {
-	if ( !::qt_cast<TQActionGroup*>(actionParent->actionGroup()) )
-	    actionParent = (ActionItem*)actionParent->parent();
+	if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
+	    actionParent = (ActionItem*)actionParent->tqparent();
     }
 
     ActionItem *i = 0;
@@ -185,8 +185,8 @@ void ActionEditor::newActionGroup()
 {
     ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
     if ( actionParent ) {
-	if ( !::qt_cast<TQActionGroup*>(actionParent->actionGroup()) )
-	    actionParent = (ActionItem*)actionParent->parent();
+	if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
+	    actionParent = (ActionItem*)actionParent->tqparent();
     }
 
     ActionItem *i = 0;
@@ -225,13 +225,13 @@ void ActionEditor::setFormWindow( FormWindow *fw )
     listActions->clear();
     formWindow = fw;
     if ( !formWindow ||
-	 !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) ) {
+	 !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) {
 	setEnabled( FALSE );
     } else {
 	setEnabled( TRUE );
 	for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) {
 	    ActionItem *i = 0;
-	    if ( ::qt_cast<TQAction*>(a->parent()) )
+	    if ( ::tqqt_cast<TQAction*>(a->tqparent()) )
 		continue;
 	    i = new ActionItem( listActions, a );
 	    i->setText( 0, a->name() );
@@ -241,7 +241,7 @@ void ActionEditor::setFormWindow( FormWindow *fw )
  				 this, TQT_SLOT( removeConnections( TQObject * ) ) );
 	    TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ),
 			      this, TQT_SLOT( removeConnections( TQObject* ) ) );
-	    if ( ::qt_cast<TQActionGroup*>(a) ) {
+	    if ( ::tqqt_cast<TQActionGroup*>(a) ) {
 		insertChildActions( i );
 	    }
 	}
@@ -254,13 +254,14 @@ void ActionEditor::setFormWindow( FormWindow *fw )
 
 void ActionEditor::insertChildActions( ActionItem *i )
 {
-    if ( !i->actionGroup() || !i->actionGroup()->children() )
+    TQObjectList clo = i->actionGroup()->childrenListObject();
+    if ( !i->actionGroup() || clo.isEmpty() )
 	return;
-    TQObjectListIt it( *i->actionGroup()->children() );
+    TQObjectListIt it( clo );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
-	if ( !::qt_cast<TQAction*>(o) )
+	if ( !::tqqt_cast<TQAction*>(o) )
 	    continue;
 	TQAction *a = (TQAction*)o;
 	ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a );
@@ -272,7 +273,7 @@ void ActionEditor::insertChildActions( ActionItem *i )
  			     this, TQT_SLOT( removeConnections( TQObject * ) ) );
  	TQObject::connect( o, TQT_SIGNAL( destroyed( TQObject * ) ),
  			  this, TQT_SLOT( removeConnections( TQObject * ) ) );
-	if ( ::qt_cast<TQActionGroup*>(a) )
+	if ( ::tqqt_cast<TQActionGroup*>(a) )
 	    insertChildActions( i2 );
     }
 }
@@ -304,7 +305,7 @@ void ActionEditor::updateActionIcon( TQAction *a )
 void ActionEditor::connectionsClicked()
 {
     ConnectionDialog dlg( formWindow->mainWindow() );
-    dlg.setDefault( currentAction, formWindow );
+    dlg.setDefault( TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow) );
     dlg.addConnection();
     dlg.exec();
 }
@@ -312,9 +313,9 @@ void ActionEditor::connectionsClicked()
 void ActionEditor::removeConnections( TQObject *o )
 {
     TQValueList<MetaDataBase::Connection> conns =
-	MetaDataBase::connections( formWindow, o );
+	MetaDataBase::connections( TQT_TQOBJECT(formWindow), o );
     for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin();
 	  it2 != conns.end(); ++it2 )
-	MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal,
+	MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal,
 					(*it2).receiver, (*it2).slot );
 }
diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h
index 1af748e9..cae92b95 100644
--- a/kdevdesigner/designer/actioneditorimpl.h
+++ b/kdevdesigner/designer/actioneditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,9 +36,10 @@ class ActionItem;
 class ActionEditor : public ActionEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    ActionEditor( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     void setFormWindow( FormWindow *fw );
     void updateActionName( TQAction *a );
     void updateActionIcon( TQAction *a );
diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp
index 7b687fe4..92b8a044 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/kdevdesigner/designer/actionlistview.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,8 +30,8 @@
 
 #include <klocale.h>
 
-ActionListView::ActionListView( TQWidget *parent, const char *name )
-    : TQListView( parent, name )
+ActionListView::ActionListView( TQWidget *tqparent, const char *name )
+    : TQListView( tqparent, name )
 {
     setShowSortIndicator( TRUE );
     setResizeMode( LastColumn );
@@ -43,18 +43,18 @@ ActionListView::ActionListView( TQWidget *parent, const char *name )
 ActionItem::ActionItem( TQListView *lv, TQAction *ac )
     : TQListViewItem( lv ), a( 0 ), g( 0 )
 {
-    g = ::qt_cast<QDesignerActionGroup*>(ac);
+    g = ::tqqt_cast<TQDesignerActionGroup*>(ac);
     if ( !g )
-	a = ::qt_cast<QDesignerAction*>(ac);
+	a = ::tqqt_cast<TQDesignerAction*>(ac);
     setDragEnabled( TRUE );
 }
 
 ActionItem::ActionItem( TQListViewItem *i, TQAction *ac )
     : TQListViewItem( i ), a( 0 ), g( 0 )
 {
-    g = ::qt_cast<QDesignerActionGroup*>(ac);
+    g = ::tqqt_cast<TQDesignerActionGroup*>(ac);
     if ( !g )
-	a = ::qt_cast<QDesignerAction*>(ac);
+	a = ::tqqt_cast<TQDesignerAction*>(ac);
     setDragEnabled( TRUE );
     moveToEnd();
 }
diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h
index 66d6419e..a3910c5b 100644
--- a/kdevdesigner/designer/actionlistview.h
+++ b/kdevdesigner/designer/actionlistview.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,38 +30,39 @@
 #include <tqlistview.h>
 #include "actiondnd.h"
 
-class ActionItem : public QListViewItem
+class ActionItem : public TQListViewItem
 {
 public:
     ActionItem( TQListView *lv, bool group )
 	: TQListViewItem( lv ),
-	  a( group ? 0 : new QDesignerAction( 0 ) ),
-	  g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
+	  a( group ? 0 : new TQDesignerAction( 0 ) ),
+	  g( group ? new TQDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
     ActionItem( TQListView *lv, TQAction *ac );
     ActionItem( TQListViewItem *i, TQAction *ac );
-    ActionItem( ActionItem *parent, bool group = FALSE )
-	: TQListViewItem( parent ),
-	  a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ),
-	  g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
+    ActionItem( ActionItem *tqparent, bool group = FALSE )
+	: TQListViewItem( tqparent ),
+	  a( group ? 0 : new TQDesignerAction( tqparent->actionGroup() ) ),
+	  g( group ? new TQDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
 
-    QDesignerAction *action() const { return a; }
-    QDesignerActionGroup *actionGroup() const { return g; }
+    TQDesignerAction *action() const { return a; }
+    TQDesignerActionGroup *actionGroup() const { return g; }
 
 private:
     void moveToEnd();
 
 private:
-    QDesignerAction *a;
-    QDesignerActionGroup *g;
+    TQDesignerAction *a;
+    TQDesignerActionGroup *g;
 
 };
 
-class ActionListView : public QListView
+class ActionListView : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ActionListView( TQWidget *parent = 0, const char *name = 0 );
+    ActionListView( TQWidget *tqparent = 0, const char *name = 0 );
 
 protected:
     TQDragObject *dragObject();
diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp
index 695b2292..ae8661b4 100644
--- a/kdevdesigner/designer/asciivalidator.cpp
+++ b/kdevdesigner/designer/asciivalidator.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -28,18 +28,18 @@
 
 #include <tqstring.h>
 
-AsciiValidator::AsciiValidator( TQObject * parent, const char *name )
-    : TQValidator( parent, name ), functionName( FALSE )
+AsciiValidator::AsciiValidator( TQObject * tqparent, const char *name )
+    : TQValidator( tqparent, name ), functionName( FALSE )
 {
 }
 
-AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name )
-    : TQValidator( parent, name ), functionName( funcName )
+AsciiValidator::AsciiValidator( bool funcName, TQObject * tqparent, const char *name )
+    : TQValidator( tqparent, name ), functionName( funcName )
 {
 }
 
-AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name )
-    : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow )
+AsciiValidator::AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name )
+    : TQValidator( tqparent, name ), functionName( FALSE ), allowedChars( allow )
 {
 }
 
@@ -85,7 +85,7 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const
 	    }
 	}
 	
-	if ( allowedChars.find( s[ i ] ) != -1 )
+	if ( allowedChars.tqfind( s[ i ] ) != -1 )
 	    continue;
 	
 	s[i] = '_';
diff --git a/kdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h
index 8e79d21f..00ff6b0a 100644
--- a/kdevdesigner/designer/asciivalidator.h
+++ b/kdevdesigner/designer/asciivalidator.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,13 +31,14 @@
 #include <tqvalidator.h>
 
 
-class AsciiValidator: public QValidator
+class AsciiValidator: public TQValidator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    AsciiValidator( TQObject * parent, const char *name = 0 );
-    AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 );
-    AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 );
+    AsciiValidator( TQObject * tqparent, const char *name = 0 );
+    AsciiValidator( bool funcName, TQObject * tqparent, const char *name = 0 );
+    AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name = 0 );
     ~AsciiValidator();
 
     TQValidator::State validate( TQString &, int & ) const;
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index e2e55061..5079fff4 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,7 +51,7 @@
 #include <tqptrstack.h>
 #include <tqheader.h>
 #include <tqsplitter.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include <tqaction.h>
@@ -243,8 +243,8 @@ void ResizeCommand::execute()
 {
     widget->setGeometry( newRect );
     formWindow()->updateSelection( widget );
-    formWindow()->emitUpdateProperties( widget );
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -252,8 +252,8 @@ void ResizeCommand::unexecute()
 {
     widget->setGeometry( oldRect );
     formWindow()->updateSelection( widget );
-    formWindow()->emitUpdateProperties( widget );
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -261,33 +261,33 @@ void ResizeCommand::unexecute()
 
 InsertCommand::InsertCommand( const TQString &n, FormWindow *fw,
 			      TQWidget *w, const TQRect &g )
-    : Command( n, fw ), widget( w ), geometry( g )
+    : Command( n, fw ), widget( w ), tqgeometry( g )
 {
 }
 
 void InsertCommand::execute()
 {
-    if ( geometry.size() == TQSize( 0, 0 ) ) {
-	widget->move( geometry.topLeft() );
+    if ( tqgeometry.size() == TQSize( 0, 0 ) ) {
+	widget->move( tqgeometry.topLeft() );
 	widget->adjustSize();
     } else {
-	TQSize s = geometry.size().expandedTo( widget->minimumSize() );
-	s = s.expandedTo( widget->minimumSizeHint() );
-	TQRect r( geometry.topLeft(), s );
+	TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() );
+	s = s.expandedTo( widget->tqminimumSizeHint() );
+	TQRect r( tqgeometry.topLeft(), s );
 	widget->setGeometry( r );
     }
     widget->show();
     formWindow()->widgets()->insert( widget, widget );
     formWindow()->clearSelection( FALSE );
-    formWindow()->selectWidget( widget );
+    formWindow()->selectWidget( TQT_TQOBJECT(widget) );
     formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget );
 }
 
 void InsertCommand::unexecute()
 {
     widget->hide();
-    formWindow()->selectWidget( widget, FALSE );
-    formWindow()->widgets()->remove( widget );
+    formWindow()->selectWidget( TQT_TQOBJECT(widget), FALSE );
+    formWindow()->widgets()->remove( TQT_TQOBJECT(widget) );
     formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget );
  }
 
@@ -320,13 +320,13 @@ bool MoveCommand::canMerge( Command *c )
 void MoveCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( newParent, pos, TRUE );
 		formWindow()->raiseSelection( w );
 		formWindow()->raiseChildSelections( w );
-		formWindow()->widgetChanged( w );
+		formWindow()->widgetChanged( TQT_TQOBJECT(w) );
 		formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
 		formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
 	    }
@@ -334,20 +334,20 @@ void MoveCommand::execute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
 void MoveCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( oldParent, pos, TRUE );
 		formWindow()->raiseSelection( w );
 		formWindow()->raiseChildSelections( w );
-		formWindow()->widgetChanged( w );
+		formWindow()->widgetChanged( TQT_TQOBJECT(w) );
 		formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
 		formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
 	    }
@@ -355,7 +355,7 @@ void MoveCommand::unexecute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
@@ -369,17 +369,17 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw,
     TQWidgetList copyOfWidgets = widgets;
     copyOfWidgets.setAutoDelete(FALSE);
 
-    // Include the children of the selected items when deleting
+    // Include the tqchildren of the selected items when deleting
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
-	for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) {
-	    if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) {
+	TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) {
+	    if ( copyOfWidgets.tqfind( c ) == -1 && formWindow()->widgets()->tqfind( c ) ) {
 		widgets.insert(widgets.at() + 1, c);
 		widgets.prev();
 		copyOfWidgets.append(c);
 	    }
 	}
-	delete children;
+	delete tqchildren;
     }
 }
 
@@ -392,13 +392,13 @@ void DeleteCommand::execute()
 	TQString s = w->name();
 	s.prepend( "qt_dead_widget_" );
 	w->setName( s );
-	formWindow()->selectWidget( w, FALSE );
+	formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE );
 	formWindow()->widgets()->remove( w );
-	TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w );
+	TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) );
 	connections.insert( w, conns );
 	TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	for ( ; it != conns.end(); ++it ) {
-	    MetaDataBase::removeConnection( formWindow(), (*it).sender,
+	    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender,
 					    (*it).signal, (*it).receiver, (*it).slot );
 	}
     }
@@ -418,11 +418,11 @@ void DeleteCommand::unexecute()
 	s.remove( 0, TQString( "qt_dead_widget_" ).length() );
 	w->setName( s );
 	formWindow()->widgets()->insert( w, w );
-	formWindow()->selectWidget( w );
-	TQValueList<MetaDataBase::Connection> conns = *connections.find( w );
+	formWindow()->selectWidget( TQT_TQOBJECT(w) );
+	TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w );
 	TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	for ( ; it != conns.end(); ++it ) {
-	    MetaDataBase::addConnection( formWindow(), (*it).sender,
+	    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender,
 					 (*it).signal, (*it).receiver, (*it).slot );
 	}
     }
@@ -457,8 +457,8 @@ void SetPropertyCommand::execute()
     if ( isResetCommand ) {
 	MetaDataBase::setPropertyChanged( widget, propName, FALSE );
 	if ( WidgetFactory::resetProperty( widget, propName ) ) {
-	    if ( !formWindow()->isWidgetSelected( widget ) && formWindow() != (TQObject *)widget )
-		formWindow()->selectWidget( (TQObject *)widget );
+	    if ( !formWindow()->isWidgetSelected( widget ) && TQT_TQOBJECT(formWindow()) != TQT_TQOBJECT(widget) )
+		formWindow()->selectWidget( TQT_TQOBJECT(widget) );
 	    if ( editor->widget() != widget )
 		editor->setWidget( widget, formWindow() );
 	    editor->propertyList()->setCurrentProperty( propName );
@@ -490,11 +490,11 @@ bool SetPropertyCommand::canMerge( Command *c )
     if ( !widget )
 	return FALSE;
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE );
     if ( !p ) {
 	if ( propName == "toolTip" || propName == "whatsThis" )
 	    return TRUE;
-	if ( ::qt_cast<CustomWidget*>((TQObject *)widget) ) {
+	if ( ::tqqt_cast<CustomWidget*>((TQObject *)widget) ) {
 	    MetaDataBase::CustomWidget *cw = ((CustomWidget*)(TQObject*)widget)->customWidget();
 	    if ( !cw )
 		return FALSE;
@@ -545,8 +545,8 @@ bool SetPropertyCommand::checkProperty()
 	    return FALSE;
 	}
 
-	if ( ::qt_cast<FormWindow*>(widget->parent()) )
-	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() );
+	if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) )
+	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->tqparentWidget() );
     }
     return TRUE;
 }
@@ -557,47 +557,47 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
         return;
 
     if ( !formWindow()->isWidgetSelected( widget ) && !formWindow()->isMainContainer( widget ) && select )
-	formWindow()->selectWidget( widget );
+	formWindow()->selectWidget( TQT_TQOBJECT(widget) );
     if ( editor->widget() != widget && select )
 	editor->setWidget( widget, formWindow() );
     if ( select )
 	editor->propertyList()->setCurrentProperty( propName );
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE );
     if ( !p ) {
 	if ( propName == "hAlign" ) {
-	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE );
-	    int align = widget->property( "alignment" ).toInt();
+	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~( AlignHorizontal_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "alignment", TQVariant( align ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "vAlign" ) {
-	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE );
-	    int align = widget->property( "alignment" ).toInt();
+	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~( AlignVertical_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "alignment", TQVariant( align ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "wordwrap" ) {
-	    int align = widget->property( "alignment" ).toInt();
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~WordBreak;
 	    if ( v.toBool() )
 		align |= WordBreak;
-	    widget->setProperty( "alignment", TQVariant( align ) );
-	} else if ( propName == "layoutSpacing" ) {
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	} else if ( propName == "tqlayoutSpacing" ) {
 	    TQVariant val = v;
 	    if ( val.toString() == "default" )
 		val = -1;
-	    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), val.toInt() );
-	} else if ( propName == "layoutMargin" ) {
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() );
+	} else if ( propName == "tqlayoutMargin" ) {
 	    TQVariant val = v;
 	    if ( val.toString() == "default" )
 		val = -1;
-	    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), val.toInt() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() );
 	} else if ( propName == "resizeMode" ) {
-	    MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), currentItemText );
+	    MetaDataBase::setResizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), currentItemText );
 	} else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) {
 	    MetaDataBase::setFakeProperty( editor->widget(), propName, v );
-	} else if ( ::qt_cast<CustomWidget*>(editor->widget()) ) {
+	} else if ( ::tqqt_cast<CustomWidget*>(editor->widget()) ) {
 	    MetaDataBase::CustomWidget *cw = ((CustomWidget *)(TQObject *)widget)->customWidget();
 	    if ( cw ) {
 		MetaDataBase::setFakeProperty( editor->widget(), propName, v );
@@ -606,7 +606,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	editor->refetchData();
 	editor->emitWidgetChanged();
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( propName == "database" ) {
 	    formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (TQWidget*)((TQObject *)widget), MetaDataBase::fakeProperty( widget, "database" ).toStringList() );
 	}
@@ -634,9 +634,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    oldSerNum = v.toPixmap().serialNumber();
 	widget->setProperty( propName, v );
 	if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() )
-	    MetaDataBase::setPixmapKey( formWindow(),
+	    MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()),
 					widget->property( propName ).toPixmap().serialNumber(),
-					MetaDataBase::pixmapKey( formWindow(), oldSerNum ) );
+					MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) );
 	if ( propName == "cursor" ) {
 	    MetaDataBase::setCursor( (TQWidget*)((TQObject *)widget), v.toCursor() );
 	}
@@ -645,10 +645,10 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    if ( formWindow()->isMainContainer( widget ) )
 		formWindow()->setName( v.toCString() );
 	}
-	if ( propName == "name" && ::qt_cast<TQAction*>((TQObject *)widget) && ::qt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
+	if ( propName == "name" && ::tqqt_cast<TQAction*>((TQObject *)widget) && ::tqqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
 	    formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)(TQObject *)widget );
 	}
-	if ( propName == "iconSet" && ::qt_cast<TQAction*>((TQObject *)widget) && ::qt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
+	if ( propName == "iconSet" && ::tqqt_cast<TQAction*>((TQObject *)widget) && ::tqqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
 	    formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)(TQObject *)widget );
 	}
 	if ( propName == "caption" ) {
@@ -666,162 +666,162 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
     }
     editor->emitWidgetChanged();
-    formWindow()->killAccels( widget );
+    formWindow()->killAccels( TQT_TQOBJECT(widget) );
 }
 
 // ------------------------------------------------------------
 
 LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-						  TQWidget *parent, TQWidget *layoutBase,
+						  TQWidget *tqparent, TQWidget *tqlayoutBase,
 						  const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
 {
 }
 
 void LayoutHorizontalCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-							    TQWidget *parent, TQWidget *layoutBase,
+							    TQWidget *tqparent, TQWidget *tqlayoutBase,
 							    const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TRUE, TRUE )
 {
 }
 
 void LayoutHorizontalSplitCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-					      TQWidget *parent, TQWidget *layoutBase,
+					      TQWidget *tqparent, TQWidget *tqlayoutBase,
 					      const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
 {
 }
 
 void LayoutVerticalCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-							TQWidget *parent, TQWidget *layoutBase,
+							TQWidget *tqparent, TQWidget *tqlayoutBase,
 							const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TRUE, TRUE )
 {
 }
 
 void LayoutVerticalSplitCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
-				      TQWidget *parent, TQWidget *layoutBase,
+				      TQWidget *tqparent, TQWidget *tqlayoutBase,
 				      const TQWidgetList &wl, int xres, int yres )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( QMAX(5,xres), QMAX(5,yres) ) )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
 {
 }
 
 void LayoutGridCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutGridCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
-					TQWidget *layoutBase, const TQWidgetList &wl )
-    : Command( n, fw ), lb( layoutBase ), widgets( wl )
+					TQWidget *tqlayoutBase, const TQWidgetList &wl )
+    : Command( n, fw ), lb( tqlayoutBase ), widgets( wl )
 {
-    WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
-    spacing = MetaDataBase::spacing( layoutBase );
-    margin = MetaDataBase::margin( layoutBase );
-    layout = 0;
+    WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase );
+    spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) );
+    margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) );
+    tqlayout = 0;
     if ( lay == WidgetFactory::HBox )
-	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast<TQSplitter*>(layoutBase) != 0 );
+	tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 );
     else if ( lay == WidgetFactory::VBox )
-	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast<TQSplitter*>(layoutBase) != 0 );
+	tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 );
     else if ( lay == WidgetFactory::Grid )
-	layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), FALSE );
+	tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
 }
 
 void BreakLayoutCommand::execute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( FALSE );
-    layout->breakLayout();
+    tqlayout->breakLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
-	w->resize( QMAX( 16, w->width() ), QMAX( 16, w->height() ) );
+	w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
 }
 
 void BreakLayoutCommand::unexecute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( FALSE );
-    layout->doLayout();
+    tqlayout->doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
-    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing );
-    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin );
+    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
+    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );
 }
 
 // ------------------------------------------------------------
@@ -850,19 +850,19 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw,
 				      TQTabWidget *tw, const TQString &label )
     : Command( n, fw ), tabWidget( tw ), tabLabel( label )
 {
-    tabPage = new QDesignerWidget( formWindow(), tabWidget, "TabPage" );
+    tabPage = new TQDesignerWidget( formWindow(), tabWidget, "TabPage" );
     tabPage->hide();
     index = -1;
-    MetaDataBase::addEntry( tabPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) );
 }
 
 void AddTabPageCommand::execute()
 {
     if ( index == -1 )
-	index = ( (QDesignerTabWidget*)tabWidget )->count();
+	index = ( (TQDesignerTabWidget*)tabWidget )->count();
     tabWidget->insertTab( tabPage, tabLabel, index );
     tabWidget->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -870,7 +870,7 @@ void AddTabPageCommand::unexecute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -886,19 +886,19 @@ MoveTabPageCommand::MoveTabPageCommand( const TQString &n, FormWindow *fw,
 
 void MoveTabPageCommand::execute()
 {
-    ((QDesignerTabWidget*)tabWidget )->removePage( tabPage );
-    ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex );
-    ((QDesignerTabWidget*)tabWidget )->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage );
+    ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex );
+    ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
 void MoveTabPageCommand::unexecute()
 {
-    ((QDesignerTabWidget*)tabWidget )->removePage( tabPage );
-    ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex );
-    ((QDesignerTabWidget*)tabWidget )->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage );
+    ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex );
+    ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -908,15 +908,15 @@ DeleteTabPageCommand::DeleteTabPageCommand( const TQString &n, FormWindow *fw,
 					    TQTabWidget *tw, TQWidget *page )
     : Command( n, fw ), tabWidget( tw ), tabPage( page )
 {
-    tabLabel = ( (QDesignerTabWidget*)tabWidget )->pageTitle();
-    index = ( (QDesignerTabWidget*)tabWidget )->currentPage();
+    tabLabel = ( (TQDesignerTabWidget*)tabWidget )->pageTitle();
+    index = ( (TQDesignerTabWidget*)tabWidget )->currentPage();
 }
 
 void DeleteTabPageCommand::execute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -924,26 +924,26 @@ void DeleteTabPageCommand::unexecute()
 {
     tabWidget->insertTab( tabPage, tabLabel, index );
     tabWidget->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
 // ------------------------------------------------------------
 
 AddWidgetStackPageCommand::AddWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-						      QDesignerWidgetStack *ws )
+						      TQDesignerWidgetStack *ws )
     : Command( n, fw ), widgetStack( ws )
 {
-    stackPage = new QDesignerWidget( formWindow(), widgetStack, "WStackPage" );
+    stackPage = new TQDesignerWidget( formWindow(), widgetStack, "WStackPage" );
     stackPage->hide();
     index = -1;
-    MetaDataBase::addEntry( stackPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(stackPage) );
 }
 
 void AddWidgetStackPageCommand::execute()
 {
     index = widgetStack->insertPage( stackPage, index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 );
 }
 
@@ -951,12 +951,12 @@ void AddWidgetStackPageCommand::unexecute()
 {
     index = widgetStack->removePage( stackPage );
     stackPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 );
 }
 
 DeleteWidgetStackPageCommand::DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-							    QDesignerWidgetStack *ws, TQWidget *page )
+							    TQDesignerWidgetStack *ws, TQWidget *page )
     : Command( n, fw), widgetStack( ws ), stackPage( page )
 {
     index = -1;
@@ -966,7 +966,7 @@ void DeleteWidgetStackPageCommand::execute()
 {
     index = widgetStack->removePage( stackPage );
     stackPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( stackPage );
 }
 
@@ -974,7 +974,7 @@ void DeleteWidgetStackPageCommand::unexecute()
 {
     index = widgetStack->insertPage( stackPage, index );
     widgetStack->raiseWidget( stackPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->widgetInserted( stackPage );
 }
 
@@ -984,11 +984,11 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw,
 					    TQWizard *w, const TQString &label, int i, bool s )
     : Command( n, fw ), wizard( w ), pageLabel( label )
 {
-    page = new QDesignerWidget( formWindow(), wizard, "WizardPage" );
+    page = new TQDesignerWidget( formWindow(), wizard, "WizardPage" );
     page->hide();
     index = i;
     show = s;
-    MetaDataBase::addEntry( page );
+    MetaDataBase::addEntry( TQT_TQOBJECT(page) );
 }
 
 void AddWizardPageCommand::execute()
@@ -997,8 +997,8 @@ void AddWizardPageCommand::execute()
 	index = wizard->pageCount();
     wizard->insertPage( page, pageLabel, index );
     if ( show )
-	( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+	( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1006,7 +1006,7 @@ void AddWizardPageCommand::unexecute()
 {
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1025,7 +1025,7 @@ void DeleteWizardPageCommand::execute()
     pageLabel = wizard->title( page );
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1033,8 +1033,8 @@ void DeleteWizardPageCommand::unexecute()
 {
     wizard->insertPage( page, pageLabel, index );
     if ( show )
-	( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+	( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1054,7 +1054,7 @@ void RenameWizardPageCommand::execute()
 
     wizard->setTitle( page, label );
     label = oldLabel;
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
 }
 
 void RenameWizardPageCommand::unexecute()
@@ -1079,7 +1079,7 @@ void SwapWizardPagesCommand::execute()
     wizard->removePage( page2 );
     wizard->insertPage( page1, page1Label, index2 );
     wizard->insertPage( page2, page2Label, index1 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1101,7 +1101,7 @@ void MoveWizardPageCommand::execute()
     TQString pageLabel = wizard->title( page );
     wizard->removePage( page );
     wizard->insertPage( page, pageLabel, index2 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1112,7 +1112,7 @@ void MoveWizardPageCommand::unexecute()
     TQString pageLabel = wizard->title( page );
     wizard->removePage( page );
     wizard->insertPage( page, pageLabel, index1 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1126,17 +1126,17 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw
 
 void AddConnectionCommand::execute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
 void AddConnectionCommand::unexecute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
@@ -1150,17 +1150,17 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind
 
 void RemoveConnectionCommand::execute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
 void RemoveConnectionCommand::unexecute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
@@ -1176,7 +1176,7 @@ AddFunctionCommand::AddFunctionCommand( const TQString &name, FormWindow *fw, co
 
 void AddFunctionCommand::execute()
 {
-    MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType );
+    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (add - execute)
@@ -1185,7 +1185,7 @@ void AddFunctionCommand::execute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->clearSelection(false);
     formWindow()->mainWindow()->part()->emitAddedFunction(formWindow()->fileName(), f);
 
@@ -1195,7 +1195,7 @@ void AddFunctionCommand::execute()
 
 void AddFunctionCommand::unexecute()
 {
-    MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType,  language, returnType );
+    MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType,  language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (add - unexecute)
@@ -1204,7 +1204,7 @@ void AddFunctionCommand::unexecute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitRemovedFunction(formWindow()->fileName(), f);
 
     if ( formWindow()->formFile() )
@@ -1230,7 +1230,7 @@ ChangeFunctionAttribCommand::ChangeFunctionAttribCommand( const TQString &name,
 
 void ChangeFunctionAttribCommand::execute()
 {
-    MetaDataBase::changeFunctionAttributes( formWindow(), oldName, newName, newSpec, newAccess,
+    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), oldName, newName, newSpec, newAccess,
 					    newType, newLang, newReturnType );
     formWindow()->formFile()->functionNameChanged( oldName, newName );
     formWindow()->formFile()->functionRetTypeChanged( newName, oldReturnType, newReturnType );
@@ -1242,13 +1242,13 @@ void ChangeFunctionAttribCommand::execute()
     f.function = newName;
     f.specifier = newSpec;
     f.access = newAccess;
-    f.type = (newType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (newType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     KInterfaceDesigner::Function of;
     f.returnType = oldReturnType;
     f.function = oldName;
     f.specifier = oldSpec;
     f.access = oldAccess;
-    f.type = (oldType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (oldType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitEditedFunction(formWindow()->fileName(), of, f);
 
     if ( formWindow()->formFile() )
@@ -1257,7 +1257,7 @@ void ChangeFunctionAttribCommand::execute()
 
 void ChangeFunctionAttribCommand::unexecute()
 {
-    MetaDataBase::changeFunctionAttributes( formWindow(), newName, oldName, oldSpec, oldAccess,
+    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), newName, oldName, oldSpec, oldAccess,
 					    oldType, oldLang, oldReturnType );
     formWindow()->formFile()->functionNameChanged( newName, oldName );
     formWindow()->formFile()->functionRetTypeChanged( oldName, newReturnType, oldReturnType );
@@ -1269,13 +1269,13 @@ void ChangeFunctionAttribCommand::unexecute()
     f.function = newName;
     f.specifier = newSpec;
     f.access = newAccess;
-    f.type = (newType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (newType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     KInterfaceDesigner::Function of;
     f.returnType = oldReturnType;
     f.function = oldName;
     f.specifier = oldSpec;
     f.access = oldAccess;
-    f.type = (oldType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (oldType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitEditedFunction(formWindow()->fileName(), f, of);
 
     if ( formWindow()->formFile() )
@@ -1291,7 +1291,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow *
       returnType( rt )
 {
     if ( spec.isNull() ) {
-	TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( fw );
+	TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( TQT_TQOBJECT(fw) );
 	for ( TQValueList<MetaDataBase::Function>::Iterator it = lst.begin(); it != lst.end(); ++it ) {
 	    if ( MetaDataBase::normalizeFunction( (*it).function ) ==
 		 MetaDataBase::normalizeFunction( function ) ) {
@@ -1308,7 +1308,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow *
 
 void RemoveFunctionCommand::execute()
 {
-    MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType, language, returnType );
+    MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (remove - execute)
@@ -1317,7 +1317,7 @@ void RemoveFunctionCommand::execute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitRemovedFunction(formWindow()->fileName(), f);
 
     if ( formWindow()->formFile() )
@@ -1326,9 +1326,9 @@ void RemoveFunctionCommand::execute()
 
 void RemoveFunctionCommand::unexecute()
 {
-    if ( MetaDataBase::hasFunction( formWindow(), function ) )
+    if ( MetaDataBase::hasFunction( TQT_TQOBJECT(formWindow()), function ) )
 	return;
-    MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType );
+    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (remove - unexecute)
@@ -1337,7 +1337,7 @@ void RemoveFunctionCommand::unexecute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->clearSelection(false);
     formWindow()->mainWindow()->part()->emitAddedFunction(formWindow()->fileName(), f);
 
@@ -1354,7 +1354,7 @@ AddVariableCommand::AddVariableCommand( const TQString &name, FormWindow *fw, co
 
 void AddVariableCommand::execute()
 {
-    MetaDataBase::addVariable( formWindow(), varName, access );
+    MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1362,7 +1362,7 @@ void AddVariableCommand::execute()
 
 void AddVariableCommand::unexecute()
 {
-    MetaDataBase::removeVariable( formWindow(), varName );
+    MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1374,12 +1374,12 @@ SetVariablesCommand::SetVariablesCommand( const TQString &name, FormWindow *fw,
     TQValueList<MetaDataBase::Variable> lst )
     : Command( name, fw ), newList( lst )
 {
-    oldList = MetaDataBase::variables( formWindow() );
+    oldList = MetaDataBase::variables( TQT_TQOBJECT(formWindow()) );
 }
 
 void SetVariablesCommand::execute()
 {
-    MetaDataBase::setVariables( formWindow(), newList );
+    MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), newList );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1387,7 +1387,7 @@ void SetVariablesCommand::execute()
 
 void SetVariablesCommand::unexecute()
 {
-    MetaDataBase::setVariables( formWindow(), oldList );
+    MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), oldList );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1398,7 +1398,7 @@ void SetVariablesCommand::unexecute()
 RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn )
     : Command( name, fw ), varName( vn )
 {
-    TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( fw );
+    TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( TQT_TQOBJECT(fw) );
     for ( TQValueList<MetaDataBase::Variable>::Iterator it = lst.begin(); it != lst.end(); ++it ) {
 	if ( (*it).varName == varName ) {
 	    access = (*it).varAccess;
@@ -1409,7 +1409,7 @@ RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *
 
 void RemoveVariableCommand::execute()
 {
-    MetaDataBase::removeVariable( formWindow(), varName );
+    MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1417,7 +1417,7 @@ void RemoveVariableCommand::execute()
 
 void RemoveVariableCommand::unexecute()
 {
-    MetaDataBase::addVariable( formWindow(), varName, access );
+    MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1510,7 +1510,7 @@ void PasteCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	w->show();
-	formWindow()->selectWidget( w );
+	formWindow()->selectWidget( TQT_TQOBJECT(w) );
 	formWindow()->widgets()->insert( w, w );
 	formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
     }
@@ -1520,7 +1520,7 @@ void PasteCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	w->hide();
-	formWindow()->selectWidget( w, FALSE );
+	formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE );
 	formWindow()->widgets()->remove( w );
 	formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
     }
@@ -1603,7 +1603,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 						  TQIconView *iv, const TQValueList<Item> &items )
     : Command( n, fw ), newItems( items ), iconview( iv )
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     TQIconViewItem *i = 0;
     for ( i = iconview->firstItem(); i; i = i->nextItem() ) {
 	Item item;
@@ -1617,7 +1617,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 
 void PopulateIconViewCommand::execute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = newItems.begin(); it != newItems.end(); ++it ) {
 	Item i = *it;
@@ -1628,7 +1628,7 @@ void PopulateIconViewCommand::execute()
 
 void PopulateIconViewCommand::unexecute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) {
 	Item i = *it;
@@ -1689,7 +1689,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
     from->setSorting( -1 );
     for ( ; it.current(); ++it ) {
 	TQListViewItem *i = it.current();
-	if ( i->parent() == fromParents.top() ) {
+	if ( i->tqparent() == fromParents.top() ) {
 	    TQListViewItem *pi = toParents.top();
 	    TQListViewItem *ni = 0;
 	    if ( pi )
@@ -1706,7 +1706,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
 	    if ( pi )
 		pi->setOpen( TRUE );
 	} else {
-	    if ( i->parent() == fromLast ) {
+	    if ( i->tqparent() == fromLast ) {
 		fromParents.push( fromLast );
 		toParents.push( toLasts.top() );
 		toLasts.push( 0 );
@@ -1726,7 +1726,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
 		if ( pi )
 		    pi->setOpen( TRUE );
 	    } else {
-		while ( fromParents.top() != i->parent() ) {
+		while ( fromParents.top() != i->tqparent() ) {
 		    fromParents.pop();
 		    toParents.pop();
 		    toLasts.pop();
@@ -1762,21 +1762,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F
     : Command( n, fw ), newText( txt ), mlined( mle )
 {
     oldText = mlined->text();
-    wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" );
+    wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" );
 }
 
 void PopulateMultiLineEditCommand::execute()
 {
     mlined->setText( newText );
-    MetaDataBase::setPropertyChanged( mlined, "text", TRUE );
-    formWindow()->emitUpdateProperties( mlined );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", TRUE );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) );
 }
 
 void PopulateMultiLineEditCommand::unexecute()
 {
     mlined->setText( oldText );
-    MetaDataBase::setPropertyChanged( mlined, "text", wasChanged );
-    formWindow()->emitUpdateProperties( mlined );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) );
 }
 
 // ------------------------------------------------------------
@@ -1786,15 +1786,15 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 					    const TQValueList<Column> &columns )
     : Command( n, fw ), newRows( rows ), newColumns( columns ), table( t )
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     int i = 0;
-    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
+    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
 	if ( table->horizontalHeader()->iconSet( i ) )
 	    col.pix = table->horizontalHeader()->iconSet( i )->pixmap();
-	col.field = *columnFields.find( col.text );
+	col.field = *columnFields.tqfind( col.text );
 	oldColumns.append( col );
     }
     for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
@@ -1809,7 +1809,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 
 void PopulateTableCommand::execute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( newColumns.count() );
     int i = 0;
@@ -1818,7 +1818,7 @@ void PopulateTableCommand::execute()
 	if ( !(*cit).field.isEmpty() )
 	    columnFields.insert( (*cit).text, (*cit).field );
     }
-    MetaDataBase::setColumnFields( table, columnFields );
+    MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields );
     table->setNumRows( newRows.count() );
     i = 0;
     for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i )
@@ -1828,7 +1828,7 @@ void PopulateTableCommand::execute()
 
 void PopulateTableCommand::unexecute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( oldColumns.count() );
     int i = 0;
@@ -1837,7 +1837,7 @@ void PopulateTableCommand::unexecute()
 	if ( !(*cit).field.isEmpty() )
 	    columnFields.insert( (*cit).text, (*cit).field );
     }
-    MetaDataBase::setColumnFields( table, columnFields );
+    MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields );
     table->setNumRows( oldRows.count() );
     i = 0;
     for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i )
@@ -1848,7 +1848,7 @@ void PopulateTableCommand::unexecute()
 // ------------------------------------------------------------
 
 AddActionToToolBarCommand::AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-						      TQAction *a, QDesignerToolBar *tb, int idx )
+						      TQAction *a, TQDesignerToolBar *tb, int idx )
     : Command( n, fw ), action( a ), toolBar( tb ), index( idx )
 {
 }
@@ -1857,24 +1857,24 @@ void AddActionToToolBarCommand::execute()
 {
     action->addTo( toolBar );
 
-    if ( ::qt_cast<QDesignerAction*>(action) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( ::tqqt_cast<TQDesignerAction*>(action) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	if ( s.startsWith( "qt_dead_widget_" ) ) {
 	    s.remove( 0, TQString( "qt_dead_widget_" ).length() );
-	    ( (QDesignerAction*)action )->widget()->setName( s );
+	    ( (TQDesignerAction*)action )->widget()->setName( s );
 	}
-	toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action );
-	( (QDesignerAction*)action )->widget()->installEventFilter( toolBar );
-    } else if ( ::qt_cast<QDesignerActionGroup*>(action) ) {
-	if ( ( (QDesignerActionGroup*)action )->usesDropDown() ) {
-	    toolBar->insertAction( ( (QDesignerActionGroup*)action )->widget(), action );
-	    ( (QDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
+	toolBar->insertAction( ( (TQDesignerAction*)action )->widget(), action );
+	( (TQDesignerAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(action) ) {
+	if ( ( (TQDesignerActionGroup*)action )->usesDropDown() ) {
+	    toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action );
+	    ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
 	}
-    } else if ( ::qt_cast<QSeparatorAction*>(action) ) {
-	toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action );
-	( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( ::tqqt_cast<TQSeparatorAction*>(action) ) {
+	toolBar->insertAction( ( (TQSeparatorAction*)action )->widget(), action );
+	( (TQSeparatorAction*)action )->widget()->installEventFilter( toolBar );
     }
-    if ( !::qt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
 	if ( index == -1 )
 	    toolBar->appendAction( action );
 	else
@@ -1882,17 +1882,18 @@ void AddActionToToolBarCommand::execute()
 	toolBar->reInsert();
 	TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
     } else {
-	if ( action->children() ) {
-	    TQObjectListIt it( *action->children() );
+        TQObjectList clo = action->childrenListObject();
+	if ( !clo.isEmpty() ) {
+	    TQObjectListIt it( clo );
 	    int i = 0;
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !::qt_cast<TQAction*>(o) )
+		if ( !::tqqt_cast<TQAction*>(o) )
 		    continue;
 		// ### fix it for nested actiongroups
-		if ( ::qt_cast<QDesignerAction*>(o) ) {
-		    QDesignerAction *ac = (QDesignerAction*)o;
+		if ( ::tqqt_cast<TQDesignerAction*>(o) ) {
+		    TQDesignerAction *ac = (TQDesignerAction*)o;
 		    toolBar->insertAction( ac->widget(), ac );
 		    ac->widget()->installEventFilter( toolBar );
 		    if ( index == -1 )
@@ -1911,26 +1912,27 @@ void AddActionToToolBarCommand::execute()
 
 void AddActionToToolBarCommand::unexecute()
 {
-    if ( ::qt_cast<QDesignerAction*>(action) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( ::tqqt_cast<TQDesignerAction*>(action) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	s.prepend( "qt_dead_widget_" );
-	( (QDesignerAction*)action )->widget()->setName( s );
+	( (TQDesignerAction*)action )->widget()->setName( s );
     }
 
     toolBar->removeAction( action );
     action->removeFrom( toolBar );
     TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
-    if ( !::qt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( toolBar );
     } else {
-	if ( action->children() ) {
-	    TQObjectListIt it( *action->children() );
+        TQObjectList clo = action->childrenListObject();
+	if ( !clo.isEmpty() ) {
+	    TQObjectListIt it( clo );
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !::qt_cast<TQAction*>(o) )
+		if ( !::tqqt_cast<TQAction*>(o) )
 		    continue;
-		if ( ::qt_cast<QDesignerAction*>(o) ) {
+		if ( ::tqqt_cast<TQDesignerAction*>(o) ) {
 		    o->removeEventFilter( toolBar );
 		    toolBar->removeAction( (TQAction*)o );
 		}
@@ -1951,9 +1953,9 @@ AddToolBarCommand::AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainW
 void AddToolBarCommand::execute()
 {
     if ( !toolBar ) {
-	toolBar = new QDesignerToolBar( mainWindow );
+	toolBar = new TQDesignerToolBar( mainWindow );
 	TQString n = "Toolbar";
-	formWindow()->unify( toolBar, n, TRUE );
+	formWindow()->unify( TQT_TQOBJECT(toolBar), n, TRUE );
 	toolBar->setName( n );
 	mainWindow->addToolBar( toolBar, n );
     } else {
@@ -1976,7 +1978,7 @@ void AddToolBarCommand::unexecute()
 
 // ------------------------------------------------------------
 
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 AddContainerPageCommand::AddContainerPageCommand( const TQString &n, FormWindow *fw,
 						  TQWidget *c, const TQString &label )
     : Command( n, fw ), container( c ), index( -1 ), pageLabel( label ), page( 0 )
@@ -1985,7 +1987,7 @@ AddContainerPageCommand::AddContainerPageCommand( const TQString &n, FormWindow
     widgetManager()->queryInterface( WidgetFactory::classNameOf( container ), &iface );
     if ( !iface )
 	return;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&wiface );
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&wiface );
     if ( !wiface )
 	return;
     wClassName = WidgetFactory::classNameOf( container );
@@ -2009,7 +2011,7 @@ void AddContainerPageCommand::execute()
 	wiface->insertPage( wClassName, container, pageLabel, index, page );
 
     MetaDataBase::addEntry( page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2018,7 +2020,7 @@ void AddContainerPageCommand::unexecute()
     if ( !wiface || !wiface->supportsPages( wClassName ) )
 	return;
     wiface->removePage( wClassName, container, index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2032,7 +2034,7 @@ DeleteContainerPageCommand::DeleteContainerPageCommand( const TQString &n, FormW
     widgetManager()->queryInterface( WidgetFactory::classNameOf( container ), &iface );
     if ( !iface )
 	return;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&wiface );
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&wiface );
     if ( !wiface )
 	return;
     wClassName = WidgetFactory::classNameOf( container );
@@ -2052,7 +2054,7 @@ void DeleteContainerPageCommand::execute()
 	return;
 
     wiface->removePage( wClassName, container, index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2064,7 +2066,7 @@ void DeleteContainerPageCommand::unexecute()
 	index = wiface->count( wClassName, container );
 
     wiface->insertPage( wClassName, container, pageLabel, index, page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2079,7 +2081,7 @@ RenameContainerPageCommand::RenameContainerPageCommand( const TQString &n, FormW
     widgetManager()->queryInterface( WidgetFactory::classNameOf( container ), &iface );
     if ( !iface )
 	return;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&wiface );
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&wiface );
     if ( !wiface )
 	return;
     wClassName = WidgetFactory::classNameOf( container );
@@ -2097,7 +2099,7 @@ void RenameContainerPageCommand::execute()
     if ( !wiface || !wiface->supportsPages( wClassName ) )
 	return;
     wiface->renamePage( wClassName, container, index, newLabel );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2106,10 +2108,10 @@ void RenameContainerPageCommand::unexecute()
     if ( !wiface || !wiface->supportsPages( wClassName ) )
 	return;
     wiface->renamePage( wClassName, container, index, oldLabel );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
 // ------------------------------------------------------------
 
 AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n,
@@ -2129,7 +2131,7 @@ void AddActionToPopupCommand::execute()
 void AddActionToPopupCommand::unexecute()
 {
     item->hideMenu();
-    int i = menu->find( item->action() );
+    int i = menu->tqfind( item->action() );
     menu->remove( i );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
@@ -2198,7 +2200,7 @@ RenameActionCommand::RenameActionCommand( const TQString &n,
 void RenameActionCommand::execute()
 {
     TQString actionText = newName;
-    actionText.replace("&&", "&");
+    actionText.tqreplace("&&", "&");
     TQString menuText = newName;
     action->setText( actionText );
     action->setMenuText( menuText );
@@ -2388,8 +2390,8 @@ TQString RenameMenuCommand::makeLegal( const TQString &str )
     // remove illegal characters
     TQString d;
     char c = 0, i = 0;
-    while ( !str.at(i).isNull() ) {
-	c = str.at(i).latin1();
+    while ( !str.tqat(i).isNull() ) {
+	c = str.tqat(i).latin1();
 	if ( c == '-' || c == ' ' )
 	    d += '_';
 	else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' )
@@ -2405,7 +2407,7 @@ void RenameMenuCommand::execute()
     PopupMenuEditor *popup = item->menu();
     item->setMenuText( newName );
     TQString legal = makeLegal( newName );
-    formWindow()->unify( popup, legal, TRUE );
+    formWindow()->unify( TQT_TQOBJECT(popup), legal, TRUE );
     popup->setName( legal );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
@@ -2424,17 +2426,17 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw,
 				      TQToolBox *tw, const TQString &label )
     : Command( n, fw ), toolBox( tw ), toolBoxLabel( label )
 {
-    toolBoxPage = new QDesignerWidget( formWindow(), toolBox, "page" );
+    toolBoxPage = new TQDesignerWidget( formWindow(), toolBox, "page" );
     toolBoxPage->hide();
     index = -1;
-    MetaDataBase::addEntry( toolBoxPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(toolBoxPage) );
 }
 
 void AddToolBoxPageCommand::execute()
 {
     index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel);
     toolBox->setCurrentIndex( index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -2442,7 +2444,7 @@ void AddToolBoxPageCommand::unexecute()
 {
     toolBox->removeItem( toolBoxPage );
     toolBoxPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -2460,7 +2462,7 @@ void DeleteToolBoxPageCommand::execute()
 {
     toolBox->removeItem( toolBoxPage );
     toolBoxPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -2468,6 +2470,6 @@ void DeleteToolBoxPageCommand::unexecute()
 {
     index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel );
     toolBox->setCurrentIndex( index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h
index 0279dc50..a44f2431 100644
--- a/kdevdesigner/designer/command.h
+++ b/kdevdesigner/designer/command.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -50,7 +50,7 @@ class TQListBox;
 class TQIconView;
 class TQTable;
 class TQAction;
-class QDesignerToolBar;
+class TQDesignerToolBar;
 class TQMainWindow;
 class TQTextEdit;
 struct LanguageInterface;
@@ -62,7 +62,7 @@ class PopupMenuEditor;
 class PopupMenuEditorItem;
 class ActionEditor;
 
-class Command : public Qt
+class Command : public TQt
 {
 public:
     Command( const TQString &n, FormWindow *fw );
@@ -147,9 +147,10 @@ private:
 
 };
 
-class CommandHistory : public QObject
+class CommandHistory : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     CommandHistory( int s );
@@ -207,7 +208,7 @@ public:
 
 private:
     TQWidget *widget;
-    TQRect geometry;
+    TQRect tqgeometry;
 
 };
 
@@ -281,7 +282,7 @@ class LayoutHorizontalCommand : public Command
 {
 public:
     LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-			     TQWidget *parent, TQWidget *layoutBase,
+			     TQWidget *tqparent, TQWidget *tqlayoutBase,
 			     const TQWidgetList &wl );
 
     void execute();
@@ -289,7 +290,7 @@ public:
     Type type() const { return LayoutHorizontal; }
 
 private:
-    HorizontalLayout layout;
+   HorizontalLayout tqlayout;
 
 };
 
@@ -297,7 +298,7 @@ class LayoutHorizontalSplitCommand : public Command
 {
 public:
     LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-				  TQWidget *parent, TQWidget *layoutBase,
+				  TQWidget *tqparent, TQWidget *tqlayoutBase,
 				  const TQWidgetList &wl );
 
     void execute();
@@ -305,7 +306,7 @@ public:
     Type type() const { return LayoutHorizontalSplitter; }
 
 private:
-    HorizontalLayout layout;
+   HorizontalLayout tqlayout;
 
 };
 
@@ -313,7 +314,7 @@ class LayoutVerticalCommand : public Command
 {
 public:
     LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-			   TQWidget *parent, TQWidget *layoutBase,
+			   TQWidget *tqparent, TQWidget *tqlayoutBase,
 			   const TQWidgetList &wl );
 
     void execute();
@@ -321,7 +322,7 @@ public:
     Type type() const { return LayoutVertical; }
 
 private:
-    VerticalLayout layout;
+   VerticalLayout tqlayout;
 
 };
 
@@ -329,7 +330,7 @@ class LayoutVerticalSplitCommand : public Command
 {
 public:
     LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-				TQWidget *parent, TQWidget *layoutBase,
+				TQWidget *tqparent, TQWidget *tqlayoutBase,
 				const TQWidgetList &wl );
 
     void execute();
@@ -337,7 +338,7 @@ public:
     Type type() const { return LayoutVerticalSplitter; }
 
 private:
-    VerticalLayout layout;
+   VerticalLayout tqlayout;
 
 };
 
@@ -345,7 +346,7 @@ class LayoutGridCommand : public Command
 {
 public:
     LayoutGridCommand( const TQString &n, FormWindow *fw,
-		       TQWidget *parent, TQWidget *layoutBase,
+		       TQWidget *tqparent, TQWidget *tqlayoutBase,
 		       const TQWidgetList &wl, int xres, int yres );
 
     void execute();
@@ -353,7 +354,7 @@ public:
     Type type() const { return LayoutGrid; }
 
 private:
-    GridLayout layout;
+    GridLayout tqlayout;
 
 };
 
@@ -361,14 +362,14 @@ class BreakLayoutCommand : public Command
 {
 public:
     BreakLayoutCommand( const TQString &n, FormWindow *fw,
-			TQWidget *layoutBase, const TQWidgetList &wl );
+			TQWidget *tqlayoutBase, const TQWidgetList &wl );
 
     void execute();
     void unexecute();
     Type type() const { return BreakLayout; }
 
 private:
-    Layout *layout;
+    Layout *tqlayout;
     int spacing;
     int margin;
     TQWidget *lb;
@@ -444,19 +445,19 @@ private:
     TQString tabLabel;
 
 };
-class QDesignerWidgetStack;
+class TQDesignerWidgetStack;
 class AddWidgetStackPageCommand : public Command
 {
 public:
     AddWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-			       QDesignerWidgetStack *ws );
+			       TQDesignerWidgetStack *ws );
 
     void execute();
     void unexecute();
     Type type() const { return AddWidgetStackPage; }
 
 private:
-    QDesignerWidgetStack *widgetStack;
+    TQDesignerWidgetStack *widgetStack;
     int index;
     TQWidget *stackPage;
 };
@@ -465,14 +466,14 @@ class DeleteWidgetStackPageCommand : public Command
 {
 public:
     DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-				  QDesignerWidgetStack *ws, TQWidget *page );
+				  TQDesignerWidgetStack *ws, TQWidget *page );
 
     void execute();
     void unexecute();
     Type type() const { return DeleteWidgetStackPage; }
 
 private:
-    QDesignerWidgetStack *widgetStack;
+    TQDesignerWidgetStack *widgetStack;
     int index;
     TQWidget *stackPage;
 };
@@ -774,7 +775,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     PopulateListBoxCommand( const TQString &n, FormWindow *fw,
@@ -798,7 +799,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     PopulateIconViewCommand( const TQString &n, FormWindow *fw,
@@ -856,7 +857,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-	Q_DUMMY_COMPARISON_OPERATOR( Row )
+	TQ_DUMMY_COMPARISON_OPERATOR( Row )
     };
 
     struct Column
@@ -864,7 +865,7 @@ public:
 	TQString text;
 	TQPixmap pix;
 	TQString field;
-	Q_DUMMY_COMPARISON_OPERATOR( Column )
+	TQ_DUMMY_COMPARISON_OPERATOR( Column )
     };
 
     PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t,
@@ -886,7 +887,7 @@ class AddActionToToolBarCommand : public Command
 {
 public:
     AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-			       TQAction *a, QDesignerToolBar *tb, int idx );
+			       TQAction *a, TQDesignerToolBar *tb, int idx );
 
     void execute();
     void unexecute();
@@ -894,7 +895,7 @@ public:
 
 private:
     TQAction *action;
-    QDesignerToolBar *toolBar;
+    TQDesignerToolBar *toolBar;
     int index;
 
 };
@@ -903,7 +904,7 @@ class RemoveActionFromToolBarCommand : public AddActionToToolBarCommand
 {
 public:
     RemoveActionFromToolBarCommand( const TQString &n, FormWindow *fw,
-				    TQAction *a, QDesignerToolBar *tb, int idx )
+				    TQAction *a, TQDesignerToolBar *tb, int idx )
 	: AddActionToToolBarCommand( n, fw, a, tb, idx ) {}
 
     void execute() { AddActionToToolBarCommand::unexecute(); }
@@ -924,7 +925,7 @@ public:
     Type type() const { return AddToolBar; }
 
 protected:
-    QDesignerToolBar *toolBar;
+    TQDesignerToolBar *toolBar;
     TQMainWindow *mainWindow;
 
 };
@@ -932,7 +933,7 @@ protected:
 class RemoveToolBarCommand : public AddToolBarCommand
 {
 public:
-    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, QDesignerToolBar *tb )
+    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, TQDesignerToolBar *tb )
 	: AddToolBarCommand( n, fw, mw ) { toolBar = tb; }
 
     void execute() { AddToolBarCommand::unexecute(); }
@@ -941,7 +942,7 @@ public:
 
 };
 
-struct QWidgetContainerInterfacePrivate;
+struct TQWidgetContainerInterfacePrivate;
 
 class AddContainerPageCommand : public Command
 {
@@ -961,7 +962,7 @@ private:
     int index;
     TQString pageLabel;
     TQWidget *page;
-    QWidgetContainerInterfacePrivate *wiface;
+    TQWidgetContainerInterfacePrivate *wiface;
 
 };
 
@@ -982,7 +983,7 @@ private:
     int index;
     TQString pageLabel;
     TQWidget *page;
-    QWidgetContainerInterfacePrivate *wiface;
+    TQWidgetContainerInterfacePrivate *wiface;
 
 };
 
@@ -1003,7 +1004,7 @@ private:
     TQWidget *container;
     int index;
     TQString oldLabel, newLabel;
-    QWidgetContainerInterfacePrivate *wiface;
+    TQWidgetContainerInterfacePrivate *wiface;
 
 };
 
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui
index ac19357b..4ff3c19d 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui
+++ b/kdevdesigner/designer/configtoolboxdialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ConfigToolboxDialog</cstring>
     </property>
@@ -44,7 +44,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -62,14 +62,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>342</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton3</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton4</cstring>
                     </property>
@@ -90,7 +90,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -98,7 +98,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>buttonAdd</cstring>
                     </property>
@@ -119,14 +119,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>111</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QListView" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2">
                     <column>
                         <property name="text">
                             <string>Available Tools</string>
@@ -150,7 +150,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -158,7 +158,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>buttonRemove</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         <string>&amp;Remove</string>
                     </property>
                 </widget>
-                <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
                     <column>
                         <property name="text">
                             <string>Common Widgets Page</string>
@@ -191,7 +191,7 @@
                         <enum>LastColumn</enum>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="1" column="3">
+                <widget class="TQToolButton" row="1" column="3">
                     <property name="name">
                         <cstring>buttonDown</cstring>
                     </property>
@@ -215,14 +215,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QToolButton" row="1" column="2">
+                <widget class="TQToolButton" row="1" column="2">
                     <property name="name">
                         <cstring>buttonUp</cstring>
                     </property>
@@ -267,15 +267,15 @@
     </connection>
     <connection>
         <sender>listViewTools</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ConfigToolboxDialog</receiver>
-        <slot>currentToolChanged(QListViewItem*)</slot>
+        <slot>currentToolChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>listViewCommon</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ConfigToolboxDialog</receiver>
-        <slot>currentCommonToolChanged(QListViewItem*)</slot>
+        <slot>currentCommonToolChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>PushButton3</sender>
@@ -297,7 +297,7 @@
     </connection>
     <connection>
         <sender>listViewTools</sender>
-        <signal>doubleClicked(QListViewItem*)</signal>
+        <signal>doubleClicked(TQListViewItem*)</signal>
         <receiver>ConfigToolboxDialog</receiver>
         <slot>addTool()</slot>
     </connection>
@@ -305,15 +305,15 @@
 <includes>
     <include location="local" impldecl="in implementation">configtoolboxdialog.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>addTool()</slot>
     <slot>removeTool()</slot>
     <slot>moveToolUp()</slot>
     <slot>moveToolDown()</slot>
-    <slot>currentToolChanged( QListViewItem * i )</slot>
-    <slot>currentCommonToolChanged( QListViewItem * i )</slot>
+    <slot>currentToolChanged( TQListViewItem * i )</slot>
+    <slot>currentCommonToolChanged( TQListViewItem * i )</slot>
     <slot>ok()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function access="private">init()</function>
 </functions>
@@ -322,5 +322,5 @@
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h
index 0b176afc..1a2bd1b8 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui.h
+++ b/kdevdesigner/designer/configtoolboxdialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,14 +51,14 @@ void ConfigToolboxDialog::init()
 	  a;
 	  a = MainWindow::self->toolActions.prev() ) {
 	TQString grp = ( (WidgetAction*)a )->group();
-	TQListViewItem *parent = groups.find( grp );
-	if ( !parent ) {
-	    parent = new TQListViewItem( listViewTools );
-	    parent->setText( 0, grp );
-	    parent->setOpen( TRUE );
-	    groups.insert( grp, parent );
+	TQListViewItem *tqparent = groups.tqfind( grp );
+	if ( !tqparent ) {
+	    tqparent = new TQListViewItem( listViewTools );
+	    tqparent->setText( 0, grp );
+	    tqparent->setOpen( TRUE );
+	    groups.insert( grp, tqparent );
 	}
-	TQListViewItem *i = new TQListViewItem( parent );
+	TQListViewItem *i = new TQListViewItem( tqparent );
 	i->setText( 0, a->text() );
 	i->setPixmap( 0, a->iconSet().pixmap() );
     }
@@ -87,7 +87,7 @@ void ConfigToolboxDialog::addTool()
 
 	if ( (*it)->isSelected() ) {
 	    if ( (*it)->childCount() == 0 ) {
-		// Selected, no children
+		// Selected, no tqchildren
 		TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
 		i->setText( 0, (*it)->text(0) );
 		i->setPixmap( 0, *((*it)->pixmap(0)) );
@@ -96,17 +96,17 @@ void ConfigToolboxDialog::addTool()
 	    } else if ( !addKids ) {
 		// Children processing not set, so set it
 		// Also find the item were we shall quit
-		// processing children...if any such item
+		// processing tqchildren...if any such item
 		addKids = TRUE;
 		nextSibling = (*it)->nextSibling();
-		nextParent = (*it)->parent();
+		nextParent = (*it)->tqparent();
 		while ( nextParent && !nextSibling ) {
 		    nextSibling = nextParent->nextSibling();
-		    nextParent = nextParent->parent();
+		    nextParent = nextParent->tqparent();
 		}
 	    }
 	} else if ( ((*it)->childCount() == 0) && addKids ) {
-	    // Leaf node, and we _do_ process children
+	    // Leaf node, and we _do_ process tqchildren
 	    TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
 	    i->setText( 0, (*it)->text(0) );
 	    i->setPixmap( 0, *((*it)->pixmap(0)) );
diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui
index c8cc9c4f..24b32266 100644
--- a/kdevdesigner/designer/connectiondialog.ui
+++ b/kdevdesigner/designer/connectiondialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ConnectionDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <string>&amp;New</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -77,7 +77,7 @@
                 <cstring>connectionsTable</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <string>&amp;Delete</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="6" column="1">
+        <widget class="TQPushButton" row="6" column="1">
             <property name="name">
                 <cstring>PushButton3</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="1">
+        <widget class="TQPushButton" row="5" column="1">
             <property name="name">
                 <cstring>PushButton7</cstring>
             </property>
@@ -114,14 +114,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>buttonEditSlots</cstring>
             </property>
@@ -192,28 +192,28 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">qptrlist.h</include>
+    <include location="global" impldecl="in declaration">tqptrlist.h</include>
     <include location="local" impldecl="in declaration">connectionitems.h</include>
     <include location="local" impldecl="in implementation">connectiondialog.ui.h</include>
 </includes>
 <variables>
-    <variable>QPtrList&lt;ConnectionContainer&gt; connections;</variable>
-    <variable>QObject *defaultSender;</variable>
-    <variable>QObject *defaultReceiver;</variable>
+    <variable>TQPtrList&lt;ConnectionContainer&gt; connections;</variable>
+    <variable>TQObject *defaultSender;</variable>
+    <variable>TQObject *defaultReceiver;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>addConnection()</slot>
-    <slot returnType="ConnectionContainer *">addConnection( QObject * sender, QObject * receiver, const QString &amp; signal, const QString &amp; slot )</slot>
+    <slot returnType="ConnectionContainer *">addConnection( TQObject * sender, TQObject * receiver, const TQString &amp; signal, const TQString &amp; slot )</slot>
     <slot>updateConnectionState( ConnectionContainer * c )</slot>
     <slot>okClicked()</slot>
     <slot>cancelClicked()</slot>
     <slot>deleteClicked()</slot>
     <slot>editSlots()</slot>
-    <slot>setDefault( QObject * sender, QObject * receiver )</slot>
+    <slot>setDefault( TQObject * sender, TQObject * receiver )</slot>
     <slot>updateEditSlotsButton()</slot>
     <slot>updateConnectionContainers()</slot>
     <slot>ensureConnectionVisible()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h
index f8df4230..4969c8fd 100644
--- a/kdevdesigner/designer/connectiondialog.ui.h
+++ b/kdevdesigner/designer/connectiondialog.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -81,7 +81,7 @@ void ConnectionDialog::init()
     }
 
     TQValueList<MetaDataBase::Connection> conns =
-	MetaDataBase::connections( MainWindow::self->formWindow() );
+	MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) );
     for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	  it != conns.end(); ++it ) {
 	ConnectionContainer *c = addConnection( (*it).sender, (*it).receiver,
@@ -96,7 +96,7 @@ void ConnectionDialog::init()
 
 void ConnectionDialog::addConnection()
 {
-    addConnection( defaultSender, defaultReceiver, TQString::null, TQString::null );
+    addConnection( defaultSender, defaultReceiver, TQString(), TQString() );
     ensureConnectionVisible();
 }
 
@@ -147,14 +147,14 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject
     connect( re, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ),
 	     this, TQT_SLOT( updateEditSlotsButton() ) );
 
-    ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row );
+    ConnectionContainer *c = new ConnectionContainer( TQT_TQOBJECT(this), se, si, re, sl, row );
     connections.append( c );
     connect( c, TQT_SIGNAL( changed( ConnectionContainer * ) ),
 	     this, TQT_SLOT( updateConnectionState( ConnectionContainer * ) ) );
 
     connectionsTable->setCurrentCell( row, 0 );
 
-    connectionsTable->verticalHeader()->setLabel( row, *invalidConnection, TQString::null );
+    connectionsTable->verticalHeader()->setLabel( row, *invalidConnection, TQString() );
 
     if ( sender )
 	se->setSenderEx( sender );
@@ -175,20 +175,20 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject
 
 void ConnectionDialog::updateConnectionState( ConnectionContainer *c )
 {
-    c->repaint();
+    c->tqrepaint();
     if ( c->isValid() )
 	connectionsTable->verticalHeader()->setLabel( c->row(),
-						      *validConnection, TQString::null );
+						      *validConnection, TQString() );
     else
 	connectionsTable->verticalHeader()->setLabel( c->row(),
-						      *invalidConnection, TQString::null );
+						      *invalidConnection, TQString() );
 }
 
 
 void ConnectionDialog::okClicked()
 {
     TQValueList<MetaDataBase::Connection> oldConnections =
-	MetaDataBase::connections( MainWindow::self->formWindow() );
+	MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) );
     TQPtrList<Command> newConnectionCmds;
     TQPtrList<Command> oldConnectionCmds;
     for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) {
@@ -215,7 +215,7 @@ void ConnectionDialog::okClicked()
 
 
     TQValueList<MetaDataBase::Connection> conns =
-	MetaDataBase::connections( MainWindow::self->formWindow() );
+	MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) );
     for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	  it != conns.end(); ++it ) {
 	RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Signal/Slot "
diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp
index 895b35ee..efb2406a 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/kdevdesigner/designer/connectionitems.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -49,11 +49,11 @@ static const char* const ignore_slots[] = {
     "update()",
     "update(int,int,int,int)",
     "update(const TQRect&)",
-    "repaint()",
-    "repaint(bool)",
-    "repaint(int,int,int,int,bool)",
-    "repaint(const TQRect&,bool)",
-    "repaint(const TQRegion&,bool)",
+    "tqrepaint()",
+    "tqrepaint(bool)",
+    "tqrepaint(int,int,int,int,bool)",
+    "tqrepaint(const TQRect&,bool)",
+    "tqrepaint(const TQRegion&,bool)",
     "show()",
     "hide()",
     "iconify()",
@@ -170,7 +170,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg,
 	p->setFont( f );
     }
 
-    p->drawText( x + 2, 0, w - x - 4, h, alignment(), currentText() );
+    p->drawText( x + 2, 0, w - x - 4, h, tqalignment(), currentText() );
     p->setFont( oldf );
 }
 
@@ -183,14 +183,14 @@ void ConnectionItem::setConnection( ConnectionContainer *c )
 
 static void appendChildActions( TQAction *action, TQStringList &lst )
 {
-    TQObjectListIt it( *action->children() );
+    TQObjectListIt it( action->childrenListObject() );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
-	if ( !::qt_cast<TQAction*>(o) )
+	if ( !::tqqt_cast<TQAction*>(o) )
 	    continue;
 	lst << o->name();
-	if ( o->children() && ::qt_cast<TQActionGroup*>(o) )
+	if ( !o->childrenListObject().isEmpty() && ::tqqt_cast<TQActionGroup*>(o) )
 	    appendChildActions( (TQAction*)o, lst );
     }
 }
@@ -203,7 +203,7 @@ static TQStringList flatActions( const TQPtrList<TQAction> &l )
     while ( it.current() ) {
 	TQAction *action = it.current();
 	lst << action->name();
-	if ( action->children() && ::qt_cast<TQActionGroup*>(action) )
+	if ( !action->childrenListObject().isEmpty() && ::tqqt_cast<TQActionGroup*>(action) )
 	    appendChildActions( action, lst );
 	++it;
     }
@@ -220,14 +220,14 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw )
 
     TQPtrDictIterator<TQWidget> it( *formWindow->widgets() );
     while ( it.current() ) {
-	if ( lst.find( it.current()->name() ) != lst.end() ) {
+	if ( lst.tqfind( it.current()->name() ) != lst.end() ) {
 	    ++it;
 	    continue;
 	}
 	if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) &&
-	     !::qt_cast<QLayoutWidget*>(it.current()) &&
-	     !::qt_cast<Spacer*>(it.current()) &&
-	     !::qt_cast<SizeHandle*>(it.current()) &&
+	     !::tqqt_cast<TQLayoutWidget*>(it.current()) &&
+	     !::tqqt_cast<Spacer*>(it.current()) &&
+	     !::tqqt_cast<SizeHandle*>(it.current()) &&
 	     qstrcmp( it.current()->name(), "central widget" ) != 0 ) {
 	    lst << it.current()->name();
 	}
@@ -277,14 +277,14 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw )
 
     TQPtrDictIterator<TQWidget> it( *formWindow->widgets() );
     while ( it.current() ) {
-	if ( lst.find( it.current()->name() ) != lst.end() ) {
+	if ( lst.tqfind( it.current()->name() ) != lst.end() ) {
 	    ++it;
 	    continue;
 	}
 	if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) &&
-	     !::qt_cast<QLayoutWidget*>(it.current()) &&
-	     !::qt_cast<Spacer*>(it.current()) &&
-	     !::qt_cast<SizeHandle*>(it.current()) &&
+	     !::tqqt_cast<TQLayoutWidget*>(it.current()) &&
+	     !::tqqt_cast<Spacer*>(it.current()) &&
+	     !::tqqt_cast<SizeHandle*>(it.current()) &&
 	     qstrcmp( it.current()->name(), "central widget" ) != 0 ) {
 	    lst << it.current()->name();
 	}
@@ -338,7 +338,7 @@ SignalItem::SignalItem( TQTable *table, FormWindow *fw )
 
 void SignalItem::senderChanged( TQObject *sender )
 {
-    TQStrList sigs = sender->metaObject()->signalNames( TRUE );
+    TQStrList sigs = sender->tqmetaObject()->signalNames( TRUE );
     sigs.remove( "destroyed()" );
     sigs.remove( "destroyed(TQObject*)" );
     sigs.remove( "accessibilityChanged(int)" );
@@ -346,15 +346,15 @@ void SignalItem::senderChanged( TQObject *sender )
 
     TQStringList lst = TQStringList::fromStrList( sigs );
 
-    if ( ::qt_cast<CustomWidget*>(sender) ) {
+    if ( ::tqqt_cast<CustomWidget*>(sender) ) {
 	MetaDataBase::CustomWidget *w = ( (CustomWidget*)sender )->customWidget();
 	for ( TQValueList<TQCString>::Iterator it = w->lstSignals.begin();
 	      it != w->lstSignals.end(); ++it )
 	    lst << MetaDataBase::normalizeFunction( *it );
     }
 
-    if ( sender == formWindow->mainContainer() ) {
-	TQStringList extra = MetaDataBase::signalList( formWindow );
+    if ( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(formWindow->mainContainer()) ) {
+	TQStringList extra = MetaDataBase::signalList( TQT_TQOBJECT(formWindow) );
 	if ( !extra.isEmpty() )
 	    lst += extra;
     }
@@ -406,9 +406,9 @@ void SlotItem::signalChanged( const TQString &signal )
 
 bool SlotItem::ignoreSlot( const char* slot ) const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( qstrcmp( slot, "update()" ) == 0 &&
-	 ::qt_cast<TQDataBrowser*>(lastReceiver) )
+	 ::tqqt_cast<TQDataBrowser*>(lastReceiver) )
 	return FALSE;
 #endif
 
@@ -417,14 +417,14 @@ bool SlotItem::ignoreSlot( const char* slot ) const
 	    return TRUE;
     }
 
-    if ( !formWindow->isMainContainer( (TQWidget*)lastReceiver ) ) {
+    if ( !formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) {
 	if ( qstrcmp( slot, "close()" ) == 0  )
 	    return TRUE;
     }
 
     if ( qstrcmp( slot, "setFocus()" ) == 0  )
 	if ( lastReceiver->isWidgetType() &&
-	     ( (TQWidget*)lastReceiver )->focusPolicy() == TQWidget::NoFocus )
+	     ( (TQWidget*)lastReceiver )->focusPolicy() == TQ_NoFocus )
 	    return TRUE;
 
     return FALSE;
@@ -441,27 +441,27 @@ void SlotItem::updateSlotList()
     }
 
     TQString signal = MetaDataBase::normalizeFunction( lastSignal );
-    int n = lastReceiver->metaObject()->numSlots( TRUE );
+    int n = lastReceiver->tqmetaObject()->numSlots( TRUE );
     TQStringList slts;
 
     for( int i = 0; i < n; ++i ) {
 	// accept only public slots. For the form window, also accept protected slots
-	const QMetaData* md = lastReceiver->metaObject()->slot( i, TRUE );
-	if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->access == QMetaData::Public) ||
-	       (formWindow->isMainContainer( (TQWidget*)lastReceiver ) &&
-		lastReceiver->metaObject()->slot(i, TRUE)->access ==
-		QMetaData::Protected) ) &&
-	     !ignoreSlot( md->name ) &&
-	     checkConnectArgs( signal.latin1(), lastReceiver, md->name ) )
-	    if ( lst.find( md->name ) == lst.end() )
-		lst << MetaDataBase::normalizeFunction( md->name );
+	const TQMetaData* md = lastReceiver->tqmetaObject()->slot( i, TRUE );
+	if ( ( (lastReceiver->tqmetaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
+	       (formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) &&
+		lastReceiver->tqmetaObject()->slot(i, TRUE)->tqt_mo_access ==
+		TQMetaData::Protected) ) &&
+	     !ignoreSlot( md->tqt_mo_ci_name ) &&
+	     checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) )
+	    if ( lst.tqfind( md->tqt_mo_ci_name ) == lst.end() )
+		lst << MetaDataBase::normalizeFunction( md->tqt_mo_ci_name );
     }
 
     LanguageInterface *iface =
 	MetaDataBase::languageInterface( formWindow->project()->language() );
     if ( !iface || iface->supports( LanguageInterface::ConnectionsToCustomSlots ) ) {
-	if ( formWindow->isMainContainer( (TQWidget*)lastReceiver ) ) {
-	    TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( formWindow );
+	if ( formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) {
+	    TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( TQT_TQOBJECT(formWindow) );
 	    if ( !moreSlots.isEmpty() ) {
 		for ( TQValueList<MetaDataBase::Function>::Iterator it = moreSlots.begin();
 		      it != moreSlots.end(); ++it ) {
@@ -470,7 +470,7 @@ void SlotItem::updateSlotList()
 			continue;
 		    s = MetaDataBase::normalizeFunction( s );
 		    if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) {
-			if ( lst.find( (*it).function ) == lst.end() )
+			if ( lst.tqfind( (*it).function ) == lst.end() )
 			    lst << s;
 		    }
 		}
@@ -478,7 +478,7 @@ void SlotItem::updateSlotList()
 	}
     }
 
-    if ( ::qt_cast<CustomWidget*>(lastReceiver) ) {
+    if ( ::tqqt_cast<CustomWidget*>(lastReceiver) ) {
 	MetaDataBase::CustomWidget *w = ( (CustomWidget*)lastReceiver )->customWidget();
 	for ( TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.begin();
 	      it != w->lstSlots.end(); ++it ) {
@@ -487,7 +487,7 @@ void SlotItem::updateSlotList()
 		continue;
 	    s = MetaDataBase::normalizeFunction( s );
 	    if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) {
-		if ( lst.find( (*it).function ) == lst.end() )
+		if ( lst.tqfind( (*it).function ) == lst.end() )
 		    lst << s;
 	    }
 	}
diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h
index 2af42b6b..39045ba6 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/kdevdesigner/designer/connectionitems.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -39,9 +39,10 @@ class ConnectionContainer;
 
 
 class ConnectionItem : public TQObject,
-		       public QComboTableItem
+		       public TQComboTableItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ConnectionItem( TQTable *table, FormWindow *fw );
@@ -77,6 +78,7 @@ private:
 class SenderItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SenderItem( TQTable *table, FormWindow *fw );
@@ -96,6 +98,7 @@ private slots:
 class ReceiverItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ReceiverItem( TQTable *table, FormWindow *fw );
@@ -115,6 +118,7 @@ private slots:
 class SignalItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SignalItem( TQTable *table, FormWindow *fw );
@@ -132,6 +136,7 @@ signals:
 class SlotItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SlotItem( TQTable *table, FormWindow *fw );
@@ -157,14 +162,15 @@ private:
 
 // ------------------------------------------------------------------
 
-class ConnectionContainer : public QObject
+class ConnectionContainer : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2,
+    ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2,
 			 ReceiverItem *i3, SlotItem *i4, int r )
-	: TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ),
+	: TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ),
 	  re( i3 ), sl( i4 ), rw ( r ) {
 	      i1->setConnection( this );
 	      i2->setConnection( this );
@@ -177,7 +183,7 @@ public:
     }
 
     bool isModified() const { return mod; }
-    void setModified( bool b ) { mod = b; repaint(); }
+    void setModified( bool b ) { mod = b; tqrepaint(); }
     bool isValid() const {
 	return se->currentText()[0] != '<' &&
 		si->currentText()[0] != '<' &&
@@ -185,7 +191,7 @@ public:
 		sl->currentText()[0] != '<';
     }
 
-    void repaint() {
+    void tqrepaint() {
 	se->table()->updateCell( se->row(), se->col() );
 	si->table()->updateCell( si->row(), si->col() );
 	re->table()->updateCell( re->row(), re->col() );
diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp
index 3cfdb057..ce1cabb7 100644
--- a/kdevdesigner/designer/connectiontable.cpp
+++ b/kdevdesigner/designer/connectiontable.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -28,8 +28,8 @@
 
 #include <klocale.h>
 
-ConnectionTable::ConnectionTable( TQWidget *parent, const char *name )
-    : TQTable( 0, 4, parent, name )
+ConnectionTable::ConnectionTable( TQWidget *tqparent, const char *name )
+    : TQTable( 0, 4, tqparent, name )
 {
     setSorting( TRUE );
     setShowGrid( FALSE );
diff --git a/kdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h
index 4db4bf51..d3b28900 100644
--- a/kdevdesigner/designer/connectiontable.h
+++ b/kdevdesigner/designer/connectiontable.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,12 +29,13 @@
 
 #include <tqtable.h>
 
-class ConnectionTable : public QTable
+class ConnectionTable : public TQTable
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ConnectionTable( TQWidget *parent, const char *name );
+    ConnectionTable( TQWidget *tqparent, const char *name );
 
     void sortColumn( int col, bool ascending, bool wholeRows );
 
diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui
index 761873cc..255a9301 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/kdevdesigner/designer/createtemplate.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CreateTemplate</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <string>Enter the name of the new template</string>
             </property>
         </widget>
-        <widget class="QListBox" row="1" column="1" rowspan="2" colspan="1">
+        <widget class="TQListBox" row="1" column="1" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>listClass</cstring>
             </property>
@@ -86,7 +86,7 @@
                 <string>Enter the name of the class which should be used as the template's base class</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -110,14 +110,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCreate</cstring>
                     </property>
@@ -131,7 +131,7 @@
                         <string>Creates the new template</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -144,7 +144,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -188,7 +188,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index 4d0e301a..7ba5dd29 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CustomWidgetEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>boxWidgets</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <string>The list of all custom widgets known to Qt Designer.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>buttonNewWidget</cstring>
             </property>
@@ -78,7 +78,7 @@
                 <string>&lt;b&gt;Create an empty custom widget and add it to the list.&lt;/b&gt;&lt;p&gt;New custom widgets have a default name and header file, which must both be changed to appropriate values.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>buttonDeleteWidget</cstring>
             </property>
@@ -92,7 +92,7 @@
                 <string>&lt;b&gt;Delete the selected custom widget.&lt;/b&gt;&lt;p&gt;You can only delete widgets that are not used in any open form.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -106,7 +106,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -127,14 +127,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -160,14 +160,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>buttonLoad</cstring>
             </property>
@@ -182,7 +182,7 @@
 &lt;p&gt;Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>buttonSave</cstring>
             </property>
@@ -196,14 +196,14 @@
                 <string>&lt;b&gt;Save Descriptions&lt;/b&gt;&lt;p&gt;Saves all the descriptions of the shown custom widgets to a file which can then be used to import the custom widgets elsewhere.</string>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="2" rowspan="5" colspan="1">
+        <widget class="TQTabWidget" row="0" column="2" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>TabWidget1</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>Change the properties of the selected custom widget.</string>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget2</cstring>
                 </property>
@@ -220,7 +220,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout4</cstring>
                         </property>
@@ -234,7 +234,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>previewPixmap</cstring>
                                 </property>
@@ -242,11 +242,11 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonChoosePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -264,7 +264,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout5</cstring>
                         </property>
@@ -289,11 +289,11 @@
                                     <string>&lt;b&gt;Change the header file's name for the selected custom widget.&lt;/b&gt;&lt;p&gt;The header file will be included by forms using the widget.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonChooseHeader</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -309,7 +309,7 @@
                                     <string>Look for the header file using a file dialog.</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox">
+                            <widget class="TQComboBox">
                                 <item>
                                     <property name="text">
                                         <string>Global</string>
@@ -343,7 +343,7 @@
                             <string>&lt;b&gt;Enter the classname for the selected custom widget.&lt;/b&gt;&lt;p&gt;A class of that name must be defined in the header file.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>Label11</cstring>
                         </property>
@@ -354,7 +354,7 @@
                             <cstring>editHeader</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>Label10</cstring>
                         </property>
@@ -365,7 +365,7 @@
                             <cstring>editClass</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>Label2</cstring>
                         </property>
@@ -373,7 +373,7 @@
                             <string>Pixmap:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>Label7</cstring>
                         </property>
@@ -384,7 +384,7 @@
                             <cstring>spinWidth</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -395,7 +395,7 @@
                             <cstring>sizeHor</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="4" column="2">
+                    <widget class="TQComboBox" row="4" column="2">
                         <item>
                             <property name="text">
                                 <string>Fixed</string>
@@ -433,10 +433,10 @@
                             <string>Vertical Sizepolicy</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>Choose the Vertical size policy</string>
+                            <string>Choose theQt::Vertical size policy</string>
                         </property>
                     </widget>
-                    <widget class="QSpinBox" row="3" column="1">
+                    <widget class="TQSpinBox" row="3" column="1">
                         <property name="name">
                             <cstring>spinWidth</cstring>
                         </property>
@@ -456,7 +456,7 @@
                             <string>&lt;b&gt;Set the size hint for the selected widget.&lt;/b&gt;&lt;p&gt;The size hint provides the recommended size for the widget. Enter a sizehint of -1/-1 if no size is recommended.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QSpinBox" row="3" column="2">
+                    <widget class="TQSpinBox" row="3" column="2">
                         <property name="name">
                             <cstring>spinHeight</cstring>
                         </property>
@@ -476,7 +476,7 @@
                             <string>&lt;b&gt;Set the size hint for the selected widget.&lt;/b&gt;&lt;p&gt;The size hint provides the recommended size for the widget. Enter a sizehint of -1/-1 if no size is recommended.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="4" column="1">
+                    <widget class="TQComboBox" row="4" column="1">
                         <item>
                             <property name="text">
                                 <string>Fixed</string>
@@ -527,14 +527,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QCheckBox" row="5" column="1">
+                    <widget class="TQCheckBox" row="5" column="1">
                         <property name="name">
                             <cstring>checkContainer</cstring>
                         </property>
@@ -546,12 +546,12 @@
                         </property>
                         <property name="whatsThis" stdset="0">
                             <string>&lt;p&gt;&lt;b&gt;Container Widget&lt;/b&gt;&lt;/p&gt;
-&lt;p&gt;If this custom widget is able to contain other widgets (children), check this checkbox.&lt;/p&gt;</string>
+&lt;p&gt;If this custom widget is able to contain other widgets (tqchildren), check this checkbox.&lt;/p&gt;</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget3</cstring>
                 </property>
@@ -568,15 +568,15 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QListBox">
+                    <widget class="TQListBox">
                         <property name="name">
                             <cstring>listSignals</cstring>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>The list of all the signals that the selected widget can emit.</string>
+                            <string>The list of all the Q_SIGNALS that the selected widget can emit.</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout40</cstring>
                         </property>
@@ -600,14 +600,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonAddSignal</cstring>
                                 </property>
@@ -624,7 +624,7 @@
                                     <string>&lt;b&gt;Add a new signal for the current custom widget.&lt;/b&gt;&lt;p&gt;An argument list should be provided in the signal's name, and the name must be unique.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRemoveSignal</cstring>
                                 </property>
@@ -643,7 +643,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout38</cstring>
                         </property>
@@ -657,7 +657,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel1</cstring>
                                 </property>
@@ -683,7 +683,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget4</cstring>
                 </property>
@@ -700,7 +700,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+                    <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
                         <column>
                             <property name="text">
                                 <string>Slot</string>
@@ -733,10 +733,10 @@
                             <bool>true</bool>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>The list of all the custom widget's slots.</string>
+                            <string>The list of all the custom widget's Q_SLOTS.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
@@ -758,7 +758,7 @@
                             <string>&lt;b&gt;Change the name of the selected slot.&lt;/b&gt;&lt;p&gt;An argument list should be provided in the signal's name, and the name must be unique.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="2">
+                    <widget class="TQLabel" row="2" column="2">
                         <property name="name">
                             <cstring>TextLabel3</cstring>
                         </property>
@@ -769,7 +769,7 @@
                             <cstring>comboAccess</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="2" column="3">
+                    <widget class="TQComboBox" row="2" column="3">
                         <item>
                             <property name="text">
                                 <string>public</string>
@@ -787,10 +787,10 @@
                             <string>Change slot access</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>&lt;b&gt;Change the slot's access policy.&lt;/b&gt;&lt;p&gt;You can only connect to the widget's public slots.&lt;/p&gt;</string>
+                            <string>&lt;b&gt;Change the slot's access policy.&lt;/b&gt;&lt;p&gt;You can only connect to the widget's public Q_SLOTS.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>Layout7</cstring>
                         </property>
@@ -814,14 +814,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonAddSlot</cstring>
                                 </property>
@@ -838,7 +838,7 @@
                                     <string>&lt;b&gt;Add a new slot to the current custom widget.&lt;/b&gt;&lt;p&gt;An argument list should be provided in the signal's name, and the name must be unique.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRemoveSlot</cstring>
                                 </property>
@@ -859,7 +859,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget5</cstring>
                 </property>
@@ -876,7 +876,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>Layout7_2</cstring>
                         </property>
@@ -900,14 +900,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonAddProperty</cstring>
                                 </property>
@@ -924,7 +924,7 @@
                                     <string>&lt;b&gt;Add a new property to the current custom widget.&lt;/b&gt;&lt;p&gt;The properties must be implemented in the class using Qt's property system.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRemoveProperty</cstring>
                                 </property>
@@ -943,7 +943,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QComboBox" row="2" column="3">
+                    <widget class="TQComboBox" row="2" column="3">
                         <item>
                             <property name="text">
                                 <string>String</string>
@@ -1029,7 +1029,7 @@
                             <string>&lt;b&gt;Select the type of the property.&lt;/b&gt;&lt;p&gt;The property must be implemented in the class using Qt's property system.&lt;/p&gt;&lt;p&gt;You can use integer types to support enumeration properties in the property editor.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+                    <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
                         <column>
                             <property name="text">
                                 <string>Property</string>
@@ -1076,7 +1076,7 @@
                             <string>&lt;b&gt;Enter a name for the property.&lt;/b&gt;&lt;p&gt;The properties must be implemented in the class using Qt's property system.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
@@ -1087,7 +1087,7 @@
                             <cstring>editProperty</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="2">
+                    <widget class="TQLabel" row="2" column="2">
                         <property name="name">
                             <cstring>TextLabel3_2</cstring>
                         </property>
@@ -1106,15 +1106,15 @@
 <connections>
     <connection>
         <sender>boxWidgets</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentWidgetChanged(QListBoxItem*)</slot>
+        <slot>currentWidgetChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>boxWidgets</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentWidgetChanged(QListBoxItem*)</slot>
+        <slot>currentWidgetChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>buttonNewWidget</sender>
@@ -1178,15 +1178,15 @@
     </connection>
     <connection>
         <sender>listSignals</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSignalChanged(QListBoxItem*)</slot>
+        <slot>currentSignalChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>listSignals</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSignalChanged(QListBoxItem*)</slot>
+        <slot>currentSignalChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>buttonRemoveSignal</sender>
@@ -1202,15 +1202,15 @@
     </connection>
     <connection>
         <sender>listSlots</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSlotChanged(QListViewItem*)</slot>
+        <slot>currentSlotChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>listSlots</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSlotChanged(QListViewItem*)</slot>
+        <slot>currentSlotChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonRemoveSlot</sender>
@@ -1232,15 +1232,15 @@
     </connection>
     <connection>
         <sender>listProperties</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentPropertyChanged(QListViewItem*)</slot>
+        <slot>currentPropertyChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>listProperties</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentPropertyChanged(QListViewItem*)</slot>
+        <slot>currentPropertyChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonRemoveProperty</sender>
@@ -1316,10 +1316,10 @@
     <slot access="protected" language="C++" returnType="void">chooseHeader()</slot>
     <slot access="protected" language="C++" returnType="void">classNameChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">closeClicked()</slot>
-    <slot access="protected" language="C++" returnType="void">currentPropertyChanged( QListViewItem * )</slot>
-    <slot access="protected" language="C++" returnType="void">currentSignalChanged( QListBoxItem * )</slot>
-    <slot access="protected" language="C++" returnType="void">currentSlotChanged( QListViewItem * )</slot>
-    <slot access="protected" language="C++" returnType="void">currentWidgetChanged( QListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentPropertyChanged( TQListViewItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentSignalChanged( TQListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentSlotChanged( TQListViewItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentWidgetChanged( TQListBoxItem * )</slot>
     <slot access="protected" language="C++" returnType="void">deleteWidgetClicked()</slot>
     <slot access="protected" language="C++" returnType="void">headerFileChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">heightChanged( int )</slot>
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index 99fa00fd..3a1437ab 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -55,8 +55,8 @@
 
 #include <klocale.h>
 
-CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
-    : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )
+CustomWidgetEditor::CustomWidgetEditor( TQWidget *tqparent, MainWindow *mw )
+    : CustomWidgetEditorBase( tqparent, 0, TRUE ), mainWindow( mw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     checkTimer = new TQTimer( this );
@@ -73,10 +73,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
     sizeVer->setEnabled( FALSE );
     checkContainer->setEnabled( FALSE );
     localGlobalCombo->setEnabled( FALSE );
-    editClass->setValidator( new AsciiValidator( TQString(":"), editClass ) );
-    editSignal->setValidator( new AsciiValidator( TRUE, editSignal ) );
-    editSlot->setValidator( new AsciiValidator( TRUE, editSignal ) );
-    editProperty->setValidator( new AsciiValidator( editSignal ) );
+    editClass->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(editClass) ) );
+    editSignal->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) );
+    editSlot->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) );
+    editProperty->setValidator( new AsciiValidator( TQT_TQOBJECT(editSignal) ) );
     editSignal->setEnabled( FALSE );
     buttonRemoveSignal->setEnabled( FALSE );
 
@@ -199,8 +199,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i )
 	previewPixmap->setPixmap( *w->pixmap );
     else
 	previewPixmap->setText( "" );
-    spinWidth->setValue( w->sizeHint.width() );
-    spinHeight->setValue( w->sizeHint.height() );
+    spinWidth->setValue( w->tqsizeHint.width() );
+    spinHeight->setValue( w->tqsizeHint.height() );
     sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) );
     sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) );
     checkContainer->setChecked( w->isContainer );
@@ -222,7 +222,7 @@ void CustomWidgetEditor::addWidgetClicked()
 	TQMessageBox::information( this, i18n( "Adding Custom Widget" ),
 				  i18n( "Custom widget names must be unique.\n"
 				      "A custom widget called '%1' already exists, so it is not possible "
-				      "to add another widget with this name." ).arg( s ) );
+				      "to add another widget with this name." ).tqarg( s ) );
 	return;
     }
 
@@ -310,7 +310,7 @@ void CustomWidgetEditor::heightChanged( int h )
     if ( !i || !w )
 	return;
 
-    w->sizeHint.setHeight( h );
+    w->tqsizeHint.setHeight( h );
     updateCustomWidgetSizes();
 }
 
@@ -354,7 +354,7 @@ void CustomWidgetEditor::widthChanged( int wid )
     if ( !i || !w )
 	return;
 
-    w->sizeHint.setWidth( wid );
+    w->tqsizeHint.setWidth( wid );
     updateCustomWidgetSizes();
 }
 
@@ -363,7 +363,7 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i )
     if ( !i )
 	return 0;
 
-    TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.find( i );
+    TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.tqfind( i );
     if ( it == customWidgets.end() )
 	return 0;
     return *it;
@@ -376,7 +376,7 @@ void CustomWidgetEditor::chooseHeader()
     if ( !i || !w )
 	return;
 
-    TQString h = KFileDialog::getOpenFileName( TQString::null, i18n( "*.h *.h++ *.hxx *.hh|Header Files" ), this );
+    TQString h = KFileDialog::getOpenFileName( TQString(), i18n( "*.h *.h++ *.hxx *.hh|Header Files" ), this );
     if ( h.isEmpty() )
 	return;
     editHeader->setText( h );
@@ -397,10 +397,10 @@ void CustomWidgetEditor::checkWidgetName()
 	TQMessageBox::information( this, i18n( "Renaming Custom Widget" ),
 				  i18n( "Custom widget names must be unique.\n"
 				      "A custom widget called '%1' already exists, so it is not possible "
-				      "to rename this widget with this name." ).arg( s ) );
+				      "to rename this widget with this name." ).tqarg( s ) );
 	if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) {
 	    boxWidgets->setCurrentItem( i );
-	    qApp->processEvents();
+	    tqApp->processEvents();
 	}
 	editClass->setText( w->className );
 	classNameChanged( w->className );
@@ -461,7 +461,7 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s )
     if ( !w || listSignals->currentItem() == -1 )
 	return;
 
-    TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() );
+    TQValueList<TQCString>::Iterator it = w->lstSignals.tqfind( listSignals->currentText().latin1() );
     if ( it != w->lstSignals.end() )
 	w->lstSignals.remove( it );
     listSignals->blockSignals( TRUE );
@@ -479,7 +479,7 @@ void CustomWidgetEditor::slotAccessChanged( const TQString &s )
     MetaDataBase::Function slot;
     slot.function = listSlots->currentItem()->text( 0 );
     slot.access = listSlots->currentItem()->text( 1 );
-    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot );
+    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot );
     if ( it != w->lstSlots.end() )
 	w->lstSlots.remove( it );
     listSlots->currentItem()->setText( 1, s );
@@ -498,7 +498,7 @@ void CustomWidgetEditor::slotNameChanged( const TQString &s )
     slot.function = listSlots->currentItem()->text( 0 );
     slot.access = listSlots->currentItem()->text( 1 );
     slot.type = "slot";
-    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot );
+    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot );
     if ( it != w->lstSlots.end() )
 	w->lstSlots.remove( it );
     listSlots->currentItem()->setText( 0, s );
@@ -574,7 +574,7 @@ void CustomWidgetEditor::propertyTypeChanged( const TQString &s )
     MetaDataBase::Property property;
     property.property = listProperties->currentItem()->text( 0 );
     property.type = listProperties->currentItem()->text( 1 );
-    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property );
+    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property );
     if ( it != w->lstProperties.end() )
 	w->lstProperties.remove( it );
     listProperties->currentItem()->setText( 1, s );
@@ -592,7 +592,7 @@ void CustomWidgetEditor::propertyNameChanged( const TQString &s )
     MetaDataBase::Property property;
     property.property = listProperties->currentItem()->text( 0 );
     property.type = listProperties->currentItem()->text( 1 );
-    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property );
+    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property );
     if ( it != w->lstProperties.end() )
 	w->lstProperties.remove( it );
     listProperties->currentItem()->setText( 0, s );
@@ -671,17 +671,17 @@ static TQString makeIndent2( int indent )
 static TQString entitize2( const TQString &s )
 {
     TQString s2 = s;
-    s2 = s2.replace( "\"", "&quot;" );
-    s2 = s2.replace( "&", "&amp;" );
-    s2 = s2.replace( ">", "&gt;" );
-    s2 = s2.replace( "<", "&lt;" );
-    s2 = s2.replace( "'", "&apos;" );
+    s2 = s2.tqreplace( "\"", "&quot;" );
+    s2 = s2.tqreplace( "&", "&amp;" );
+    s2 = s2.tqreplace( ">", "&gt;" );
+    s2 = s2.tqreplace( "<", "&lt;" );
+    s2 = s2.tqreplace( "'", "&apos;" );
     return s2;
 }
 
 void CustomWidgetEditor::saveDescription()
 {
-    TQString fn = KFileDialog::getSaveFileName( TQString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
+    TQString fn = KFileDialog::getSaveFileName( TQString(), i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
     if ( fn.isEmpty() )
 	return;
 
@@ -710,8 +710,8 @@ void CustomWidgetEditor::saveDescription()
 	   << "\">" << w->includeFile << "</header>" << endl;
 	ts << makeIndent2( indent ) << "<sizehint>" << endl;
 	indent++;
-	ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
-	ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
+	ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
+	ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
 	indent--;
 	ts << makeIndent2( indent ) << "</sizehint>" << endl;
 	ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -749,7 +749,7 @@ void CustomWidgetEditor::saveDescription()
 
 void CustomWidgetEditor::loadDescription()
 {
-    TQString fn = KFileDialog::getOpenFileName( TQString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
+    TQString fn = KFileDialog::getOpenFileName( TQString(), i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
     if ( fn.isEmpty() )
 	return;
 
@@ -802,7 +802,7 @@ void CustomWidgetEditor::horDataChanged( int a )
 	CustomWidget *cw = (CustomWidget*)o;
 	if ( cw->realClassName() == boxWidgets->currentText() ) {
 	    if ( cw->sizePolicy() == osp )
-		cw->setSizePolicy( w->sizePolicy );
+		cw->tqsetSizePolicy( w->sizePolicy );
 	}
     }
 }
@@ -823,7 +823,7 @@ void CustomWidgetEditor::verDataChanged( int a )
 	CustomWidget *cw = (CustomWidget*)o;
 	if ( cw->realClassName() == boxWidgets->currentText() ) {
 	    if ( cw->sizePolicy() == osp )
-		cw->setSizePolicy( w->sizePolicy );
+		cw->tqsetSizePolicy( w->sizePolicy );
 	}
     }
 }
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h
index 8386ae2f..aca6bb8d 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.h
+++ b/kdevdesigner/designer/customwidgeteditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,9 +40,10 @@ class MainWindow;
 class CustomWidgetEditor : public CustomWidgetEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomWidgetEditor( TQWidget *parent , MainWindow *mw);
+    CustomWidgetEditor( TQWidget *tqparent , MainWindow *mw);
 
 protected slots:
     void addWidgetClicked();
diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp
index c9621604..b426e9dd 100644
--- a/kdevdesigner/designer/database.cpp
+++ b/kdevdesigner/designer/database.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,7 +30,7 @@
 #include "database2.h"
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #if defined(DESIGNER)
 #include "formwindow.h"
@@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport()
 {
     con = 0;
     frm = 0;
-    parent = 0;
+    tqparent = 0;
 }
 
 void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o,
@@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 {
     tbl = table;
     dbControls = databaseControls;
-    parent = o;
+    tqparent = o;
 
     if ( connection != "(default)" )
 	con = TQSqlDatabase::database( connection );
@@ -62,19 +62,19 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 	con = TQSqlDatabase::database();
     frm = new TQSqlForm( o, table );
     for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
-	TQObject *chld = parent->child( it.key(), "TQWidget" );
+	TQObject *chld = tqparent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING );
 	if ( !chld )
 	    continue;
 	frm->insert( (TQWidget*)chld, *it );
     }
 }
 
-QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name )
-    : TQDataBrowser( parent, name )
+TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name )
+    : TQDataBrowser( tqparent, name )
 {
 }
 
-bool QDesignerDataBrowser::event( TQEvent* e )
+bool TQDesignerDataBrowser::event( TQEvent* e )
 {
     bool b = TQDataBrowser::event( e );
 #if defined(DESIGNER)
@@ -96,12 +96,12 @@ bool QDesignerDataBrowser::event( TQEvent* e )
     return b;
 }
 
-QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name )
-    : TQDataView( parent, name )
+TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name )
+    : TQDataView( tqparent, name )
 {
 }
 
-bool QDesignerDataView::event( TQEvent* e )
+bool TQDesignerDataView::event( TQEvent* e )
 {
     bool b = TQDataView::event( e );
 #if defined(DESIGNER)
diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h
index 0de0ad3f..8ff9bec3 100644
--- a/kdevdesigner/designer/database.h
+++ b/kdevdesigner/designer/database.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 
 #include "tqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqdataview.h>
 #include <tqdatabrowser.h>
 #include <tqsqlcursor.h>
@@ -52,27 +52,29 @@ protected:
     TQSqlForm* frm;
     TQString tbl;
     TQMap<TQString, TQString> dbControls;
-    TQObject *parent;
+    TQObject *tqparent;
 
 };
 
-class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
+class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDataBrowser( TQWidget *parent, const char *name );
+    TQDesignerDataBrowser( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
 };
 
-class QDesignerDataView : public TQDataView, public DatabaseSupport
+class TQDesignerDataView : public TQDataView, public DatabaseSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDataView( TQWidget *parent, const char *name );
+    TQDesignerDataView( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui
index 19a0e216..1ad273a9 100644
--- a/kdevdesigner/designer/dbconnection.ui
+++ b/kdevdesigner/designer/dbconnection.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DatabaseConnectionWidget</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <cstring>editDatabase</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -72,7 +72,7 @@
                 <cstring>editUsername</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>TextLabel4_2</cstring>
             </property>
@@ -83,7 +83,7 @@
                 <cstring>editPassword</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -102,7 +102,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -113,7 +113,7 @@
                 <cstring>editHostname</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>comboDriver</cstring>
             </property>
@@ -124,7 +124,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -143,7 +143,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -181,7 +181,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QSpinBox" row="6" column="1">
+        <widget class="TQSpinBox" row="6" column="1">
             <property name="name">
                 <cstring>editPort</cstring>
             </property>
@@ -214,9 +214,9 @@
     <tabstop>editHostname</tabstop>
     <tabstop>editPort</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui
index 64b77387..abf8beed 100644
--- a/kdevdesigner/designer/dbconnectioneditor.ui
+++ b/kdevdesigner/designer/dbconnectioneditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DatabaseConnectionEditorBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -79,14 +79,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>grp</cstring>
             </property>
@@ -113,7 +113,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp
index fb5697ca..d326df8a 100644
--- a/kdevdesigner/designer/dbconnectionimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,9 @@
 #include <tqlayout.h>
 #include <tqsqldatabase.h>
 
-DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
+DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent,
 						    const char* name, bool modal, WFlags fl )
-    : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection )
+    : DatabaseConnectionEditorBase( tqparent, name, modal, fl ), conn( connection )
 {
     connectionWidget = new DatabaseConnectionWidget( grp );
     grpLayout->addWidget( connectionWidget, 0, 0 );
@@ -50,7 +50,7 @@ DatabaseConnectionEditor::~DatabaseConnectionEditor()
 
 void DatabaseConnectionEditor::accept()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     conn->setUsername( connectionWidget->editUsername->text() );
     conn->setPassword( connectionWidget->editPassword->text() );
     conn->setHostname( connectionWidget->editHostname->text() );
@@ -61,7 +61,7 @@ void DatabaseConnectionEditor::accept()
 void DatabaseConnectionEditor::init()
 {
     connectionWidget->editName->setEnabled( FALSE );
-    connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) );
+    connectionWidget->editName->setValidator( new AsciiValidator( TQT_TQOBJECT(connectionWidget->editName) ) );
     connectionWidget->editName->setText( conn->name() );
     connectionWidget->comboDriver->setEnabled( FALSE );
     connectionWidget->comboDriver->lineEdit()->setText( conn->driver() );
diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h
index b6055109..a8bc0f68 100644
--- a/kdevdesigner/designer/dbconnectionimpl.h
+++ b/kdevdesigner/designer/dbconnectionimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,9 +36,10 @@ class TQGridLayout;
 class DatabaseConnectionEditor : public DatabaseConnectionEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0,
+    DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent = 0,
 			       const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~DatabaseConnectionEditor();
 
diff --git a/kdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui
index 847c00b1..e373b2be 100644
--- a/kdevdesigner/designer/dbconnections.ui
+++ b/kdevdesigner/designer/dbconnections.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DatabaseConnectionBase</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>buttonNew</cstring>
             </property>
@@ -61,12 +61,12 @@
                 <string>&amp;New Connection</string>
             </property>
         </widget>
-        <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>listConnections</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>buttonDelete</cstring>
             </property>
@@ -74,7 +74,7 @@
                 <string>&amp;Delete Connection</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -109,14 +109,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonClose</cstring>
                     </property>
@@ -142,14 +142,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="2" rowspan="3" colspan="1">
+        <widget class="TQGroupBox" row="0" column="2" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>grp</cstring>
             </property>
@@ -176,7 +176,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="2">
+        <widget class="TQLayoutWidget" row="3" column="2">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -209,14 +209,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonConnect</cstring>
                     </property>
@@ -237,7 +237,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -256,7 +256,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp
index 1d3c1a0b..00fb13eb 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -45,25 +45,25 @@
 static bool blockChanges = FALSE;
 
 /*
- *  Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the
+ *  Constructs a DatabaseConnectionsEditor which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent,  const char* name, bool modal, WFlags fl )
-    : DatabaseConnectionBase( parent, name, modal, fl ), project( pro )
+DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
+    : DatabaseConnectionBase( tqparent, name, modal, fl ), project( pro )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     connectionWidget = new DatabaseConnectionWidget( grp );
     grpLayout->addWidget( connectionWidget, 0, 0 );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> lst = project->databaseConnections();
     for ( DatabaseConnection *conn = lst.first(); conn; conn = lst.next() )
 	listConnections->insertItem( conn->name() );
     connectionWidget->comboDriver->insertStringList( TQSqlDatabase::drivers() );
 #endif
-    connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) );
+    connectionWidget->editName->setValidator( new AsciiValidator(  TQT_TQOBJECT(connectionWidget->editName) ) );
     enableAll( FALSE );
 }
 
@@ -107,7 +107,7 @@ void DatabaseConnectionsEditor::newConnection()
 
 void DatabaseConnectionsEditor::doConnect()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( listConnections->currentItem() == -1 ||
 	 !listConnections->item( listConnections->currentItem() )->isSelected() ) { // new connection
 	// ### do error checking for duplicated connection names
@@ -149,7 +149,7 @@ void DatabaseConnectionsEditor::doConnect()
 
 void DatabaseConnectionsEditor::currentConnectionChanged( const TQString &s )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = project->databaseConnection( s );
     blockChanges = TRUE;
     enableAll( conn != 0 );
diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h
index 220e24a8..a12f4dce 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.h
+++ b/kdevdesigner/designer/dbconnectionsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,10 @@ class Project;
 class DatabaseConnectionsEditor : public DatabaseConnectionBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0,
+    DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent = 0,
 			       const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~DatabaseConnectionsEditor();
 
diff --git a/kdevdesigner/designer/defs.cpp b/kdevdesigner/designer/defs.cpp
index de1c7dfc..c1aa36de 100644
--- a/kdevdesigner/designer/defs.cpp
+++ b/kdevdesigner/designer/defs.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/defs.h b/kdevdesigner/designer/defs.h
index e79d676c..45143b81 100644
--- a/kdevdesigner/designer/defs.h
+++ b/kdevdesigner/designer/defs.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h
index 883a7a7c..fa840181 100644
--- a/kdevdesigner/designer/designer_pch.h
+++ b/kdevdesigner/designer/designer_pch.h
@@ -1,6 +1,6 @@
 /*
  * This is a precompiled header file for use in Xcode / Mac GCC / 
- * GCC >= 3.4 / VC to greatly speed the building of Qt Designer. It may 
+ * GCC >= 3.4 / VC to greatly speed the building of TQt Designer. It may 
  * also be of use to people developing their own project, but it is 
  * probably better to define your own header.  Use of this header is 
  * currently UNSUPPORTED.
@@ -8,7 +8,7 @@
 
 #if defined __cplusplus
 
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 #include <tqaction.h>
 #include <tqapplication.h>
 #include <tqcheckbox.h>
diff --git a/kdevdesigner/designer/designeraction.cpp b/kdevdesigner/designer/designeraction.cpp
index 129bf3e5..66ecb438 100644
--- a/kdevdesigner/designer/designeraction.cpp
+++ b/kdevdesigner/designer/designeraction.cpp
@@ -35,14 +35,4 @@ void DesignerAction::setEnabled( bool e )
     emit actionEnabled(e);
 }
 
-#if QT_VERSION < 0x030300
-void DesignerAction::activate()
-{
-    if ( isToggleAction() ) {
-        return;
-    }
-    emit activated();
-}
-#endif
-
 #include "designeraction.moc"
diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h
index 0efd69dd..b49874f0 100644
--- a/kdevdesigner/designer/designeraction.h
+++ b/kdevdesigner/designer/designeraction.h
@@ -22,29 +22,27 @@
 
 #include <tqaction.h>
 
-class DesignerAction : public QAction
+class DesignerAction : public TQAction
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    DesignerAction(TQObject *parent = 0, const char *name = 0)
-            :TQAction(parent, name) {}
-    DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 )
-            :TQAction(menuText, accel, parent, name) {}
-    DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 )
-            :TQAction(icon, menuText, accel, parent, name) {}
-    DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) 
-            :TQAction(text, icon, menuText, accel, parent, name, toggle) {}
-    DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE )
-            :TQAction(text, menuText, accel, parent, name, toggle) {}
-    DesignerAction ( TQObject * parent, const char * name, bool toggle ) 
-            :TQAction(parent, name, toggle) {}
+    DesignerAction(TQObject *tqparent = 0, const char *name = 0)
+            :TQAction(tqparent, name) {}
+    DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 )
+            :TQAction(menuText, accel, tqparent, name) {}
+    DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 )
+            :TQAction(icon, menuText, accel, tqparent, name) {}
+    DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE ) 
+            :TQAction(text, icon, menuText, accel, tqparent, name, toggle) {}
+    DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE )
+            :TQAction(text, menuText, accel, tqparent, name, toggle) {}
+    DesignerAction ( TQObject * tqparent, const char * name, bool toggle ) 
+            :TQAction(tqparent, name, toggle) {}
     ~DesignerAction();
     
     virtual void setEnabled(bool e);
     virtual void setDisabled(bool d);
-#if QT_VERSION < 0x030300
-    virtual void activate();
-#endif
 
 signals:
     void actionEnabled(bool e);
diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp
index 3a0016c4..ebe10a70 100644
--- a/kdevdesigner/designer/designerapp.cpp
+++ b/kdevdesigner/designer/designerapp.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,8 +36,8 @@
 #include <tqsettings.h>
 #include <tqsplashscreen.h>
 
-#ifdef Q_WS_WIN
-#include <qt_windows.h>
+#ifdef TQ_WS_WIN
+#include <tqt_windows.h>
 #include <process.h>
 #endif
 
@@ -48,19 +48,19 @@ void set_splash_status( const TQString &txt )
     if ( !splash )
 	return;
     TQString splashText = "Licensed to "
-			 + TQString::fromLatin1( QT_PRODUCT_LICENSEE ) + "\n"
+			 + TQString::tqfromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
 			 + txt;
-    splash->message( splashText, Qt::AlignRight|Qt::AlignTop );
+    splash->message( splashText, TQt::AlignRight|TQt::AlignTop );
 }
 
 DesignerApplication::DesignerApplication( int &argc, char **argv )
     : TQApplication( argc, argv )
 {
-#if defined(Q_WS_WIN)
-    if ( winVersion() & Qt::WV_NT_based )
-	DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE");
+#if defined(TQ_WS_WIN)
+    if ( winVersion() & TQt::WV_NT_based )
+	DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"TQT_DESIGNER_OPEN_FILE");
     else
-	DESIGNER_OPENFILE = RegisterWindowMessageA("QT_DESIGNER_OPEN_FILE");
+	DESIGNER_OPENFILE = RegisterWindowMessageA("TQT_DESIGNER_OPEN_FILE");
 #endif
 }
 
@@ -99,24 +99,24 @@ static TQString *old_settings_key = 0;
 TQString DesignerApplication::settingsKey()
 {
     if ( !settings_key )
-	settings_key = new TQString( "/Qt Designer/" +
-				    TQString::number( (QT_VERSION >> 16) & 0xff ) +
-	                            "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+	settings_key = new TQString( "/TQt Designer/" +
+				    TQString::number( (TQT_VERSION >> 16) & 0xff ) +
+	                            "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     return *settings_key;
 }
 
 TQString DesignerApplication::oldSettingsKey()
 {
     if ( !old_settings_key ) {
-	int majorVer = (QT_VERSION >> 16) & 0xff;
-	int minorVer = (QT_VERSION >> 8) & 0xff;
+	int majorVer = (TQT_VERSION >> 16) & 0xff;
+	int minorVer = (TQT_VERSION >> 8) & 0xff;
 
 	// If minorVer is 0 (e.g. 4.0) then we don't want to read the
 	// old settings, too much might have changed.
 	if ( !minorVer == 0 )
 	    minorVer--;
 
-	old_settings_key = new TQString( "/Qt Designer/" +
+	old_settings_key = new TQString( "/TQt Designer/" +
 				    TQString::number( majorVer ) +
 	                            "." + TQString::number( minorVer ) + "/" );
     }
@@ -131,7 +131,7 @@ void DesignerApplication::setSettingsKey( const TQString &key )
 	*settings_key = key;
 }
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
 bool DesignerApplication::winEventFilter( MSG *msg )
 {
     if ( msg->message == DESIGNER_OPENFILE ) {
diff --git a/kdevdesigner/designer/designerapp.h b/kdevdesigner/designer/designerapp.h
index 66201471..b3c62a11 100644
--- a/kdevdesigner/designer/designerapp.h
+++ b/kdevdesigner/designer/designerapp.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,7 +31,7 @@ class TQSplashScreen;
 
 #include <tqapplication.h>
 
-class DesignerApplication : public QApplication
+class DesignerApplication : public TQApplication
 {
 public:
     const char *className() const { return "DesignerApplication"; }
@@ -48,7 +48,7 @@ public:
 protected:
     TQDateTime lastMod;
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
     bool winEventFilter( MSG *msg );
     uint DESIGNER_OPENFILE;
 #endif
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index dca4bbd8..5c7fa739 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,21 +51,21 @@ DesignerInterfaceImpl::DesignerInterfaceImpl( MainWindow *mw )
 {
 }
 
-QRESULT DesignerInterfaceImpl::queryInterface( const QUuid &uuid, QUnknownInterface** iface )
+TQRESULT DesignerInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface )
 {
     *iface = 0;
 
-    if ( uuid == IID_QUnknown )
-	*iface = (QUnknownInterface*)this;
-    else if ( uuid == IID_QComponentInformation )
-	*iface = (QComponentInformationInterface*)this;
+    if ( uuid == IID_TQUnknown )
+	*iface = (TQUnknownInterface*)this;
+    else if ( uuid == IID_TQComponentInformation )
+	*iface = (TQComponentInformationInterface*)this;
     else if ( uuid == IID_Designer )
 	*iface = (DesignerInterface*)this;
     else
-	return QE_NOINTERFACE;
+	return TQE_NOINTERFACE;
 
     (*iface)->addRef();
-    return QS_OK;
+    return TQS_OK;
 }
 
 
@@ -146,7 +146,7 @@ bool DesignerInterfaceImpl::singleProjectMode() const
 void DesignerInterfaceImpl::showError( TQWidget *widget,
 				       int line, const TQString &message )
 {
-    mainWindow->showErrorMessage( widget, line, message );
+    mainWindow->showErrorMessage( TQT_TQOBJECT(widget), line, message );
 }
 
 void DesignerInterfaceImpl::runFinished()
@@ -156,12 +156,12 @@ void DesignerInterfaceImpl::runFinished()
 
 void DesignerInterfaceImpl::showStackFrame( TQWidget *w, int line )
 {
-    mainWindow->showStackFrame( w, line );
+    mainWindow->showStackFrame( TQT_TQOBJECT(w), line );
 }
 
 void DesignerInterfaceImpl::showDebugStep( TQWidget *w, int line )
 {
-    mainWindow->showDebugStep( w, line );
+    mainWindow->showDebugStep( TQT_TQOBJECT(w), line );
 }
 
 void DesignerInterfaceImpl::runProjectPrecondition()
@@ -190,7 +190,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const
     while ( it.current() ) {
 	TQObject *obj = it.current();
 	++it;
-	TQWidget *par = ::qt_cast<FormWindow*>(obj->parent());
+	TQWidget *par = ::tqqt_cast<FormWindow*>(obj->tqparent());
 	if ( !obj->isWidgetType() || !par )
 	    continue;
 
@@ -208,7 +208,7 @@ TQString DesignerProjectImpl::formFileName( const TQString &form ) const
 	if ( TQString( forms.current()->formName() ) == form )
 	    return forms.current()->fileName();
     }
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DesignerProjectImpl::formNames() const
@@ -252,7 +252,7 @@ void DesignerProjectImpl::setProjectName( const TQString & )
 
 TQString DesignerProjectImpl::databaseFile() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 void DesignerProjectImpl::setDatabaseFile( const TQString & )
@@ -267,7 +267,7 @@ void DesignerProjectImpl::setupDatabases() const
 TQPtrList<DesignerDatabase> DesignerProjectImpl::databaseConnections() const
 {
     TQPtrList<DesignerDatabase> lst;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> conns = project->databaseConnections();
     for ( DatabaseConnection *d = conns.first(); d; d = conns.next() )
 	lst.append( d->iFace() );
@@ -304,9 +304,9 @@ void DesignerProjectImpl::setCustomSetting( const TQString &key, const TQString
 
 TQString DesignerProjectImpl::customSetting( const TQString &key ) const
 {
-    if ( key == "QTSCRIPT_PACKAGES" ) {
-	TQString s = getenv( "QTSCRIPT_PACKAGES" );
-	TQString s2 = project->customSetting( "QUICK_PACKAGES" );
+    if ( key == "TQTSCRIPT_PACKAGES" ) {
+	TQString s = getenv( "TQTSCRIPT_PACKAGES" );
+	TQString s2 = project->customSetting( "TQUICK_PACKAGES" );
 	if ( !s.isEmpty() && !s2.isEmpty() )
 #if defined(Q_OS_WIN32)
 	    s += ";";
@@ -335,7 +335,7 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps
     for ( TQPtrListIterator<FormFile> forms = project->formFiles();
 	  forms.current(); ++forms ) {
 	if ( forms.current()->formWindow() )
-	    bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( forms.current()->formWindow() ) );
+	    bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( TQT_TQOBJECT(forms.current()->formWindow()) ) );
     }
 }
 
@@ -360,7 +360,7 @@ void DesignerProjectImpl::clearAllBreakpoints() const
     for ( TQPtrListIterator<FormFile> forms = project->formFiles();
 	  forms.current(); ++forms ) {
 	if ( forms.current()->formWindow() )
-	    MetaDataBase::setBreakPoints( forms.current()->formWindow(), empty );
+	    MetaDataBase::setBreakPoints( TQT_TQOBJECT(forms.current()->formWindow()), empty );
 	MainWindow::self->resetBreakPoints();
     }
 }
@@ -426,7 +426,7 @@ bool DesignerProjectImpl::isGenericObject( TQObject *o ) const
 
 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DesignerDatabaseImpl::DesignerDatabaseImpl( DatabaseConnection *d )
     : db( d )
 {
@@ -535,7 +535,7 @@ void DesignerPixmapCollectionImpl::addPixmap( const TQPixmap &p, const TQString
     pixCollection->addPixmap( pix, force );
     FormWindow *fw = MainWindow::self->formWindow();
     if ( fw )
-	MetaDataBase::setPixmapKey( fw, p.serialNumber(), name );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), p.serialNumber(), name );
 }
 
 TQPixmap DesignerPixmapCollectionImpl::pixmap( const TQString &name ) const
@@ -582,11 +582,11 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * )
 {
 }
 
-TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name )
+TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *tqparent, const char *name )
 {
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, name );
     formWindow->insertWidget( w, TRUE );
-    formWindow->killAccels( formWindow->mainContainer() );
+    formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) );
     return w;
 }
 
@@ -631,41 +631,41 @@ void DesignerFormWindowImpl::checkAccels()
 {
 }
 
-void DesignerFormWindowImpl::layoutH()
+void DesignerFormWindowImpl::tqlayoutH()
 {
-    formWindow->layoutHorizontal();
+    formWindow->tqlayoutHorizontal();
 }
 
-void DesignerFormWindowImpl::layoutV()
+void DesignerFormWindowImpl::tqlayoutV()
 {
 }
 
-void DesignerFormWindowImpl::layoutHSplit()
+void DesignerFormWindowImpl::tqlayoutHSplit()
 {
 }
 
-void DesignerFormWindowImpl::layoutVSplit()
+void DesignerFormWindowImpl::tqlayoutVSplit()
 {
 }
 
-void DesignerFormWindowImpl::layoutG()
+void DesignerFormWindowImpl::tqlayoutG()
 {
-    formWindow->layoutGrid();
+    formWindow->tqlayoutGrid();
 }
 
-void DesignerFormWindowImpl::layoutHContainer( TQWidget* w )
+void DesignerFormWindowImpl::tqlayoutHContainer( TQWidget* w )
 {
-    formWindow->layoutHorizontalContainer( w );
+    formWindow->tqlayoutHorizontalContainer( w );
 }
 
-void DesignerFormWindowImpl::layoutVContainer( TQWidget* w )
+void DesignerFormWindowImpl::tqlayoutVContainer( TQWidget* w )
 {
-    formWindow->layoutVerticalContainer( w );
+    formWindow->tqlayoutVerticalContainer( w );
 }
 
-void DesignerFormWindowImpl::layoutGContainer( TQWidget* w )
+void DesignerFormWindowImpl::tqlayoutGContainer( TQWidget* w )
 {
-    formWindow->layoutGridContainer( w );
+    formWindow->tqlayoutGridContainer( w );
 }
 
 void DesignerFormWindowImpl::breakLayout()
@@ -674,7 +674,7 @@ void DesignerFormWindowImpl::breakLayout()
 
 void DesignerFormWindowImpl::selectWidget( TQWidget * w )
 {
-    formWindow->selectWidget( w, TRUE );
+    formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
 }
 
 void DesignerFormWindowImpl::selectAll()
@@ -717,9 +717,9 @@ TQPtrList<TQAction> DesignerFormWindowImpl::actionList() const
 }
 
 TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
-					       TQObject* parent, const char* name, bool toggle )
+					       TQObject* tqparent, const char* name, bool toggle )
 {
-    QDesignerAction *a = new QDesignerAction( parent );
+    TQDesignerAction *a = new TQDesignerAction( tqparent );
     a->setName( name );
     a->setText( text );
     if ( !icon.isNull() && !icon.pixmap().isNull() )
@@ -732,7 +732,7 @@ TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIc
 
 void DesignerFormWindowImpl::addAction( TQAction *a )
 {
-    if ( formWindow->actionList().findRef( a ) != -1 )
+    if ( formWindow->actionList().tqfindRef( a ) != -1 )
 	return;
     formWindow->actionList().append( a );
     MetaDataBase::addEntry( a );
@@ -755,14 +755,14 @@ void DesignerFormWindowImpl::preview() const
 
 void DesignerFormWindowImpl::addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot )
 {
-    MetaDataBase::addConnection( formWindow, sender, signal, receiver, slot );
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow), sender, signal, receiver, slot );
 }
 
 void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQString &specifier,
 					  const TQString &access, const TQString &type,
 					  const TQString &language, const TQString &returnType )
 {
-    MetaDataBase::addFunction( formWindow, function, specifier, access, type, language, returnType );
+    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow), function, specifier, access, type, language, returnType );
     formWindow->mainWindow()->functionsChanged();
 }
 
@@ -770,8 +770,8 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr
 
 void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value )
 {
-    int id = o->metaObject()->findProperty( property, TRUE );
-    const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
+    int id = o->tqmetaObject()->tqfindProperty( property, TRUE );
+    const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
     if ( p && p->isValid() )
 	o->setProperty( property, value );
     else
@@ -780,8 +780,8 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con
 
 TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const
 {
-    int id = o->metaObject()->findProperty( prop, TRUE );
-    const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
+    int id = o->tqmetaObject()->tqfindProperty( prop, TRUE );
+    const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
     if ( p && p->isValid() )
 	return o->property( prop );
     return MetaDataBase::fakeProperty( o, prop );
@@ -804,7 +804,7 @@ void DesignerFormWindowImpl::setColumnFields( TQObject *o, const TQMap<TQString,
 
 TQStringList DesignerFormWindowImpl::implementationIncludes() const
 {
-    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQStringList lst;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -825,7 +825,7 @@ TQStringList DesignerFormWindowImpl::implementationIncludes() const
 
 TQStringList DesignerFormWindowImpl::declarationIncludes() const
 {
-    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQStringList lst;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -846,7 +846,7 @@ TQStringList DesignerFormWindowImpl::declarationIncludes() const
 
 void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst )
 {
-    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Include> includes;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -882,13 +882,13 @@ void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst
 	    includes << inc;
 	}
     }
-    MetaDataBase::setIncludes( formWindow, includes );
+    MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst )
 {
-    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Include> includes;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -924,29 +924,29 @@ void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst )
 	    includes << inc;
 	}
     }
-    MetaDataBase::setIncludes( formWindow, includes );
+    MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 TQStringList DesignerFormWindowImpl::forwardDeclarations() const
 {
-    return MetaDataBase::forwards( formWindow );
+    return MetaDataBase::forwards( TQT_TQOBJECT(formWindow) );
 }
 
 void DesignerFormWindowImpl::setForwardDeclarations( const TQStringList &lst )
 {
-    MetaDataBase::setForwards( formWindow, lst );
+    MetaDataBase::setForwards( TQT_TQOBJECT(formWindow), lst );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 TQStringList DesignerFormWindowImpl::signalList() const
 {
-    return MetaDataBase::signalList( formWindow );
+    return MetaDataBase::signalList( TQT_TQOBJECT(formWindow) );
 }
 
 void DesignerFormWindowImpl::setSignalList( const TQStringList &lst )
 {
-    MetaDataBase::setSignalList( formWindow, lst );
+    MetaDataBase::setSignalList( TQT_TQOBJECT(formWindow), lst );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
@@ -957,27 +957,27 @@ void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const cha
 
 void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
 
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     PopupMenuEditor *popup = new PopupMenuEditor( formWindow, mw );
     TQString n = name;
-    formWindow->unify( popup, n, TRUE );
+    formWindow->unify(  TQT_TQOBJECT(popup), n, TRUE );
     popup->setName( n );
     MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" );
     if ( !mb ) {
 	mb = new MenuBarEditor( formWindow, mw );
 	mb->setName( "MenuBar" );
-	MetaDataBase::addEntry( mb );
+	MetaDataBase::addEntry( TQT_TQOBJECT(mb) );
     }
     mb->insertItem( text, popup );
-    MetaDataBase::addEntry( popup );
+    MetaDataBase::addEntry( TQT_TQOBJECT(popup) );
 }
 
 void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     if ( !mw->child( 0, "MenuBarEditor" ) )
@@ -990,7 +990,7 @@ void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a )
 
 void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     if ( !mw->child( 0, "MenuBarEditor" ) )
@@ -998,28 +998,28 @@ void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu )
     PopupMenuEditor *popup = (PopupMenuEditor*)mw->child( menu, "PopupMenuEditor" );
     if ( !popup )
 	return;
-    TQAction *a = new QSeparatorAction( 0 );
+    TQAction *a = new TQSeparatorAction( 0 );
     popup->insert( a );
 }
 
 void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &name )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
-    TQToolBar *tb = new QDesignerToolBar( mw );
+    TQToolBar *tb = new TQDesignerToolBar( mw );
     TQString n = name;
-    formWindow->unify( tb, n, TRUE );
+    formWindow->unify(  TQT_TQOBJECT(tb), n, TRUE );
     tb->setName( n );
     mw->addToolBar( tb, text );
 }
 
 void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
-    QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" );
+    TQDesignerToolBar *tb = (TQDesignerToolBar*)mw->child( tbn, "TQDesignerToolBar" );
     if ( !tb )
 	return;
     a->addTo( tb );
@@ -1028,13 +1028,13 @@ void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a
 
 void DesignerFormWindowImpl::addToolBarSeparator( const TQString &tbn )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
-    QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" );
+    TQDesignerToolBar *tb = (TQDesignerToolBar*)mw->child( tbn, "TQDesignerToolBar" );
     if ( !tb )
 	return;
-    TQAction *a = new QSeparatorAction( 0 );
+    TQAction *a = new TQSeparatorAction( 0 );
     a->addTo( tb );
     tb->addAction( a );
 }
diff --git a/kdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h
index 4e14da4e..25b5b896 100644
--- a/kdevdesigner/designer/designerappiface.h
+++ b/kdevdesigner/designer/designerappiface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -63,8 +63,8 @@ public:
     void runProjectPostcondition( TQObjectList *l );
 
 
-    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface** iface );
-    Q_REFCOUNT
+    TQRESULT queryInterface( const TQUuid &uuid, TQUnknownInterface** iface );
+    TQ_REFCOUNT
 
 private:
     MainWindow *mainWindow;
@@ -118,7 +118,7 @@ private:
 
 };
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DesignerDatabaseImpl: public DesignerDatabase
@@ -175,7 +175,7 @@ public:
     void save() const;
     bool isModified() const;
     void insertWidget( TQWidget * );
-    TQWidget *create( const char *className, TQWidget *parent, const char *name );
+    TQWidget *create( const char *className, TQWidget *tqparent, const char *name );
     void removeWidget( TQWidget * );
     TQWidgetList widgets() const;
     void undo();
@@ -186,14 +186,14 @@ public:
     void adjustSize();
     void editConnections();
     void checkAccels();
-    void layoutH();
-    void layoutV();
-    void layoutHSplit();
-    void layoutVSplit();
-    void layoutG();
-    void layoutHContainer( TQWidget* w );
-    void layoutVContainer( TQWidget* w );
-    void layoutGContainer( TQWidget* w );
+    void tqlayoutH();
+    void tqlayoutV();
+    void tqlayoutHSplit();
+    void tqlayoutVSplit();
+    void tqlayoutG();
+    void tqlayoutHContainer( TQWidget* w );
+    void tqlayoutVContainer( TQWidget* w );
+    void tqlayoutGContainer( TQWidget* w );
     void breakLayout();
     void selectWidget( TQWidget * );
     void selectAll();
@@ -205,7 +205,7 @@ public:
     void setCurrentWidget( TQWidget * );
     TQPtrList<TQAction> actionList() const;
     TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
-			   TQObject* parent, const char* name = 0, bool toggle = FALSE );
+			   TQObject* tqparent, const char* name = 0, bool toggle = FALSE );
     void addAction( TQAction * );
     void removeAction( TQAction * );
     void preview() const;
diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui
index 2cecdcb1..91a7fadf 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/kdevdesigner/designer/editfunctions.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>EditFunctionsBase</cstring>
     </property>
@@ -44,7 +44,7 @@
         <bool>true</bool>
     </property>
     <property name="whatsThis" stdset="0">
-        <string>&lt;b&gt;Edit Functions&lt;/b&gt;&lt;p&gt;Add, edit or delete the current form's slots or functions.&lt;/p&gt;&lt;p&gt;Click the &lt;b&gt;Add Function&lt;/b&gt;-button to create a new function; enter a name, choose an access mode and specify if it should be a slot or normal function.&lt;/p&gt;&lt;p&gt;Select an entry from the list and click the &lt;b&gt;Delete Function&lt;/b&gt;-button to remove a function; in case of a slot all connections using this slot will also be removed.&lt;/p&gt;</string>
+        <string>&lt;b&gt;Edit Functions&lt;/b&gt;&lt;p&gt;Add, edit or delete the current form's Q_SLOTS or functions.&lt;/p&gt;&lt;p&gt;Click the &lt;b&gt;Add Function&lt;/b&gt;-button to create a new function; enter a name, choose an access mode and specify if it should be a slot or normal function.&lt;/p&gt;&lt;p&gt;Select an entry from the list and click the &lt;b&gt;Delete Function&lt;/b&gt;-button to remove a function; in case of a slot all connections using this slot will also be removed.&lt;/p&gt;</string>
     </property>
     <vbox>
         <property name="name">
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Function</string>
@@ -150,7 +150,7 @@
                 <string>&lt;b&gt;This form's functions.&lt;/b&gt;&lt;p&gt;Select the function you want to change or delete.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout11</cstring>
             </property>
@@ -161,7 +161,7 @@
                 <property name="margin">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>showOnlySlots</cstring>
                     </property>
@@ -169,13 +169,13 @@
                         <enum>StrongFocus</enum>
                     </property>
                     <property name="text">
-                        <string>Only d&amp;isplay slots</string>
+                        <string>Only d&amp;isplay Q_SLOTS</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Change displaying mode for functions</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Check this button if only the slots should be displayed&lt;/b&gt;&lt;p&gt;Otherwise all functions, i.e. normal C++ functions and slots are displayed.&lt;/p&gt;
+                        <string>&lt;b&gt;Check this button if only the Q_SLOTS should be displayed&lt;/b&gt;&lt;p&gt;Otherwise all functions, i.e. normal C++ functions and Q_SLOTS are displayed.&lt;/p&gt;
 </string>
                     </property>
                 </widget>
@@ -189,14 +189,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addFunction</cstring>
                     </property>
@@ -210,7 +210,7 @@
                         <string>&lt;b&gt;Add a new function.&lt;/b&gt;&lt;p&gt;New functions have a default name and public access.&lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>deleteFunction</cstring>
                     </property>
@@ -226,7 +226,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>boxProperties</cstring>
             </property>
@@ -251,7 +251,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout14</cstring>
                     </property>
@@ -262,7 +262,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout5</cstring>
                             </property>
@@ -276,14 +276,14 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>Label8</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Function:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -309,14 +309,14 @@
                                         <string>&lt;b&gt;Change the name of the selected function.&lt;/b&gt;&lt;p&gt;The name should include the argument list and must be syntactically correct.&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>labelType</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Return type:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -354,14 +354,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout13</cstring>
                             </property>
@@ -372,21 +372,21 @@
                                 <property name="margin">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>Label9_2</cstring>
                                     </property>
                                     <property name="text">
                                         <string>S&amp;pecifier:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>functionSpecifier</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>non virtual</string>
@@ -425,21 +425,21 @@
                                         <string>&lt;b&gt;Change the access policy of the function&lt;/b&gt;&lt;p&gt;All functions are created virtual and should be reimplemented in subclasses.&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Access:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>WordBreak|AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>functionAccess</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>public</string>
@@ -473,21 +473,21 @@
                                         <string>&lt;b&gt;Change the access policy of the function&lt;/b&gt;&lt;p&gt;All functions are created virtual and should be reimplemented in subclasses.&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1_2</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Type:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>functionType</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>slot</string>
@@ -518,7 +518,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -531,7 +531,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -545,7 +545,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -566,14 +566,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -590,7 +590,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -635,45 +635,45 @@
     </connection>
     <connection>
         <sender>functionName</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentTextChanged(const QString&amp;)</slot>
+        <slot>currentTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionListView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>functionListView</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>editType</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentReturnTypeChanged(const QString&amp;)</slot>
+        <slot>currentReturnTypeChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionSpecifier</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentSpecifierChanged(const QString&amp;)</slot>
+        <slot>currentSpecifierChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionAccess</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentAccessChanged(const QString&amp;)</slot>
+        <slot>currentAccessChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionType</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentTypeChanged(const QString&amp;)</slot>
+        <slot>currentTypeChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>showOnlySlots</sender>
@@ -696,19 +696,19 @@
     <tabstop>addFunction</tabstop>
     <tabstop>deleteFunction</tabstop>
 </tabstops>
-<slots>
-    <slot access="protected">currentItemChanged( QListViewItem * )</slot>
-    <slot access="protected">currentSpecifierChanged( const QString &amp; )</slot>
-    <slot access="protected">currentTextChanged( const QString &amp; )</slot>
-    <slot access="protected">currentReturnTypeChanged( const QString &amp; )</slot>
+<Q_SLOTS>
+    <slot access="protected">currentItemChanged( TQListViewItem * )</slot>
+    <slot access="protected">currentSpecifierChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentTextChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentReturnTypeChanged( const TQString &amp; )</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">init()</slot>
-    <slot access="protected">currentAccessChanged( const QString &amp; )</slot>
-    <slot access="protected">currentTypeChanged( const QString &amp; )</slot>
+    <slot access="protected">currentAccessChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentTypeChanged( const TQString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">functionAdd()</slot>
     <slot access="protected">functionRemove()</slot>
     <slot access="protected">displaySlots( bool )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index 44490811..8a91c9f6 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -49,15 +49,15 @@
 
 #include <klocale.h>
 
-EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
-    : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )
+EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots )
+    : EditFunctionsBase( tqparent, 0, TRUE ), formWindow( fw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
     id = 0;
     functList.clear();
 
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( fw );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(fw) );
     for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) {
 	TQListViewItem *i = new TQListViewItem( functionListView );
 
@@ -86,7 +86,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 	id++;
 
 	if ( (*it).type == "slot" ) {
-	    if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).function ).latin1() ) )
+	    if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).function ).latin1() ) )
 		i->setText( 5, i18n( "Yes" ) );
 	    else
 		i->setText( 5, i18n( "No" ) );
@@ -96,7 +96,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     }
 
     boxProperties->setEnabled( FALSE );
-    functionName->setValidator( new AsciiValidator( TRUE, functionName ) );
+    functionName->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(functionName) ) );
 
     if ( functionListView->firstChild() )
 	functionListView->setCurrentItem( functionListView->firstChild() );
@@ -104,7 +104,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     showOnlySlots->setChecked( justSlots );
     lastType = "function";
 
-    // Enable rename for all QListViewItems
+    // Enable rename for all TQListViewItems
     TQListViewItemIterator lvit = functionListView->firstChild();
     for ( ; *lvit; lvit++ )
 	(*lvit)->setRenameEnabled( 0, TRUE );
@@ -116,7 +116,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 		      TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
 
     // Connect signal-relay to TQLineEdit "functionName"
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
+    TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
     TQObject *obj;
     TQObjectListIt itemsLineEditIt( *l );
     while ( (obj = itemsLineEditIt.current()) != 0 ) {
@@ -131,8 +131,8 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 
 void EditFunctions::okClicked()
 {
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow );
-    TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
+    TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() );
     TQPtrList<Command> commands;
     TQValueList<MetaDataBase::Function>::Iterator fit;
     if ( !functionList.isEmpty() ) {
@@ -175,10 +175,10 @@ void EditFunctions::okClicked()
 	    TQString s = function.function;
 	    s = s.simplifyWhiteSpace();
 	    bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9';
-	    bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1;
-	    bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' );
+	    bool noParens = s.tqcontains( '(' ) != 1 || s.tqcontains( ')' ) != 1;
+	    bool illegalSpace = s.tqfind( ' ' ) != -1 && s.tqfind( ' ' ) < s.tqfind( '(' );
 
-	    if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) {
+	    if ( startNum || noParens || illegalSpace || lst.tqfind( function.function ) != -1 ) {
 		invalidFunctions = TRUE;
 		invalidItems.append( (*it) );
 		continue;
@@ -291,7 +291,7 @@ void EditFunctions::functionAdd( const TQString &access, const TQString &type )
 
     if ( i->text( 4 ) == "slot" ) {
 	i->setText( 0, "newSlot()" );
-	if ( MetaDataBase::isSlotUsed( formWindow, "newSlot()" ) )
+	if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), "newSlot()" ) )
 	    i->setText( 5, i18n( "Yes" ) );
 	else
 	    i->setText( 5, i18n( "No" ) );
@@ -398,7 +398,7 @@ void EditFunctions::currentTextChanged( const TQString &txt )
     functionListView->currentItem()->setText( 0, txt );
 
     if ( functionListView->currentItem()->text( 4 ) == "slot" ) {
-	if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) )
+	if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) )
 	    functionListView->currentItem()->setText( 5, i18n( "Yes" ) );
 	else
 	    functionListView->currentItem()->setText( 5, i18n( "No" ) );
@@ -441,7 +441,7 @@ void EditFunctions::currentTypeChanged( const TQString &type )
     lastType = type;
     functionListView->currentItem()->setText( 4, type );
     if ( type == "slot" ) {
-	if ( MetaDataBase::isSlotUsed( formWindow,
+	if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow),
 		MetaDataBase::normalizeFunction( functionListView->currentItem()->text( 0 ).latin1() ).latin1() ) )
 	    functionListView->currentItem()->setText( 5, i18n( "Yes" ) );
 	else
@@ -454,7 +454,7 @@ void EditFunctions::currentTypeChanged( const TQString &type )
 void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV )
 {
     int itemId;
-    TQMap<TQListViewItem*, int>::Iterator fit = functionIds.find( item );
+    TQMap<TQListViewItem*, int>::Iterator fit = functionIds.tqfind( item );
     if ( fit != functionIds.end() )
 	itemId = *fit;
     else
@@ -515,7 +515,7 @@ void EditFunctions::displaySlots( bool justSlots )
 	i->setText( 4, (*it).type );
 
 	if ( (*it).type == "slot" ) {
-	    if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) )
+	    if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) )
 		i->setText( 5, i18n( "Yes" ) );
 	    else
 		i->setText( 5, i18n( "No" ) );
diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h
index 27d1523e..03a59b09 100644
--- a/kdevdesigner/designer/editfunctionsimpl.h
+++ b/kdevdesigner/designer/editfunctionsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,13 +38,14 @@ class TQListViewItem;
 class EditFunctions : public EditFunctionsBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE );
+    EditFunctions( TQWidget *tqparent, FormWindow *fw, bool showOnlySlots = FALSE );
 
     void setCurrentFunction( const TQString &function );
-    void functionAdd( const TQString &access = TQString::null,
-		      const TQString &type = TQString::null  );
+    void functionAdd( const TQString &access = TQString(),
+		      const TQString &type = TQString()  );
     void functionAdd() { functionAdd( "public" ); }
 
 signals:
@@ -77,7 +78,7 @@ private:
 	TQString type;
 	TQString oldType;
 
-	Q_DUMMY_COMPARISON_OPERATOR( FunctItem )
+	TQ_DUMMY_COMPARISON_OPERATOR( FunctItem )
     };
 
     void changeItem( TQListViewItem *item, Attribute a, const TQString &nV );
diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp
index 9f1287e0..864bab7a 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/kdevdesigner/designer/filechooser.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,21 +32,21 @@
 
 #include <kfiledialog.h>
 
-FileChooser::FileChooser( TQWidget *parent, const char *name )
-    : TQWidget( parent, name ), md( File )
+FileChooser::FileChooser( TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name ), md( File )
 {
-    TQHBoxLayout *layout = new TQHBoxLayout( this );
-    layout->setMargin( 0 );
+    TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
+    tqlayout->setMargin( 0 );
 
     lineEdit = new TQLineEdit( this, "filechooser_lineedit" );
-    layout->addWidget( lineEdit );
+    tqlayout->addWidget( lineEdit );
 
     connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
 	     this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) );
 
     button = new TQPushButton( "...", this, "filechooser_button" );
     button->setFixedWidth( button->fontMetrics().width( " ... " ) );
-    layout->addWidget( button );
+    tqlayout->addWidget( button );
 
     connect( button, TQT_SIGNAL( clicked() ),
 	     this, TQT_SLOT( chooseFile() ) );
@@ -78,7 +78,7 @@ void FileChooser::chooseFile()
 {
     TQString fn;
     if ( mode() == File )
-	fn = KFileDialog::getOpenFileName( lineEdit->text(), TQString::null, this );
+	fn = KFileDialog::getOpenFileName( lineEdit->text(), TQString(), this );
     else
 	fn = KFileDialog::getExistingDirectory( lineEdit->text(),this );
 
diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h
index cd511765..8137b031 100644
--- a/kdevdesigner/designer/filechooser.h
+++ b/kdevdesigner/designer/filechooser.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,16 +32,17 @@
 class TQLineEdit;
 class TQPushButton;
 
-class FileChooser : public QWidget
+class FileChooser : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     Q_ENUMS( Mode )
-    Q_PROPERTY( Mode mode READ mode WRITE setMode )
-    Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+    TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+    TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
-    FileChooser( TQWidget *parent = 0, const char *name = 0);
+    FileChooser( TQWidget *tqparent = 0, const char *name = 0);
 
     enum Mode { File, Directory };
 
diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui
index 3923d1ef..39a4c74a 100644
--- a/kdevdesigner/designer/finddialog.ui
+++ b/kdevdesigner/designer/finddialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FindDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <cstring>comboFind</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>comboFind</cstring>
                     </property>
@@ -93,7 +93,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -117,14 +117,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -135,7 +135,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -145,7 +145,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="1">
+        <widget class="TQButtonGroup" row="1" column="1">
             <property name="name">
                 <cstring>ButtonGroup2</cstring>
             </property>
@@ -162,7 +162,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioForward</cstring>
                     </property>
@@ -173,7 +173,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioBackward</cstring>
                     </property>
@@ -183,7 +183,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -200,7 +200,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkWords</cstring>
                     </property>
@@ -208,7 +208,7 @@
                         <string>&amp;Whole words only</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkCase</cstring>
                     </property>
@@ -216,7 +216,7 @@
                         <string>Case &amp;sensitive</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBegin</cstring>
                     </property>
@@ -253,7 +253,7 @@
     <tabstop>PushButton2</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
+    <include location="global" impldecl="in implementation">tqlineedit.h</include>
     <include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
     <include location="local" impldecl="in implementation">finddialog.ui.h</include>
 </includes>
@@ -262,13 +262,13 @@
 </forwards>
 <variables>
     <variable>EditorInterface *editor;</variable>
-    <variable>QObject *formWindow;</variable>
+    <variable>TQObject *formWindow;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>doFind()</slot>
-    <slot>setEditor( EditorInterface * e, QObject * fw )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>setEditor( EditorInterface * e, TQObject * fw )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/finddialog.ui.h b/kdevdesigner/designer/finddialog.ui.h
index 0abde994..063d9156 100644
--- a/kdevdesigner/designer/finddialog.ui.h
+++ b/kdevdesigner/designer/finddialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -41,7 +41,7 @@ void FindDialog::doFind()
     if ( !editor )
 	return;
     
-    if ( !editor->find( comboFind->currentText(), checkCase->isChecked(),
+    if ( !editor->tqfind( comboFind->currentText(), checkCase->isChecked(),
 	checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) )
 	checkBegin->setChecked( TRUE );
     else
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index e65ed706..1e9c489d 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -50,17 +50,17 @@
 static TQString make_func_pretty( const TQString &s )
 {
     TQString res = s;
-    if ( res.find( ")" ) - res.find( "(" ) == 1 )
+    if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 )
 	return res;
-    res.replace( "(", "( " );
-    res.replace( ")", " )" );
-    res.replace( "&", " &" );
-    res.replace( "*", " *" );
-    res.replace( ",", ", " );
-    res.replace( ":", " : " );
+    res.tqreplace( "(", "( " );
+    res.tqreplace( ")", " )" );
+    res.tqreplace( "&", " &" );
+    res.tqreplace( "*", " *" );
+    res.tqreplace( ",", ", " );
+    res.tqreplace( ":", " : " );
     res = res.simplifyWhiteSpace();
-    res.replace( " : : ", "::" );
-    res.replace( ">>", "> >" );
+    res.tqreplace( " : : ", "::" );
+    res.tqreplace( ">>", "> >" );
     return res;
 }
 
@@ -77,13 +77,13 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name
     if ( !temp )
 	checkFileName( FALSE );
     
-    connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* )));
+    connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewtqStatus(FormFile* )));
 }
 
 FormFile::~FormFile()
 {
     pro->removeFormFile( this );
-    if ( formWindow() )
+    if ( TQT_TQOBJECT(formWindow()) )
 	formWindow()->setFormFile( 0 );
 }
 
@@ -111,7 +111,7 @@ void FormFile::setFileName( const TQString &fn )
 	return;
     if ( fn.isEmpty() ) {
 	fileNameTemp = TRUE;
-	if ( filename.find( "unnamed" ) != 0 )
+	if ( filename.tqfind( "unnamed" ) != 0 )
 	    filename = createUnnamedFileName();
 	return;
     } else {
@@ -170,7 +170,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
     if ( ed )
 	ed->save();
 
-    if ( formWindow() && isModified( WFormWindow ) ) {
+    if ( TQT_TQOBJECT(formWindow()) && isModified( WFormWindow ) ) {
 	if ( withMsgBox ) {
 	    if ( !formWindow()->checkCustomWidgets() )
 		return FALSE;
@@ -192,7 +192,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 		    f2.writeBlock( data );
 		} else {
 		    TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
-                                  i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
+                                  i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) );
 		}
 	    }
 	}
@@ -213,21 +213,21 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 		    TQCString data( f.size() );
 		    f.readBlock( data.data(), f.size() );
 		    f2.writeBlock( data );
-		} else if ( qApp->type() != TQApplication::Tty ) {
+		} else if ( tqApp->type() != TQApplication::Tty ) {
             TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
-                                  i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
+                                  i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) );
 		}
 	    }
 	}
     }
 
-    if ( formWindow() ) {
+    if ( TQT_TQOBJECT(formWindow()) ) {
 	Resource resource( MainWindow::self );
 	resource.setWidget( formWindow() );
 	bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow );
 	if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) {
 	    if ( MainWindow::self )
-		MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) );
+		MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").tqarg( formCodeOnly ? codeFile(): filename ) );
 	    if ( formCodeOnly )
 		return FALSE;
 	    return saveAs();
@@ -247,23 +247,23 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 bool FormFile::saveAs( bool ignoreModified )
 {
     TQString f = pro->makeAbsolute( fileName() );
-    if ( fileNameTemp && formWindow() ) {
+    if ( fileNameTemp && TQT_TQOBJECT(formWindow()) ) {
 	f = TQString( formWindow()->name() ).lower();
-	f.replace( "::", "_" );
+	f.tqreplace( "::", "_" );
 	f = pro->makeAbsolute( f + ".ui" );
     }
     bool saved = FALSE;
     if ( ignoreModified ) {
-	TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
+	TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
 	f = TQFileInfo( f ).fileName();
 	f.prepend( dir + "/" );
     }
     TQString fn;
     while ( !saved ) {
 	fn = KFileDialog::getSaveFileName( f,
-					   i18n( "*.ui|Qt User-Interface Files" ) + "\n" +
+					   i18n( "*.ui|TQt User-Interface Files" ) + "\n" +
 					   i18n( "*|All Files" ), MainWindow::self, /*0,*/
-					   i18n( "Save Form '%1' As").arg( formName() )/*,
+					   i18n( "Save Form '%1' As").tqarg( formName() )/*,
 					   MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ );
 	if ( fn.isEmpty() )
 	    return FALSE;
@@ -293,8 +293,8 @@ bool FormFile::saveAs( bool ignoreModified )
     }
     pro->setModified( TRUE );
     timeStamp.setFileName( pro->makeAbsolute( codeFile() ) );
-    if ( ed && formWindow() )
-	ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) );
+    if ( ed && TQT_TQOBJECT(formWindow()) )
+	ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) );
     setModified( TRUE );
     if ( pro->isDummy() )
 	fw->mainWindow()->addRecentlyOpenedFile( fn );
@@ -307,7 +307,7 @@ bool FormFile::close()
 	editor()->save();
 	editor()->close();
     }
-    if ( formWindow() )
+    if ( TQT_TQOBJECT(formWindow()) )
 	return formWindow()->close();
     return TRUE;
 }
@@ -326,7 +326,7 @@ bool FormFile::closeEvent()
 	editor()->save();
 
     switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ),
-				   i18n( "Save changes to form '%1'?" ).arg( filename ),
+				   i18n( "Save changes to form '%1'?" ).tqarg( filename ),
 				   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
     case 0: // save
 	if ( !save() )
@@ -372,7 +372,7 @@ bool FormFile::isModified( int who )
 
 bool FormFile::isFormWindowModified() const
 {
-    if ( !formWindow()  || !formWindow()->commandHistory() )
+    if ( !TQT_TQOBJECT(formWindow())  || !formWindow()->commandHistory() )
 	return FALSE;
     return formWindow()->commandHistory()->isModified();
 }
@@ -389,7 +389,7 @@ void FormFile::setFormWindowModified( bool m )
     bool b = isFormWindowModified();
     if ( m == b )
 	return;
-    if ( !formWindow() || !formWindow()->commandHistory() )
+    if ( !TQT_TQOBJECT(formWindow()) || !formWindow()->commandHistory() )
 	return;
     formWindow()->commandHistory()->setModified( m );
     emit somethingChanged( this );
@@ -411,13 +411,13 @@ void FormFile::showFormWindow()
 {
     if ( !MainWindow::self )
 	return;
-    if ( formWindow() ) {
+    if ( TQT_TQOBJECT(formWindow()) ) {
 	if ( ( formWindow()->hasFocus() ||
-	      MainWindow::self->qWorkspace()->activeWindow() == formWindow() ) &&
-	     MainWindow::self->propertyeditor()->formWindow() != formWindow() ) {
-	    MainWindow::self->propertyeditor()->setWidget( formWindow()->currentWidget(), formWindow() );
+	      TQT_BASE_OBJECT(MainWindow::self->qWorkspace()->activeWindow()) == TQT_BASE_OBJECT(formWindow()) ) &&
+	     TQT_BASE_OBJECT(MainWindow::self->propertyeditor()->formWindow()) != TQT_BASE_OBJECT(formWindow()) ) {
+	    MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(formWindow()->currentWidget()), formWindow() );
 	    MainWindow::self->objectHierarchy()->setFormWindow( formWindow(),
-								formWindow()->currentWidget() );
+								TQT_TQOBJECT(formWindow()->currentWidget()) );
 	}
 	formWindow()->setFocus();
 	return;
@@ -493,7 +493,7 @@ TQString FormFile::codeComment() const
     "** ui.h extension file, included from the uic-generated form implementation.\n"
     "**\n"
     "** If you want to add, delete, or rename functions or slots, use\n"
-    "** Qt Designer to update this file, preserving your code.\n"
+    "** TQt Designer to update this file, preserving your code.\n"
     "**\n"
     "** You should not define a constructor or destructor in this file.\n"
     "** Instead, write your code in functions called init() and destroy().\n"
@@ -519,14 +519,14 @@ void FormFile::setCodeFileState( UihState s )
 
 void FormFile::createFormCode()
 {
-    if ( !formWindow() )
+    if ( !TQT_TQOBJECT(formWindow()) )
 	return;
     LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
     if ( !iface )
 	return;
     if ( pro->isCpp() )
 	cod = codeComment();
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow() );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) );
     for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) {
 	cod += (!cod.isEmpty() ? "\n\n" : "") +
 	       iface->createFunctionStart( formWindow()->name(), make_func_pretty((*it).function),
@@ -573,14 +573,14 @@ void FormFile::setCodeEdited( bool b )
 
 void FormFile::parseCode( const TQString &txt, bool allowModify )
 {
-    if ( !formWindow() )
+    if ( !TQT_TQOBJECT(formWindow()) )
 	return;
     LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
     if ( !iface )
 	return;
     TQValueList<LanguageInterface::Function> functions;
     TQValueList<MetaDataBase::Function> newFunctions, oldFunctions;
-    oldFunctions = MetaDataBase::functionList( formWindow() );
+    oldFunctions = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) );
     iface->functions( txt, &functions );
     TQMap<TQString, TQString> funcs;
     for ( TQValueList<LanguageInterface::Function>::Iterator it = functions.begin();
@@ -634,7 +634,7 @@ void FormFile::parseCode( const TQString &txt, bool allowModify )
     if ( allowModify && oldFunctions.count() > 0 )
 	setFormWindowModified( TRUE );
 
-    MetaDataBase::setFunctionList( formWindow(), newFunctions );
+    MetaDataBase::setFunctionList( TQT_TQOBJECT(formWindow()), newFunctions );
 }
 
 void FormFile::syncCode()
@@ -651,9 +651,9 @@ void FormFile::checkTimeStamp()
 	return;
     timeStamp.update();
     if ( codeEdited ) {
-	if ( TQMessageBox::information( MainWindow::self, i18n( "Qt Designer" ),
-				       i18n( "File '%1' has been changed outside Qt Designer.\n"
-					   "Do you want to reload it?" ).arg( timeStamp.fileName() ),
+	if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
+				       i18n( "File '%1' has been changed outside TQt Designer.\n"
+					   "Do you want to reload it?" ).tqarg( timeStamp.fileName() ),
 				       i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
 	    TQFile f( timeStamp.fileName() );
 	    if ( f.open( IO_ReadOnly ) ) {
@@ -704,7 +704,7 @@ void FormFile::addFunctionCode( MetaDataBase::Function function )
     if ( !hasFunc ) {
 	if ( !codeEdited && !timeStamp.isUpToDate() )
 	    loadCode();
-	MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( formWindow() );
+	MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( TQT_TQOBJECT(formWindow()) );
 	TQString cn;
 	if ( mi.classNameChanged )
 	    cn = mi.className;
@@ -745,7 +745,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function )
 	    int line = 0;
 	    int start = 0;
 	    while ( line < (*fit).start - 1 ) {
-		start = sourceCode.find( '\n', start );
+		start = sourceCode.tqfind( '\n', start );
 		if ( start == -1 )
 		    return;
 		start++;
@@ -755,7 +755,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function )
 	        return;
 	    int end = start;
 	    while ( line < (*fit).end + 1 ) {
-		end = sourceCode.find( '\n', end );
+		end = sourceCode.tqfind( '\n', end );
 		if ( end == -1 ) {
 		    if ( line <= (*fit).end )
 			end = sourceCode.length() - 1;
@@ -777,7 +777,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new
 {
     if ( !cod.isEmpty() ) {
 	TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" );
-	int i = cod.find( funcStart + oldName );
+	int i = cod.tqfind( funcStart + oldName );
 	if ( i != -1 ) {
 	    cod.remove( i + funcStart.length(), oldName.length() );
 	    cod.insert( i + funcStart.length(), newName );
@@ -791,7 +791,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o
 	TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName;
 	TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName;
 
-	int i = cod.find( oldFunct );
+	int i = cod.tqfind( oldFunct );
 	if ( i != -1 ) {
 	    cod.remove( i, oldFunct.length() );
 	    cod.insert( i, newFunct );
@@ -802,7 +802,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o
 TQString FormFile::formName() const
 {
     FormFile* that = (FormFile*) this;
-    if ( formWindow() ) {
+    if ( TQT_TQOBJECT(formWindow()) ) {
 	that->cachedFormName = formWindow()->name();
 	return cachedFormName;
     }
@@ -816,7 +816,7 @@ TQString FormFile::formName() const
 	while ( !ts.eof() ) {
 	    line = ts.readLine();
 	    if ( !className.isEmpty() ) {
-		int end = line.find( "</class>" );
+		int end = line.tqfind( "</class>" );
 		if ( end == -1 ) {
 		    className += line;
 		} else {
@@ -826,8 +826,8 @@ TQString FormFile::formName() const
 		continue;
 	    }
 	    int start;
-	    if ( ( start = line.find( "<class>" ) ) != -1 ) {
-		int end = line.find( "</class>" );
+	    if ( ( start = line.tqfind( "<class>" ) ) != -1 ) {
+		int end = line.tqfind( "</class>" );
 		if ( end == -1 ) {
 		    className = line.mid( start + 7 );
 		} else {
@@ -854,12 +854,12 @@ bool FormFile::checkFileName( bool allowBreak )
     if ( ff )
 	TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
 			      i18n( "The project already contains a form with a\n"
-				  "filename of '%1'. Please choose a new filename." ).arg( filename ) );
+				  "filename of '%1'. Please choose a new filename." ).tqarg( filename ) );
     while ( ff ) {
 	TQString fn;
 	while ( fn.isEmpty() ) {
 	    fn = KFileDialog::getSaveFileName( pro->makeAbsolute( fileName() ),
-					       i18n( "*.ui|Qt User-Interface Files" ) + "\n" +
+					       i18n( "*.ui|TQt User-Interface Files" ) + "\n" +
 					       i18n( "*|All Files" ), MainWindow::self,/* 0,*/
 					       i18n( "Save Form '%1' As").
 					       arg( formWindow()->name() )/*,
@@ -899,7 +899,7 @@ void FormFile::notifyFormWindowChange()
 	pro->formOpened( fw );
 }
 
-void FormFile::emitNewStatus(FormFile *file)
+void FormFile::emitNewtqStatus(FormFile *file)
 {
-    fw->mainWindow()->part()->emitNewStatus(fileName(), isModified());
+    fw->mainWindow()->part()->emitNewtqStatus(fileName(), isModified());
 }
diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h
index a2767d33..097beff4 100644
--- a/kdevdesigner/designer/formfile.h
+++ b/kdevdesigner/designer/formfile.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,10 @@ class Project;
 class FormWindow;
 class SourceEditor;
 
-class FormFile : public QObject
+class FormFile : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class SourceEditor;
 
 public:
@@ -115,7 +116,7 @@ signals:
 private slots:
     void formWindowChangedSomehow();
     void notifyFormWindowChange();
-    void emitNewStatus(FormFile* file);
+    void emitNewtqStatus(FormFile* file);
 
 private:
     bool isFormWindowModified() const;
diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui
index c1d6be27..dd6b9d19 100644
--- a/kdevdesigner/designer/formsettings.ui
+++ b/kdevdesigner/designer/formsettings.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FormSettingsBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radioPixmapInline</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <string>&lt;b&gt;Save Inline&lt;/b&gt;&lt;p&gt;Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this are not shared between forms. We recommend using Project image files instead.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>radioProjectImageFile</cstring>
                     </property>
@@ -113,13 +113,13 @@
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Specify Pixmap-Loader function (only the function's name, no parentheses.)</string>
+                        <string>Specify Pixmap-Loader function (only the function's name, no tqparentheses.)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Specify Pixmap-Loader function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for loading a pixmap in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
+                        <string>&lt;b&gt;Specify Pixmap-Loader function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for loading a pixmap in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioPixmapFunction</cstring>
                     </property>
@@ -135,7 +135,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -169,7 +169,7 @@
                         <string>&lt;b&gt;Enter the name of the class that will be created.&lt;/b&gt;&lt;p&gt;&lt;em&gt;classname.h&lt;/em&gt; and &lt;em&gt;classname.cpp&lt;/em&gt; will be generated as C++ output when it is compiled by uic.&lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -191,7 +191,7 @@
                         <string>Enter your name.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -202,7 +202,7 @@
                         <cstring>editClassName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -213,7 +213,7 @@
                         <cstring>editComment</cstring>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="1" column="1" rowspan="2" colspan="1">
+                <widget class="TQMultiLineEdit" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>editComment</cstring>
                     </property>
@@ -234,7 +234,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="1">
+        <widget class="TQGroupBox" row="1" column="1">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -251,7 +251,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QSpinBox" row="0" column="2">
+                <widget class="TQSpinBox" row="0" column="2">
                     <property name="name">
                         <cstring>spinMargin</cstring>
                     </property>
@@ -270,7 +270,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -281,7 +281,7 @@
                         <cstring>spinSpacing</cstring>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>checkLayoutFunctions</cstring>
                     </property>
@@ -295,7 +295,7 @@
                         <string>&lt;b&gt;Use a given function for margin and/or spacing&lt;/b&gt;&lt;p&gt;If you choose this option you must define functions in the line edit below which will be used in the generated code for getting the margin and spacing value. &lt;i&gt;Qt Designer&lt;/i&gt; cannot preview the correct margin or spacing if you use your own function. Instead, the default values will be used for preview.</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="2">
+                <widget class="TQSpinBox" row="1" column="2">
                     <property name="name">
                         <cstring>spinSpacing</cstring>
                     </property>
@@ -314,7 +314,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel1_3</cstring>
                     </property>
@@ -325,7 +325,7 @@
                         <cstring>spinMargin</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>spaFuLabel</cstring>
                     </property>
@@ -339,7 +339,7 @@
                         <cstring>editSpacingFunction</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>marFuLabel</cstring>
                     </property>
@@ -380,10 +380,10 @@
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Specify spacing function (only the function's name, no parentheses.)</string>
+                        <string>Specify spacing function (only the function's name, no tqparentheses.)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Specify spacing function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the spacing in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
+                        <string>&lt;b&gt;Specify spacing function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the spacing in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
                     </property>
                 </widget>
                 <widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3">
@@ -402,15 +402,15 @@
                         </sizepolicy>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Specify margin function (only the function's name, no parentheses.)</string>
+                        <string>Specify margin function (only the function's name, no tqparentheses.)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Specify margin function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the margin in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
+                        <string>&lt;b&gt;Specify margin function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the margin in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -424,7 +424,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -446,7 +446,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -463,7 +463,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -542,8 +542,8 @@
     <tabstop>buttonCancel</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>okClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp
index edbb8134..2878d62d 100644
--- a/kdevdesigner/designer/formsettingsimpl.cpp
+++ b/kdevdesigner/designer/formsettingsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,11 +40,11 @@
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 
-FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
-    : FormSettingsBase( parent, 0, TRUE ), formwindow( fw )
+FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw )
+    : FormSettingsBase( tqparent, 0, TRUE ), formwindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) );
     if ( info.classNameChanged && !info.className.isEmpty() )
 	editClassName->setText( info.className );
     else
@@ -52,8 +52,8 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
     editComment->setText( info.comment );
     editAuthor->setText( info.author );
 
-    editClassName->setValidator( new AsciiValidator( TQString( ":" ), editClassName ) );
-    editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), editPixmapFunction ) );
+    editClassName->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editClassName) ) );
+    editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editPixmapFunction) ) );
 
     if ( formwindow->savePixmapInline() )
 	radioPixmapInline->setChecked( TRUE );
@@ -63,10 +63,10 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
 	radioPixmapFunction->setChecked( TRUE );
     editPixmapFunction->setText( formwindow->pixmapLoaderFunction() );
     radioProjectImageFile->setEnabled( !fw->project()->isDummy() );
-    spinSpacing->setValue( formwindow->layoutDefaultSpacing() );
-    spinMargin->setValue( formwindow->layoutDefaultMargin() );
-    editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), editSpacingFunction ) );
-    editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), editMarginFunction ) ); 
+    spinSpacing->setValue( formwindow->tqlayoutDefaultSpacing() );
+    spinMargin->setValue( formwindow->tqlayoutDefaultMargin() );
+    editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editSpacingFunction) ) );
+    editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editMarginFunction) ) ); 
     checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() );
     editSpacingFunction->setText( formwindow->spacingFunction() );
     editMarginFunction->setText( formwindow->marginFunction() );
@@ -79,17 +79,17 @@ void FormSettings::okClicked()
     info.classNameChanged = info.className != TQString( formwindow->name() );
     info.comment = editComment->text();
     info.author = editAuthor->text();
-    MetaDataBase::setMetaInfo( formwindow, info );
+    MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), info );
 
     formwindow->commandHistory()->setModified( TRUE );
 
     if ( formwindow->savePixmapInline() ) {
-	MetaDataBase::clearPixmapArguments( formwindow );
-	MetaDataBase::clearPixmapKeys( formwindow );
+	MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) );
+	MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) );
     } else if ( formwindow->savePixmapInProject() ) {
-	MetaDataBase::clearPixmapArguments( formwindow );
+	MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) );
     } else {
-	MetaDataBase::clearPixmapKeys( formwindow );
+	MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) );
     }
 
     if ( radioPixmapInline->isChecked() ) {
diff --git a/kdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h
index d8944ae5..75aa5cbd 100644
--- a/kdevdesigner/designer/formsettingsimpl.h
+++ b/kdevdesigner/designer/formsettingsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,9 +34,10 @@ class FormWindow;
 class FormSettings : public FormSettingsBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FormSettings( TQWidget *parent, FormWindow *fw );
+    FormSettings( TQWidget *tqparent, FormWindow *fw );
 
 protected slots:
     void okClicked();
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index b34a49e1..cd097c54 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,7 +31,7 @@
 #include "sizehandle.h"
 #include "metadatabase.h"
 #include "resource.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "connectiondialog.h"
 #include <widgetdatabase.h>
 #include "pixmapchooser.h"
@@ -84,10 +84,10 @@
 static void setCursorToAll( const TQCursor &c, TQWidget *start )
 {
     start->setCursor( c );
-    TQObjectList *l = (TQObjectList*)start->children();
-    if ( l ) {
-	for ( TQObject *o = l->first(); o; o = l->next() ) {
-	    if ( o->isWidgetType() && !::qt_cast<SizeHandle*>(o) )
+    TQObjectList l = start->childrenListObject();
+    if ( !l.isEmpty() ) {
+	for ( TQObject *o = l.first(); o; o = l.next() ) {
+	    if ( o->isWidgetType() && !::tqqt_cast<SizeHandle*>(o) )
 		setCursorToAll( c, ( (TQWidget*)o ) );
 	}
     }
@@ -95,21 +95,21 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start )
 
 static void restoreCursors( TQWidget *start, FormWindow *fw )
 {
-    if ( fw->widgets()->find( start ) )
+    if ( fw->widgets()->tqfind( start ) )
 	start->setCursor( MetaDataBase::cursor( start ) );
     else
-	start->setCursor( Qt::ArrowCursor );
-    TQObjectList *l = (TQObjectList*)start->children();
-    if ( l ) {
-	for ( TQObject *o = l->first(); o; o = l->next() ) {
-	    if ( o->isWidgetType() && !::qt_cast<SizeHandle*>(o) )
+	start->setCursor( TQt::ArrowCursor );
+    TQObjectList l = start->childrenListObject();
+    if ( !l.isEmpty() ) {
+	for ( TQObject *o = l.first(); o; o = l.next() ) {
+	    if ( o->isWidgetType() && !::tqqt_cast<SizeHandle*>(o) )
 		restoreCursors( ( (TQWidget*)o ), fw );
 	}
     }
 }
 
-#if defined(Q_WS_WIN32) // #### needed for the workaround for repaint problem on windows
-#include <qt_windows.h>
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows
+#include <tqt_windows.h>
 static void flickerfree_update( TQWidget *w )
 {
     InvalidateRect( w->winId(), 0, FALSE );
@@ -134,8 +134,8 @@ static void flickerfree_update( TQWidget *w )
   event filter which is implemented in MainWindow::eventFilter().
 */
 
-FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ),
+FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( mw ),
       commands( 100 ), pixInline( TRUE ), pixProject( FALSE )
 {
     ff = f;
@@ -143,8 +143,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const cha
     initSlots();
 }
 
-FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ),
+FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( 0 ),
       commands( 100 ), pixInline( TRUE )
 {
     ff = f;
@@ -153,10 +153,10 @@ FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name )
 
 void FormWindow::init()
 {
-    setWFlags(getWFlags() & Qt::WStyle_Maximize);
+    setWFlags(getWFlags() & TQt::WStyle_Maximize);
 
     fake = qstrcmp( name(), "qt_fakewindow" ) == 0;
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     ff->setFormWindow( this );
     iface = 0;
     proj = 0;
@@ -169,7 +169,7 @@ void FormWindow::init()
     unclippedPainter = 0;
     widgetPressed = FALSE;
     drawRubber = FALSE;
-    setFocusPolicy( ClickFocus );
+    setFocusPolicy( TQ_ClickFocus );
     sizePreviewLabel = 0;
     checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" );
     connect( checkSelectionsTimer, TQT_SIGNAL( timeout() ),
@@ -200,7 +200,7 @@ void FormWindow::init()
 
     TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this );
     setMainContainer( w );
-    propertyWidget = w;
+    propertyWidget = TQT_TQOBJECT(w);
     targetContainer = 0;
     hadOwnPalette = FALSE;
 
@@ -212,7 +212,7 @@ void FormWindow::init()
 void FormWindow::setMainWindow( MainWindow *w )
 {
     mainwindow = w;
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     initSlots();
 }
 
@@ -236,7 +236,7 @@ FormWindow::~FormWindow()
     if ( MainWindow::self && MainWindow::self->objectHierarchy()->formWindow() == this )
 	MainWindow::self->objectHierarchy()->setFormWindow( 0, 0 );
 
-    MetaDataBase::clear( this );
+    MetaDataBase::clear( TQT_TQOBJECT(this) );
     if ( ff )
 	ff->setFormWindow( 0 );
     delete iface;
@@ -258,19 +258,19 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
     TQPixmap grid;
     TQString grid_name;
     grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
-    if( !TQPixmapCache::find( grid_name, grid ) ) {
+    if( !TQPixmapCache::tqfind( grid_name, grid ) ) {
 	grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
-	grid.fill( colorGroup().color( TQColorGroup::Foreground ) );
-	TQBitmap mask( grid.width(), grid.height() );
-	mask.fill( color0 );
-	TQPainter p( &mask );
+	grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
+	TQBitmap tqmask( grid.width(), grid.height() );
+	tqmask.fill( color0 );
+	TQPainter p( &tqmask );
 	p.setPen( color1 );
 	for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) {
 	    for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) {
 		p.drawPoint( x, y );
 	    }
 	}
-	grid.setMask( mask );
+	grid.setMask( tqmask );
 	TQPixmapCache::insert( grid_name, grid );
     }
     TQPainter p( w );
@@ -321,7 +321,7 @@ TQPoint FormWindow::gridPoint( const TQPoint &p )
 void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text )
 {
     unclippedPainter->save();
-    unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1  ));
+    unclippedPainter->setPen( TQPen( tqcolorGroup().foreground(), 1  ));
     unclippedPainter->setRasterOp( CopyROP );
     if ( !sizePreviewPixmap.isNull() )
 	unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap );
@@ -353,7 +353,7 @@ void FormWindow::insertWidget()
 	return;
 
     bool useSizeHint = !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 );
-    Orientation orient = Horizontal;
+    Qt::Orientation orient =Qt::Horizontal;
     TQString n = WidgetDatabase::className( currTool );
     if (  useSizeHint && ( n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING ) ) {
 	TQPopupMenu m( mainWindow() );
@@ -361,7 +361,7 @@ void FormWindow::insertWidget()
 	int ver = m.insertItem( i18n( "&Vertical" ) );
 	int r = m.exec( TQCursor::pos() );
 	if ( r == ver )
-	    orient = Vertical;
+	    orient =Qt::Vertical;
     }
 
 
@@ -375,25 +375,25 @@ void FormWindow::insertWidget()
 	pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() );
 	( (TQLabel*)w )->setPixmap( pix );
     }
-    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) );
+    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) );
     if ( WidgetDatabase::isCustomWidget( id ) ) {
 	TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> "
 			    "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
 			    "menu to add and change custom widgets. You can add "
 			    "properties as well as signals and slots to integrate custom widgets into "
-			    "<i>Qt Designer</i>, and provide a pixmap which will be used to represent "
+			    "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
 			    "the widget on the form.</p>")
-			    .arg(WidgetDatabase::toolTip( id )) );
-	TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) );
+			    .tqarg(WidgetDatabase::toolTip( id )) );
+	TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) );
     } else {
 	TQString tt = WidgetDatabase::toolTip( id );
 	TQString wt = WidgetDatabase::whatsThis( id );
 	if ( !wt.isEmpty() && !tt.isEmpty() )
-	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
+	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) );
     }
 
     TQString s = w->name();
-    unify( w, s, TRUE );
+    unify( TQT_TQOBJECT(w), s, TRUE );
     w->setName( s );
     insertWidget( w );
     TQRect r( currRect );
@@ -408,7 +408,7 @@ void FormWindow::insertWidget()
 
     if ( useSizeHint ) {
 	if ( n == "Spacer" ) {
-	    if ( orient == Vertical ) {
+	    if ( orient ==Qt::Vertical ) {
 		r.setWidth( 20 );
 		r.setHeight( 40 );
 	    } else {
@@ -416,8 +416,8 @@ void FormWindow::insertWidget()
 		r.setHeight( 20 );
 	    }
 	} else {
-	    r.setWidth( w->sizeHint().width() );
-	    r.setHeight( w->sizeHint().height() );
+	    r.setWidth( w->tqsizeHint().width() );
+	    r.setHeight( w->tqsizeHint().height() );
 	}
     }
 
@@ -426,19 +426,19 @@ void FormWindow::insertWidget()
     if ( r.height() < 2 * grid().y() )
 	r.setHeight( 2 * grid().y() );
 
-    const TQObjectList *l = insertParent->children();
-    TQObjectListIt it( *l );
+    const TQObjectList l = insertParent->childrenListObject();
+    TQObjectListIt it( l );
     TQWidgetList lst;
-    if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
+    if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
 	for ( ; it.current(); ) {
 	    TQObject *o = it.current();
 	    ++it;
 	    if ( o->isWidgetType() &&
 		 ( (TQWidget*)o )->isVisibleTo( this ) &&
-		 insertedWidgets.find( (TQWidget*)o ) && o != w ) {
+		 insertedWidgets.tqfind( TQT_TQWIDGET(o) ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) {
 		TQRect r2( ( (TQWidget*)o )->pos(),
 			  ( (TQWidget*)o )->size() );
-		if ( r.contains( r2 ) )
+		if ( r.tqcontains( r2 ) )
 		    lst.append( (TQWidget*)o );
 	    }
 	}
@@ -455,7 +455,7 @@ void FormWindow::insertWidget()
                 np.append( pos );
             }
             
-            MoveCommand *mv = new MoveCommand( i18n( "Reparent Widgets" ), this,
+            MoveCommand *mv = new MoveCommand( i18n( "Retqparent Widgets" ), this,
                                                lst, op, np, insertParent, pw );
 
             if ( !toolFixed )
@@ -463,13 +463,13 @@ void FormWindow::insertWidget()
             else
                 setCursorToAll( CrossCursor, w );
             
-            InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
+            InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r );
             
             TQPtrList<Command> commands;
             commands.append( mv );
             commands.append( cmd );
             
-            MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).arg( w->name() ), this, commands );
+            MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, commands );
             commandHistory()->addCommand( mc );
             mc->execute();
         }
@@ -479,7 +479,7 @@ void FormWindow::insertWidget()
 	else
 	    setCursorToAll( CrossCursor, w );
 
-	InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
+	InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r );
 	commandHistory()->addCommand( cmd );
 	cmd->execute();
     }
@@ -497,26 +497,26 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName )
 	return;
     if ( checkName ) {
 	TQString s = w->name();
-	unify( w, s, TRUE );
+	unify( TQT_TQOBJECT(w), s, TRUE );
 	w->setName( s );
     }
 
-    MetaDataBase::addEntry( w );
-    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) );
+    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) );
     if ( WidgetDatabase::isCustomWidget( id ) ) {
 	TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> "
 			    "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
 			    "menu to add and change custom widgets. You can add "
 			    "properties as well as signals and slots to integrate custom widgets into "
-			    "<i>Qt Designer</i>, and provide a pixmap which will be used to represent "
+			    "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
 			    "the widget on the form.</p>")
-			    .arg(WidgetDatabase::toolTip( id )) );
-	TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) );
+			    .tqarg(WidgetDatabase::toolTip( id )) );
+	TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) );
     } else {
 	TQString tt = WidgetDatabase::toolTip( id );
 	TQString wt = WidgetDatabase::whatsThis( id );
 	if ( !wt.isEmpty() && !tt.isEmpty() )
-	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
+	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) );
     }
 
     restoreCursors( w, this );
@@ -526,7 +526,7 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName )
 
 void FormWindow::removeWidget( TQWidget *w )
 {
-    MetaDataBase::removeEntry( w );
+    MetaDataBase::removeEntry( TQT_TQOBJECT(w) );
     widgets()->take( w );
 }
 
@@ -535,16 +535,16 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w )
     CHECK_MAINWINDOW;
     switch ( currTool ) {
     case POINTER_TOOL: {
-	if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
 	    raiseChildSelections( w ); // raise selections and select widget
-	    selectWidget( w );
+	    selectWidget( TQT_TQOBJECT(w) );
 	    // if widget is laid out, find the first non-laid out super-widget
 	    TQWidget *realWidget = w; // but store the original one
-	    while ( w->parentWidget() &&
-		    ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout ||
-		      !insertedWidgets.find(w) ) )
-		w = w->parentWidget();
-	    if ( ::qt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) {
+	    while ( w->tqparentWidget() &&
+		    ( WidgetFactory::tqlayoutType( w->tqparentWidget()) != WidgetFactory::NoLayout ||
+		      !insertedWidgets.tqfind(w) ) )
+		w = w->tqparentWidget();
+	    if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) {
 		e->accept();
 		mainwindow->popupFormWindowMenu( e->globalPos(), this );
 	    } else {
@@ -576,9 +576,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 
     switch ( currTool ) {
     case POINTER_TOOL:
-	if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
-	    // if the clicked widget is not in a layout, raise it
-	    if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
+	    // if the clicked widget is not in a tqlayout, raise it
+	    if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
 		w->raise();
 	    if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection
 		drawRubber = TRUE;
@@ -587,63 +587,63 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 		break;
 	    }
 
-	    bool sel = isWidgetSelected( w );
+	    bool sel = isWidgetSelected( TQT_TQOBJECT(w) );
 	    if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { // control not pressed...
 		if ( !sel ) { // ...and widget no selectted: unselect all
 		    clearSelection( FALSE );
 		} else { // ...widget selected
-		    // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs
-		    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
+		    // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs
+		    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ) {
 			TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
 			setPropertyShowingBlocked( TRUE );
 			for ( TQObject *o = l->first(); o; o = l->next() ) {
 			    if ( !o->isWidgetType() )
 				continue;
-			    if ( insertedWidgets.find( (TQWidget*)o ) )
-				selectWidget( (TQWidget*)o, FALSE );
+			    if ( insertedWidgets.tqfind( (TQWidget*)o ) )
+				selectWidget( TQT_TQOBJECT(o), FALSE );
 			}
 			setPropertyShowingBlocked( FALSE );
 			delete l;
 		    }
 		}
-		qApp->processEvents();
+		tqApp->processEvents();
 	    }
 	    if ( ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) &&
-		 sel && e->button() == LeftButton ) { // control pressed and selected, unselect widget
-		selectWidget( w, FALSE );
+		 sel && e->button() == Qt::LeftButton ) { // control pressed and selected, unselect widget
+		selectWidget( TQT_TQOBJECT(w), FALSE );
 		break;
 	    }
 
 	    raiseChildSelections( w ); // raise selections and select widget
-	    selectWidget( w );
+	    selectWidget( TQT_TQOBJECT(w) );
 
 	    // if widget is laid out, find the first non-laid out super-widget
-	    while ( w->parentWidget() &&
-		    ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) )
-		w = w->parentWidget();
+	    while ( w->tqparentWidget() &&
+		    ( WidgetFactory::tqlayoutType( w->tqparentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) )
+		w = w->tqparentWidget();
 
-	    if ( e->button() == LeftButton ) { // left button: store original geometry and more as the widget might start moving
+	    if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving
 		widgetPressed = TRUE;
 		widgetGeom = TQRect( w->pos(), w->size() );
 		oldPressPos = w->mapFromGlobal( e->globalPos() );
 		origPressPos = oldPressPos;
 		checkedSelectionsForMove = FALSE;
 		moving.clear();
-		if ( w->parentWidget() && !isMainContainer( w->parentWidget() ) && !isCentralWidget( w->parentWidget() ) ) {
-		    targetContainer = w->parentWidget();
-		    hadOwnPalette = w->parentWidget()->ownPalette();
-		    restorePalette = w->parentWidget()->palette();
+		if ( w->tqparentWidget() && !isMainContainer( TQT_TQOBJECT(w->tqparentWidget()) ) && !isCentralWidget( TQT_TQOBJECT(w->tqparentWidget()) ) ) {
+		    targetContainer = w->tqparentWidget();
+		    hadOwnPalette = w->tqparentWidget()->ownPalette();
+		    restorePalette = w->tqparentWidget()->palette();
 		}
 	    }
 	} else { // press was on the formwindow
-	    if ( e->button() == LeftButton ) { // left button: start rubber selection and show formwindow properties
+	    if ( e->button() == Qt::LeftButton ) { // left button: start rubber selection and show formwindow properties
 		drawRubber = TRUE;
 		if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) {
 		    clearSelection( FALSE );
 		    TQObject *opw = propertyWidget;
-		    propertyWidget = mainContainer();
+		    propertyWidget = TQT_TQOBJECT(mainContainer());
 		    if ( opw->isWidgetType() )
-			repaintSelection( (TQWidget*)opw );
+			tqrepaintSelection( (TQWidget*)opw );
 		}
 		currRect = TQRect( 0, 0, -1, -1 );
 		startRectDraw( mapFromGlobal( e->globalPos() ), e->globalPos(), this, Rubber );
@@ -652,32 +652,32 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 	break;
     case CONNECT_TOOL:
     case BUDDY_TOOL:
-	if ( e->button() != LeftButton )
+	if ( e->button() != Qt::LeftButton )
 	    break;
 	validForBuddy = FALSE;
 	if ( currTool == BUDDY_TOOL ) {
-	    if ( !::qt_cast<TQLabel*>(w) )
+	    if ( !::tqqt_cast<TQLabel*>(w) )
 		break;
 	    clearSelection( FALSE );
 	    validForBuddy = TRUE;
-	    mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) );
+	    mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).tqarg( w->name() ) );
 	} else {
-	    mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) );
+	    mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).tqarg( w->name() ) );
 	}
 	saveBackground();
 	startPos = mapFromGlobal( e->globalPos() );
 	currentPos = startPos;
-	startWidget = designerWidget( w );
+	startWidget = designerWidget( TQT_TQOBJECT(w) );
 	endWidget = startWidget;
 	beginUnclippedPainter( FALSE );
 	drawConnectionLine();
 	break;
     case ORDER_TOOL:
-	if ( !isMainContainer( w ) ) { // press on a child widget
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget
 	    orderedWidgets.removeRef( w );
 	    orderedWidgets.append( w );
 	    for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) {
-		int i = stackedWidgets.findRef( wid );
+		int i = stackedWidgets.tqfindRef( wid );
 		if ( i != -1 ) {
 		    stackedWidgets.removeRef( wid );
 		    stackedWidgets.insert( 0, wid );
@@ -691,18 +691,18 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 	}
 	break;
     default: // any insert widget tool
-	if ( e->button() == LeftButton ) {
-	    insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow
-	    if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent
+	if ( e->button() == Qt::LeftButton ) {
+	    insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow
+	    if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another tqparent
 		TQWidget *wid = w;
 		for (;;) {
-		    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) );
+		    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) );
 		    if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) &&
-			 !::qt_cast<QLayoutWidget*>(wid) && !::qt_cast<TQSplitter*>(wid) ) {
-			insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it
+			 !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) {
+			insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it
 			break;
 		    } else {
-			wid = wid->parentWidget();
+			wid = wid->tqparentWidget();
 			if ( !wid )
 			    break;
 		    }
@@ -719,11 +719,11 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
     CHECK_MAINWINDOW;
     switch ( currTool ) {
     case ORDER_TOOL:
-	if ( !isMainContainer( w ) ) { // press on a child widget
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget
 	    orderedWidgets.clear();
 	    orderedWidgets.append( w );
 	    for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) {
-		int i = stackedWidgets.findRef( wid );
+		int i = stackedWidgets.tqfindRef( wid );
 		if ( i != -1 ) {
 		    stackedWidgets.removeRef( wid );
 		    stackedWidgets.insert( 0, wid );
@@ -736,8 +736,8 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
 	    updateOrderIndicators();
 	}
     default:
-	if ( !WidgetFactory::isPassiveInteractor( w ) &&
-	     ( isMainContainer( w ) || w == this ) )
+	if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) &&
+	     ( isMainContainer( TQT_TQOBJECT(w) ) || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(this) ) )
 	    mainWindow()->editSource();
 	break;
     }
@@ -746,7 +746,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
 void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 {
     CHECK_MAINWINDOW;
-    if ( ( e->state() & LeftButton ) != LeftButton )
+    if ( ( e->state() & Qt::LeftButton ) != Qt::LeftButton )
 	return;
 
     TQWidget *newendWidget = endWidget, *oldendWidget = endWidget, *wid;
@@ -756,9 +756,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	if ( widgetPressed && allowMove( w ) ) { // we are prepated for a move
 
 	    // if widget is laid out, find the first non-laid out super-widget
-	    while ( w->parentWidget() &&
-		    ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.find(w ) ) )
-		w = w->parentWidget();
+	    while ( w->tqparentWidget() &&
+		    ( WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) )
+		w = w->tqparentWidget();
 
 	    // calc correct position
 	    TQPoint pos = w->mapFromGlobal( e->globalPos() );
@@ -770,17 +770,17 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 		pos.setX( w->mapFromParent( TQPoint( 0, mpos.y() ) ).x() );
 	    if ( mpos.y() < 0 )
 		pos.setY( w->mapFromParent( TQPoint( mpos.x(), 0 ) ).y() );
-	    if ( mpos.x() > w->parentWidget()->width() )
-		pos.setX( w->mapFromParent( TQPoint( w->parentWidget()->width(), mpos.y() ) ).x() );
-	    if ( mpos.y() > w->parentWidget()->height() )
-		pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->parentWidget()->height() ) ).y() );
+	    if ( mpos.x() > w->tqparentWidget()->width() )
+		pos.setX( w->mapFromParent( TQPoint( w->tqparentWidget()->width(), mpos.y() ) ).x() );
+	    if ( mpos.y() > w->tqparentWidget()->height() )
+		pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->tqparentWidget()->height() ) ).y() );
 #endif
 
 	    // calc move distance and store it
 	    TQPoint d = oldPressPos - pos;
-	    if ( QABS( d.x() ) < grid().x() )
+	    if ( TQABS( d.x() ) < grid().x() )
 		d.setX( 0 );
-	    if ( QABS( d.y() ) < grid().y() )
+	    if ( TQABS( d.y() ) < grid().y() )
 		d.setY( 0 );
 	    if ( d.x() == 0 )
 		pos.setX( oldPressPos.x() );
@@ -799,18 +799,18 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 
 	    if ( x - p.x() != 0 || y - p.y() != 0 ) { // if we actually have to move
 		if ( !checkedSelectionsForMove ) { // if not checked yet, check if the correct widget are selected...
-		    if ( !isWidgetSelected( w ) ) {	// and unselect others. Only siblings can be moved at the same time
+		    if ( !isWidgetSelected( TQT_TQOBJECT(w) ) ) {	// and unselect others. Only siblings can be moved at the same time
 			setPropertyShowingBlocked( TRUE );
-			selectWidget( w );
+			selectWidget( TQT_TQOBJECT(w) );
 			setPropertyShowingBlocked( FALSE );
 		    }
 		    checkSelectionsForMove( w );
 		}
 
-		// check whether we would have to reparent the selection and highlight the possible new parent container
+		// check whether we would have to reparent the selection and highlight the possible new tqparent container
 		TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin();
 		TQWidget* wa = containerAt( e->globalPos(), it.key() );
-		if ( wa  && !isMainContainer( wa ) && !isCentralWidget( wa ) ) {
+		if ( wa  && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) {
 		    wa = WidgetFactory::containerOfWidget( wa );
 		    // ok, looks like we moved onto a container
 
@@ -824,7 +824,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 			targetContainer = wa;
 			hadOwnPalette = wa->ownPalette();
 			restorePalette = wa->palette();
-			wa->setPaletteBackgroundColor( wa->colorGroup().midlight() );
+			wa->setPaletteBackgroundColor( wa->tqcolorGroup().midlight() );
 		    }
 		}
 		else if ( targetContainer ) {
@@ -837,14 +837,14 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 
 		// finally move the selected widgets and show/update preview label
 		moveSelectedWidgets( x - p.x(), y - p.y() );
-		sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) );
+		sizePreviewLabel->setText( i18n( "%1/%2" ).tqarg( w->pos().x() ).tqarg( w->pos().y() ) );
 		sizePreviewLabel->adjustSize();
 		TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() );
 		checkPreviewGeometry( lg );
 		sizePreviewLabel->setGeometry( lg );
 		sizePreviewLabel->raise();
 		sizePreviewLabel->show();
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
 		windowsRepaintWorkaroundTimer->start( 100, TRUE );
 #endif
 	    } else { // if we don't need to move, do some indication
@@ -860,23 +860,23 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	break;
     case CONNECT_TOOL:
 	restoreConnectionLine();
-	wid = qApp->widgetAt( e->globalPos(), TRUE );
+	wid = tqApp->widgetAt( e->globalPos(), TRUE );
 	if ( wid )
-	    wid = designerWidget( wid );
-	if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) )
+	    wid = designerWidget( TQT_TQOBJECT(wid) );
+	if ( wid && ( isMainContainer( TQT_TQOBJECT(wid) ) || insertedWidgets.tqfind( wid ) ) && wid->isVisibleTo( this ) )
 	    newendWidget = wid;
-	if ( ::qt_cast<QLayoutWidget*>(newendWidget) || ::qt_cast<Spacer*>(newendWidget) )
+	if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) )
 	    newendWidget = (TQWidget*)endWidget;
 	drawRecRect = newendWidget != endWidget;
 	if ( newendWidget &&
-	     ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) )
+	     ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.tqfind( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
 	    endWidget = newendWidget;
-	mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ).
+	mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ).
 					    arg( endWidget->name() ) );
 	currentPos = mapFromGlobal( e->globalPos() );
-	qApp->processEvents();
+	tqApp->processEvents();
 	if ( drawRecRect )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->tqparentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
 			 ( (TQWidget*)oldendWidget )->size() ) );
 	drawConnectionLine();
 	break;
@@ -884,29 +884,29 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	if ( !validForBuddy )
 	    break;
 	restoreConnectionLine();
-	wid = qApp->widgetAt( e->globalPos(), TRUE );
+	wid = tqApp->widgetAt( e->globalPos(), TRUE );
 	if ( wid )
-	    wid = designerWidget( wid );
+	    wid = designerWidget( TQT_TQOBJECT(wid) );
 	if ( wid && canBeBuddy( wid ) && wid->isVisibleTo( this ) )
 	    newendWidget = wid;
 	else
 	    newendWidget = 0;
-	if ( ::qt_cast<QLayoutWidget*>(newendWidget) || ::qt_cast<Spacer*>(newendWidget) )
+	if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) )
 	    newendWidget = (TQWidget*)endWidget;
 	drawRecRect = newendWidget != endWidget;
 	if ( !newendWidget )
 	    endWidget = newendWidget;
-	else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) )
+	else if ( insertedWidgets.tqfind( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
 	    endWidget = newendWidget;
 	if ( endWidget )
-	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ).
+	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ).
 						arg( endWidget->name() ) );
 	else
-	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).arg( startWidget->name() ) );
+	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).tqarg( startWidget->name() ) );
 	currentPos = mapFromGlobal( e->globalPos() );
-	qApp->processEvents();
+	tqApp->processEvents();
 	if ( drawRecRect && oldendWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->tqparentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
 			 ( (TQWidget*)oldendWidget )->size() ) );
 	drawConnectionLine();
 	break;
@@ -922,7 +922,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 {
     CHECK_MAINWINDOW;
-    if ( e->button() != LeftButton )
+    if ( e->button() != Qt::LeftButton )
 	return;
 
     switch ( currTool ) {
@@ -930,7 +930,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 	if ( widgetPressed && allowMove( w ) ) { // we moved the widget
 	    sizePreviewLabel->hide();
 
-	    if ( moving.isEmpty() || w->pos() == *moving.find(w) )
+	    if ( moving.isEmpty() || w->pos() == *moving.tqfind(w) )
 		break;
 
 	    // restore targetContainer
@@ -946,7 +946,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		emitUpdateProperties( propertyWidget );
 
 	    TQMapConstIterator<TQWidget*,TQPoint> it = moving.begin();
-	    TQWidget *oldParent = it.key()->parentWidget();
+	    TQWidget *oldParent = it.key()->tqparentWidget();
 	    TQWidget *newParent = oldParent;
 	    // check whether we have to reparent the selection
 	    TQWidget* wa = containerAt( e->globalPos(), it.key() );
@@ -954,19 +954,19 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		wa = WidgetFactory::containerOfWidget( wa );
 		// ok, looks like we moved onto a container
 
-		// check whether we really have different parents.
-		if ( wa == it.key()->parentWidget() )
+		// check whether we really have different tqparents.
+		if ( wa == it.key()->tqparentWidget() )
 		    goto make_move_command;
 
-		// break layout if necessary
-		if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) {
+		// break tqlayout if necessary
+		if ( WidgetFactory::tqlayoutType( wa ) != WidgetFactory::NoLayout ) {
 		    if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
 						   i18n( "You tried to insert a widget into the "
-						       "layout Container Widget '%1'.\n"
+						       "tqlayout Container Widget '%1'.\n"
 						       "This is not possible. "
-						       "In order to insert the widget, the layout of '%1'\n"
+						       "In order to insert the widget, the tqlayout of '%1'\n"
 						       "must first be broken.\n"
-						       "Break the layout or cancel the operation?" ).
+						       "Break the tqlayout or cancel the operation?" ).
 						   arg( wa->name() ).
 						   arg( wa->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) )
 			goto make_move_command; // cancel
@@ -977,25 +977,25 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		bool emitSelChanged = FALSE;
 		for ( TQMap<TQWidget*, TQPoint>::Iterator it = moving.begin(); it != moving.end(); ++it ) {
 		    TQWidget *i = it.key();
-		    if ( !emitSelChanged && ::qt_cast<TQButton*>(i) ) {
-			if ( ::qt_cast<TQButtonGroup*>(i->parentWidget()) || ::qt_cast<TQButtonGroup*>(wa) )
+		    if ( !emitSelChanged && ::tqqt_cast<TQButton*>(i) ) {
+			if ( ::tqqt_cast<TQButtonGroup*>(i->tqparentWidget()) || ::tqqt_cast<TQButtonGroup*>(wa) )
 			    emitSelChanged = TRUE;
-			if ( !::qt_cast<TQButtonGroup*>(wa) ) {
-			    MetaDataBase::setPropertyChanged( i, "buttonGroupId", FALSE );
-			    if ( ::qt_cast<TQButtonGroup*>(i->parentWidget()) )
-				( (TQButtonGroup*)i->parentWidget() )->remove( (TQButton*)i );
+			if ( !::tqqt_cast<TQButtonGroup*>(wa) ) {
+			    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(i), "buttonGroupId", FALSE );
+			    if ( ::tqqt_cast<TQButtonGroup*>(i->tqparentWidget()) )
+				( (TQButtonGroup*)i->tqparentWidget() )->remove( (TQButton*)i );
 			}
 		    }
 		    TQPoint pos = wa->mapFromGlobal( i->mapToGlobal( TQPoint(0,0) ) );
 		    i->reparent( wa, pos, TRUE );
 		    raiseSelection( i );
 		    raiseChildSelections( i );
-		    widgetChanged( i );
+		    widgetChanged( TQT_TQOBJECT(i) );
 		    mainWindow()->objectHierarchy()->widgetRemoved( i );
 		    mainWindow()->objectHierarchy()->widgetInserted( i );
 		}
 		if ( emitSelChanged ) {
-		    emit showProperties( wa );
+		    emit showProperties( TQT_TQOBJECT(wa) );
 		    emit showProperties( propertyWidget );
 		}
 		newParent = wa;
@@ -1027,15 +1027,15 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
     case BUDDY_TOOL:
 	restoreConnectionLine();
 	if ( startWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->tqparentWidget(),
 					   ( (TQWidget*)startWidget )->pos() ),
 				((TQWidget*)startWidget )->size() ) );
 	if ( endWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->tqparentWidget(),
 					   ( (TQWidget*)endWidget )->pos() ),
 				( (TQWidget*)endWidget )->size() ) );
 	endUnclippedPainter();
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	if ( startWidget && endWidget ) {
 	    if ( currTool == CONNECT_TOOL )
@@ -1044,14 +1044,14 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		TQString oldBuddy = startWidget->property( "buddy" ).toString();
 		if ( oldBuddy.isNull() )
 		    oldBuddy = "";
-		SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ),
-								  this, startWidget, mainWindow()->propertyeditor(),
+		SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).tqarg( startWidget->name() ),
+								  this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(),
 								  "buddy", startWidget->property( "buddy" ),
 								  endWidget->name(), endWidget->name(),
 								  oldBuddy );
 		commandHistory()->addCommand( cmd, TRUE );
 		cmd->execute();
-		emitUpdateProperties( startWidget );
+		emitUpdateProperties( TQT_TQOBJECT(startWidget) );
 	    }
 	}
 	if ( !toolFixed )
@@ -1064,14 +1064,14 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
     default: // any insert widget tool is active
 	if ( insertParent ) { // we should insert the new widget now
 	    endRectDraw();
-	    if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) {
+	    if ( WidgetFactory::tqlayoutType( insertParent ) != WidgetFactory::NoLayout ) {
 		if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
 					       i18n( "You tried to insert a widget into the "
-						   "layout Container Widget '%1'.\n"
+						   "tqlayout Container Widget '%1'.\n"
 						   "This is not possible. "
-						   "In order to insert the widget, the layout of '%1'\n"
+						   "In order to insert the widget, the tqlayout of '%1'\n"
 						   "must first be broken.\n"
-						   "Break the layout or cancel the operation?" ).
+						   "Break the tqlayout or cancel the operation?" ).
 					       arg( insertParent->name() ).
 					       arg( insertParent->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) == 0 ) {
 		    breakLayout( insertParent );
@@ -1163,7 +1163,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w )
 	TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING );
 	if ( !l )
 	    return;
-	if ( l->find( w ) != -1 )
+	if ( l->tqfind( TQT_TQOBJECT(w) ) != -1 )
 	    e->accept();
 	delete l;
     }
@@ -1185,35 +1185,35 @@ void FormWindow::selectWidget( TQObject *o, bool select )
 
     TQWidget *w = (TQWidget*)o;
 
-    if ( isMainContainer( w ) ) {
+    if ( isMainContainer( TQT_TQOBJECT(w) ) ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	emitShowProperties( propertyWidget );
 	return;
     }
 
-    if ( ::qt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) {
+    if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	emitShowProperties( propertyWidget );
 	return;
     }
 
-    if ( ::qt_cast<QDesignerToolBar*>(o) )
+    if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
 	return;
 
     if ( select ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = w;
+	propertyWidget = TQT_TQOBJECT(w);
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	if ( !isPropertyShowingBlocked() )
 	    emitShowProperties( propertyWidget );
-	WidgetSelection *s = usedSelections.find( w );
+	WidgetSelection *s = usedSelections.tqfind( w );
 	if ( s ) {
 	    s->show();
 	    return;
@@ -1233,16 +1233,16 @@ void FormWindow::selectWidget( TQObject *o, bool select )
 	s->setWidget( w );
 	emitSelectionChanged();
     } else {
-	WidgetSelection *s = usedSelections.find( w );
+	WidgetSelection *s = usedSelections.tqfind( w );
 	if ( s )
 	    s->setWidget( 0 );
 	TQObject *opw = propertyWidget;
 	if ( !usedSelections.isEmpty() )
-	    propertyWidget = TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget();
+	    propertyWidget = TQT_TQOBJECT(TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget());
 	else
-	    propertyWidget = mainContainer();
+	    propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	if ( !isPropertyShowingBlocked() )
 	    emitShowProperties( propertyWidget );
 	emitSelectionChanged();
@@ -1258,23 +1258,23 @@ TQPoint FormWindow::grid() const
 
 void FormWindow::updateSelection( TQWidget *w )
 {
-    WidgetSelection *s = usedSelections.find( w );
+    WidgetSelection *s = usedSelections.tqfind( w );
     if ( !w->isVisibleTo( this ) )
-	selectWidget( w, FALSE );
+	selectWidget( TQT_TQOBJECT(w), FALSE );
     else if ( s )
 	s->updateGeometry();
 }
 
 void FormWindow::raiseSelection( TQWidget *w )
 {
-    WidgetSelection *s = usedSelections.find( w );
+    WidgetSelection *s = usedSelections.tqfind( w );
     if ( s )
 	s->show();
 }
 
-void FormWindow::repaintSelection( TQWidget *w )
+void FormWindow::tqrepaintSelection( TQWidget *w )
 {
-    WidgetSelection *s = usedSelections.find( w );
+    WidgetSelection *s = usedSelections.tqfind( w );
     if ( s )
 	s->update();
 }
@@ -1288,9 +1288,9 @@ void FormWindow::clearSelection( bool changePropertyDisplay )
     usedSelections.clear();
     if ( changePropertyDisplay ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	emitShowProperties( propertyWidget );
     }
     emitSelectionChanged();
@@ -1327,7 +1327,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
 
     if ( currRect == r ) {
 	TQString t = i18n( "%1/%2" );
-	t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
+	t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 );
 	drawSizePreview( pos, t );
 	return;
     }
@@ -1339,7 +1339,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
 	currRect = r;
 	if ( t == Insert ) {
 	    TQString t = i18n( "%1/%2" );
-	    t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
+	    t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 );
 	    drawSizePreview( pos, t );
 	}
 	unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) );
@@ -1359,7 +1359,7 @@ void FormWindow::endRectDraw()
 
     if ( oldRectValid )
 	unclippedPainter->drawRect( currRect );
-    drawSizePreview( TQPoint(-1,-1), TQString::null );
+    drawSizePreview( TQPoint(-1,-1), TQString() );
     endUnclippedPainter();
 }
 
@@ -1373,8 +1373,8 @@ void FormWindow::selectWidgets()
 		TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) );
 		p = mapFromGlobal( p );
 		TQRect r( p, ( (TQWidget*)o )->size() );
-		if ( r.intersects( currRect ) && !r.contains( currRect ) )
-		    selectWidget( (TQWidget*)o );
+		if ( r.intersects( currRect ) && !r.tqcontains( currRect ) )
+		    selectWidget( TQT_TQOBJECT(o) );
 	    }
 	}
 	delete l;
@@ -1385,8 +1385,8 @@ void FormWindow::selectWidgets()
 bool FormWindow::isWidgetSelected( TQObject *w )
 {
     if ( w->isWidgetType() )
-	return usedSelections.find( (TQWidget*)w ) != 0;
-    return FALSE; // #### do stuff for QObjects
+	return usedSelections.tqfind( (TQWidget*)w ) != 0;
+    return FALSE; // #### do stuff for TQObjects
 }
 
 void FormWindow::moveSelectedWidgets( int dx, int dy )
@@ -1395,7 +1395,7 @@ void FormWindow::moveSelectedWidgets( int dx, int dy )
     for ( ; it.current(); ++it ) {
 	WidgetSelection *s = it.current();
 	TQWidget *w = s->widget();
-	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
 	w->move( w->x() + dx, w->y() + dy );
 	s->updateGeometry();
@@ -1428,7 +1428,7 @@ void FormWindow::raiseChildSelections( TQWidget *w )
 
     TQPtrDictIterator<WidgetSelection> it( usedSelections );
     for ( ; it.current(); ++it ) {
-	if ( l->findRef( it.current()->widget() ) != -1 )
+	if ( l->tqfindRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 )
 	    it.current()->show();
     }
     delete l;
@@ -1440,7 +1440,7 @@ void FormWindow::updateChildSelections( TQWidget *w )
     if ( l ) {
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( o->isWidgetType() &&
-		 insertedWidgets.find( (TQWidget*)o ) )
+		 insertedWidgets.tqfind( (TQWidget*)o ) )
 		updateSelection( (TQWidget*)o );
 	}
 	delete l;
@@ -1451,7 +1451,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
 {
     checkedSelectionsForMove = TRUE;
 
-    TQObjectList *l = w->parentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
+    TQObjectList *l = w->tqparentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
     moving.clear();
     if ( l ) {
 	TQPtrDictIterator<WidgetSelection> it( usedSelections );
@@ -1460,11 +1460,11 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
 	    if ( it.current()->widget() == mainContainer() )
 		continue;
 	    ++it;
-	    if ( l->find( sel->widget() ) == -1 ) {
-		if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout )
+	    if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) {
+		if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout )
 		    sel->setWidget( 0 );
 	    } else {
-		if ( WidgetFactory::layoutType( sel->widget()->parentWidget() ) == WidgetFactory::NoLayout ) {
+		if ( WidgetFactory::tqlayoutType( sel->widget()->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 		    moving.insert( sel->widget(), sel->widget()->pos() );
 		    sel->widget()->raise();
 		    raiseChildSelections( sel->widget() );
@@ -1483,10 +1483,10 @@ void FormWindow::deleteWidgets()
     TQPtrDictIterator<WidgetSelection> it( usedSelections );
     for ( ; it.current(); ++it ) {
 	TQWidget *tb = 0;
-	if ( !( tb = mainWindow()->isAToolBarChild( it.current()->widget() ) ) )
+	if ( !( tb = mainWindow()->isAToolBarChild( TQT_TQOBJECT(it.current()->widget()) ) ) )
 	     widgets.append( it.current()->widget() );
 	else
-	    ( (QDesignerToolBar*)tb )->removeWidget( it.current()->widget() );
+	    ( (TQDesignerToolBar*)tb )->removeWidget( it.current()->widget() );
     }
 
     if ( widgets.isEmpty() )
@@ -1502,13 +1502,13 @@ void FormWindow::editAdjustSize()
     TQPtrList<Command> commands;
     TQWidgetList widgets = selectedWidgets();
     if ( widgets.isEmpty() ) {
-	TQRect oldr = geometry();
+	TQRect oldr = tqgeometry();
 	mainContainer()->adjustSize();
 	resize( mainContainer()->size() );
 	// check whether our own size constraint hit us
 	if ( size() != mainContainer()->size() )
 	    mainContainer()->resize( size() );
-	TQRect nr = geometry();
+	TQRect nr = tqgeometry();
 	if ( oldr != nr ) {
 	    ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr );
 	    commandHistory()->addCommand( cmd );
@@ -1516,11 +1516,11 @@ void FormWindow::editAdjustSize()
 	return;
     }
     for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) {
-	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
-	TQRect oldr = w->geometry();
+	TQRect oldr = w->tqgeometry();
 	w->adjustSize();
-	TQRect nr = w->geometry();
+	TQRect nr = w->tqgeometry();
 	if ( oldr != nr )
 	    commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) );
     }
@@ -1569,7 +1569,7 @@ void FormWindow::invalidCheckedSelections()
 
 void FormWindow::checkPreviewGeometry( TQRect &r )
 {
-    if ( !rect().contains( r ) ) {
+    if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( r ) ) {
 	if ( r.left() < rect().left() )
 	    r.moveTopLeft( TQPoint( 0, r.top() ) );
 	if ( r.right() > rect().right()  )
@@ -1591,9 +1591,9 @@ void FormWindow::focusOutEvent( TQFocusEvent * )
 {
     if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
     }
 }
 
@@ -1605,14 +1605,14 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
     if ( isVisible() )
 	formFile()->setModified( TRUE, FormFile::WFormWindow );
 
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     windowsRepaintWorkaroundTimer->start( 100, TRUE );
 #endif
 }
 
 void FormWindow::windowsRepaintWorkaroundTimerTimeout()
 {
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	flickerfree_update( (TQWidget*)o );
@@ -1632,8 +1632,8 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const
     if ( !o || !o->isWidgetType() )
 	return 0;
     TQWidget *w = (TQWidget*)o;
-    while ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] || isCentralWidget( w ) )
-	w = (TQWidget*)w->parent();
+    while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) )
+	w = (TQWidget*)w->tqparent();
     return w;
 }
 
@@ -1643,7 +1643,7 @@ void FormWindow::emitShowProperties( TQObject *w )
 	TQObject *opw = propertyWidget;
 	propertyWidget = w;
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
     }
     showPropertiesTimer->stop();
 //    showPropertiesTimer->start( 0, TRUE );
@@ -1700,11 +1700,11 @@ void FormWindow::currentToolChanged()
     case BUDDY_TOOL:
 	restoreConnectionLine();
 	if ( startWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->tqparentWidget(),
 					   ( (TQWidget*)startWidget )->pos() ),
 				( (TQWidget*)startWidget )->size() ) );
 	if ( endWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->tqparentWidget(),
 					   ( (TQWidget*)endWidget )->pos() ),
 				( (TQWidget*)endWidget )->size() ) );
 	endUnclippedPainter();
@@ -1735,7 +1735,7 @@ void FormWindow::currentToolChanged()
     switch ( currTool ) {
     case POINTER_TOOL:
 	if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) )
-	    emitShowProperties( mainContainer() );
+	    emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	restoreCursors( this, this );
 	break;
     case ORDER_TOOL:
@@ -1744,7 +1744,7 @@ void FormWindow::currentToolChanged()
 	    orderedWidgets.clear();
 	    showOrderIndicators();
 	    if ( mainWindow()->formWindow() == this )
-		emitShowProperties( mainContainer() );
+		emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	    setCursorToAll( ArrowCursor, this );
 	}
 	break;
@@ -1756,13 +1756,13 @@ void FormWindow::currentToolChanged()
 	    mainWindow()->statusMessage( i18n( "Drag a line to set a buddy...") );
 	setCursorToAll( CrossCursor, this );
 	if ( mainWindow()->formWindow() == this )
-	    emitShowProperties( mainContainer() );
+	    emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	break;
     default:
-	mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) );
+	mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).tqarg( WidgetDatabase::toolTip( currTool ).lower() ) );
 	setCursorToAll( CrossCursor, this );
 	if ( mainWindow()->formWindow() == this )
-	    emitShowProperties( mainContainer() );
+	    emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	break;
     }
 }
@@ -1779,10 +1779,10 @@ void FormWindow::showOrderIndicators()
 	    TQWidget* w = (TQWidget*) o;
 	    if ( w->isShown() &&
 		 insertedWidgets[ (void*)w ]  &&
-		 w->focusPolicy() != NoFocus ) {
+		 w->focusPolicy() != TQ_NoFocus ) {
 		OrderIndicator* ind = new OrderIndicator( order++, w, this );
 		orderIndicators.append( ind );
-		if ( stackedWidgets.findRef( w ) == -1 )
+		if ( stackedWidgets.tqfindRef( w ) == -1 )
 		    stackedWidgets.append( w );
 	    }
 	}
@@ -1824,7 +1824,7 @@ bool FormWindow::checkCustomWidgets()
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	if ( it.current()->isA( "CustomWidget" ) ) {
-	    TQString className = WidgetFactory::classNameOf( it.current() );
+	    TQString className = WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) );
 	    if ( !MetaDataBase::hasCustomWidget( className ) )
 		missingCustomWidgets << className;
 	}
@@ -1832,7 +1832,7 @@ bool FormWindow::checkCustomWidgets()
 
     if ( !missingCustomWidgets.isEmpty() ) {
 	TQString txt = i18n( "The following custom widgets are used in '%1',\n"
-			  "but are not known to Qt Designer:\n" ).arg( name() );
+			  "but are not known to TQt Designer:\n" ).tqarg( name() );
 	for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit )
 	    txt += "   " + *sit + "\n";
 	txt += i18n( "If you save this form and generate code for it using uic, \n"
@@ -1861,7 +1861,7 @@ int FormWindow::numSelectedWidgets() const
 
 TQString FormWindow::copy()
 {
-    CHECK_MAINWINDOW_VALUE( TQString::null );
+    CHECK_MAINWINDOW_VALUE( TQString() );
     Resource resource( mainWindow() );
     resource.setWidget( this );
     return resource.copy();
@@ -1881,14 +1881,14 @@ void FormWindow::lowerWidgets()
 
 void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w )
 {
-    int i = txt.find( "&" );
+    int i = txt.tqfind( "&" );
     if ( i == -1 )
 	return;
     TQChar c = txt[ i + 1 ];
     if ( c.isNull() || c == '&' )
 	return;
     c = c.lower();
-    TQMap<TQChar, TQWidgetList >::Iterator it = accels.find( c );
+    TQMap<TQChar, TQWidgetList >::Iterator it = accels.tqfind( c );
     if ( it == accels.end() ) {
 	TQWidgetList wl;
 	wl.append( w );
@@ -1910,18 +1910,18 @@ void FormWindow::checkAccels()
 		 insertedWidgets[ (void*)o ] ) {
 		TQWidget *w = (TQWidget*)o;
 		const TQMetaProperty* text =
-		    w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE );
 		const TQMetaProperty* title =
-		    w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE );
 		const TQMetaProperty* pageTitle =
-		    w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE );
 		if ( text )
 		    find_accel( w->property( "text" ).toString(), accels, w );
 		if ( title )
 		    find_accel( w->property( "title" ).toString(), accels, w );
 		if ( pageTitle )
 		    find_accel( w->property( "pageTitle" ).toString(), accels, w );
-	    } else if ( ::qt_cast<MenuBarEditor*>(o) ) {
+	    } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) {
 		((MenuBarEditor *)o)->checkAccels( accels );
 	    }
 	}
@@ -1935,13 +1935,13 @@ void FormWindow::checkAccels()
 	    ok = FALSE;
 	    switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ),
 					       i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count()
-						   ).arg( it.key().upper() ),
+						   ).tqarg( it.key().upper() ),
 					       i18n( "&Select" ),
-					       i18n( "&Cancel" ), TQString::null, 2 ) ) {
+					       i18n( "&Cancel" ), TQString(), 2 ) ) {
 	    case 0: // select
 		clearSelection( FALSE );
 		for ( wid = (*it).first(); wid; wid = (*it).next() )
-		    selectWidget( wid, TRUE );
+		    selectWidget( TQT_TQOBJECT(wid), TRUE );
 		return;
 	    case 1: // cancel
 		return;
@@ -1966,12 +1966,12 @@ void FormWindow::raiseWidgets()
     commandHistory()->addCommand( cmd );
 }
 
-void FormWindow::paste( const TQString &cb, TQWidget *parent )
+void FormWindow::paste( const TQString &cb, TQWidget *tqparent )
 {
     CHECK_MAINWINDOW;
     Resource resource( mainWindow() );
     resource.setWidget( this );
-    resource.paste( cb, parent );
+    resource.paste( cb, tqparent );
 }
 
 void FormWindow::selectAll()
@@ -1983,7 +1983,7 @@ void FormWindow::selectAll()
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( ( (TQWidget*)o )->isVisibleTo( this ) &&
 		 insertedWidgets[ (void*)o ] ) {
-		selectWidget( (TQWidget*)o );
+		selectWidget( TQT_TQOBJECT(o) );
 	    }
 	}
 	delete l;
@@ -1996,47 +1996,47 @@ void FormWindow::selectAll()
     emitSelectionChanged();
 }
 
-void FormWindow::layoutHorizontal()
+void FormWindow::tqlayoutHorizontal()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Horizontally" ),
+    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay OutQt::Horizontally" ),
 								this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutVertical()
+void FormWindow::tqlayoutVertical()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Vertically" ),
+    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay OutQt::Vertically" ),
 							    this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutHorizontalSplit()
+void FormWindow::tqlayoutHorizontalSplit()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay Out Horizontally (in splitter)" ),
+    LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay OutQt::Horizontally (in splitter)" ),
 									  this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutVerticalSplit()
+void FormWindow::tqlayoutVerticalSplit()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay Out Vertically (in splitter)" ),
+    LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay OutQt::Vertically (in splitter)" ),
 								      this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutGrid()
+void FormWindow::tqlayoutGrid()
 {
     int xres = grid().x();
     int yres = grid().y();
@@ -2049,63 +2049,63 @@ void FormWindow::layoutGrid()
     cmd->execute();
 }
 
-void FormWindow::layoutHorizontalContainer( TQWidget *w )
+void FormWindow::tqlayoutHorizontalContainer( TQWidget *w )
 {
     if ( w == this )
 	w = mainContainer();
-    TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children();
-    if ( !l )
+    TQObjectList l = WidgetFactory::containerOfWidget(w)->childrenListObject();
+    if ( l.isEmpty() )
 	return;
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
-    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Children Horizontally" ),
+    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out ChildrenQt::Horizontally" ),
 								this, mainContainer(), w, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutVerticalContainer( TQWidget *w )
+void FormWindow::tqlayoutVerticalContainer( TQWidget *w )
 {
     if ( w == this )
 	w = mainContainer();
-    TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children();
-    if ( !l )
+    TQObjectList l = WidgetFactory::containerOfWidget(w)->childrenListObject();
+    if ( l.isEmpty() )
 	return;
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
-    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Children Vertically" ),
+    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out ChildrenQt::Vertically" ),
 							    this, mainContainer(), w, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutGridContainer( TQWidget *w )
+void FormWindow::tqlayoutGridContainer( TQWidget *w )
 {
     if ( w == this )
 	w = mainContainer();
     int xres = grid().x();
     int yres = grid().y();
 
-    TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children();
-    if ( !l )
+    TQObjectList l = WidgetFactory::containerOfWidget(w)->childrenListObject();
+    if ( l.isEmpty() )
 	return;
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
     LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out Children in a Grid" ),
@@ -2125,15 +2125,15 @@ void FormWindow::breakLayout( TQWidget *w )
     for (;;) {
 	if ( !w || w == this )
 	    break;
-	if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout &&
-	     WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
+	if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout &&
+	     WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
 	    Command *cmd = breakLayoutCommand( w );
 	    if ( cmd )
 		commands.insert( 0, cmd );
-	    if ( !::qt_cast<QLayoutWidget*>(w) && !::qt_cast<TQSplitter*>(w) )
+	    if ( !::tqqt_cast<TQLayoutWidget*>(w) && !::tqqt_cast<TQSplitter*>(w) )
 		break;
 	}
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 
     if ( commands.isEmpty() )
@@ -2148,16 +2148,16 @@ void FormWindow::breakLayout( TQWidget *w )
 BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w )
 {
     CHECK_MAINWINDOW_VALUE( 0 );
-    TQObjectList *l = (TQObjectList*)w->children();
-    if ( !l )
+    TQObjectList l = w->childrenListObject();
+    if ( l.isEmpty() )
 	return 0;
 
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
-	     !mainWindow()->isAToolBarChild( (TQWidget*)o ) &&
+	     !mainWindow()->isAToolBarChild( TQT_TQOBJECT(o) ) &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
     return new BreakLayoutCommand( i18n( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets );
@@ -2190,7 +2190,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) ) {
+	     insertedWidgets.tqfind( (TQWidget*)o ) ) {
 	    delete l;
 	    return TRUE;
 	}
@@ -2202,11 +2202,11 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const
 
 bool FormWindow::allowMove( TQWidget *w )
 {
-    w = w->parentWidget();
+    w = w->tqparentWidget();
     while ( w ) {
-	if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout )
+	if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout )
 	    return TRUE;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     return FALSE;
 }
@@ -2221,7 +2221,7 @@ void FormWindow::editConnections()
 
     ConnectionDialog dlg( mainwindow );
     mainWindow()->statusMessage( i18n( "Edit connections...") );
-    dlg.addConnection( startWidget, endWidget, TQString::null, TQString::null );
+    dlg.addConnection( TQT_TQOBJECT(startWidget), TQT_TQOBJECT(endWidget), TQString(), TQString() );
     TQTimer::singleShot( 0, &dlg, TQT_SLOT(ensureConnectionVisible()) );
     dlg.exec();
 }
@@ -2239,8 +2239,8 @@ void FormWindow::restoreConnectionLine()
     if (!unclippedPainter || !buffer) // designer will occasionally crash if buffer is not tested to be non-zero
 	return;
 
-    int a =QABS( startPos.x() - currentPos.x() );
-    int b = QABS( startPos.y() - currentPos.y() );
+    int a =TQABS( startPos.x() - currentPos.x() );
+    int b = TQABS( startPos.y() - currentPos.y() );
     TQRect r( startPos, currentPos );
 
     if ( a < 32 || b < 32 ) { // special case: vertical or horizontal line
@@ -2280,7 +2280,7 @@ void FormWindow::restoreConnectionLine()
 
     w = h = 64;
     r = r.normalize();
-    while ( r.contains( p ) ) {
+    while ( r.tqcontains( p ) ) {
 	unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) );
 	unclippedPainter->setPen( red );
 	p.setX( p.x() + dx );
@@ -2361,7 +2361,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 	int num  = 1;
 	TQPtrDictIterator<TQWidget> it( insertedWidgets );
 	for ( ; it.current();) {
-	    if ( it.current() != w &&
+	    if ( TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) &&
 		 qstrcmp( it.current()->name(), s.latin1() ) == 0 ) {
 		found = TRUE;
 		if ( !changeIt )
@@ -2393,7 +2393,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 		}
 	    }
 	}
-	if ( ::qt_cast<TQMainWindow*>(mainContainer()) && !found ) {
+	if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && !found ) {
 	    TQObjectList *l = mainContainer()->queryList( "PopupMenuEditor" );
 	    for ( TQObject *o = l->first(); o; o = l->next() ) {
 		if ( o != w &&
@@ -2407,7 +2407,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 	    }
 	    delete l;
 	}
-	if ( ::qt_cast<TQMainWindow*>(mainContainer()) ) {
+	if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) ) {
 	    if ( !found ) {
 		TQObjectList *l = mainContainer()->queryList( TQDOCKWINDOW_OBJECT_NAME_STRING, 0, TRUE );
 		for ( TQObject *o = l->first(); o; o = l->next() ) {
@@ -2435,7 +2435,7 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w )
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	if ( it.current()->isA( "CustomWidget" ) ) {
-	    if ( qstrcmp( WidgetFactory::classNameOf( it.current() ), w->className.utf8() ) == 0 )
+	    if ( qstrcmp( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ), w->className.utf8() ) == 0 )
 		return TRUE;
 	}
     }
@@ -2445,13 +2445,13 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w )
 
 bool FormWindow::isDatabaseWidgetUsed() const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList dbClasses;
     dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	TQString c( it.current()->className() );
-	if ( dbClasses.contains( c ) > 0 ) {
+	if ( dbClasses.tqcontains( c ) > 0 ) {
 	    return TRUE;
 	}
     }
@@ -2461,8 +2461,8 @@ bool FormWindow::isDatabaseWidgetUsed() const
 
 bool FormWindow::isDatabaseAware() const
 {
-#ifndef QT_NO_SQL
-    if ( TQString(mContainer->className()) == "QDesignerDataBrowser" || TQString(mContainer->className()) == "QDesignerDataView" )
+#ifndef TQT_NO_SQL
+    if ( TQString(mContainer->className()) == "TQDesignerDataBrowser" || TQString(mContainer->className()) == "TQDesignerDataView" )
 	return TRUE;
     return isDatabaseWidgetUsed();
 #else
@@ -2473,7 +2473,7 @@ bool FormWindow::isDatabaseAware() const
 void FormWindow::visibilityChanged()
 {
     if ( currTool != ORDER_TOOL ) {
-	emitUpdateProperties( currentWidget() );
+	emitUpdateProperties( TQT_TQOBJECT(currentWidget()) );
     } else {
 	updateOrderIndicators();
 	repositionOrderIndicators();
@@ -2491,9 +2491,9 @@ TQPoint FormWindow::mapToForm( const TQWidget* w, const TQPoint&  pos ) const
 {
     TQPoint p = pos;
     const TQWidget* i = w;
-    while ( i && !i->isTopLevel() && !isMainContainer( (TQWidget*)i ) ) {
+    while ( i && !i->isTopLevel() && !isMainContainer( TQT_TQOBJECT(const_cast<TQWidget*>(i)) ) ) {
 	p = i->mapToParent( p );
-	i = i->parentWidget();
+	i = i->tqparentWidget();
     }
     return mapFromGlobal( w->mapToGlobal( pos ) );
 }
@@ -2503,7 +2503,7 @@ static int widgetDepth( TQWidget *w )
     int d = -1;
     while ( w && !w->isTopLevel() ) {
 	d++;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 
     return d;
@@ -2514,7 +2514,7 @@ static bool isChildOf( TQWidget *c, TQWidget *p )
     while ( c && !c->isTopLevel() ) {
 	if ( c == p )
 	    return TRUE;
-	c = c->parentWidget();
+	c = c->tqparentWidget();
     }
     return FALSE;
 }
@@ -2525,36 +2525,36 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf )
     TQWidget *container = 0;
     int depth = -1;
     TQWidgetList selected = selectedWidgets();
-    if ( rect().contains( mapFromGlobal( pos ) ) ) {
+    if ( TQT_TQRECT_OBJECT(rect()).tqcontains( mapFromGlobal( pos ) ) ) {
 	container = mainContainer();
 	depth = widgetDepth( container );
     }
 
     for ( ; it.current(); ++it ) {
-	if ( ::qt_cast<QLayoutWidget*>(it.current())
-	  || ::qt_cast<TQSplitter*>(it.current()) )
+	if ( ::tqqt_cast<TQLayoutWidget*>(it.current())
+	  || ::tqqt_cast<TQSplitter*>(it.current()) )
 	    continue;
 	if ( !it.current()->isVisibleTo( this ) )
 	    continue;
-	if ( selected.find( it.current() ) != -1 )
+	if ( selected.tqfind( it.current() ) != -1 )
 	    continue;
-	if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) &&
+	if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ) ) ) &&
 	     it.current() != mainContainer() )
 	    continue;
 
 	// the rectangles of all ancestors of the container must contain the insert position
 	TQWidget *w = it.current();
 	while ( w && !w->isTopLevel() ) {
-	    if ( !w->rect().contains( ( w->mapFromGlobal( pos ) ) ) )
+	    if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) )
 		break;
-	    w = w->parentWidget();
+	    w = w->tqparentWidget();
 	}
 	if ( !( w == 0 || w->isTopLevel() ) ) continue; // we did not get through the full while loop
 
 	int wd = widgetDepth( it.current() );
 	if ( wd == depth && container ) {
-	    if ( ( (TQObjectList*)it.current()->parentWidget()->children() )->find( it.current() ) >
-		 ( (TQObjectList*)container->parentWidget()->children() )->find( container ) )
+	    if ( ( it.current()->tqparentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) >
+		 ( container->tqparentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) )
 		wd++;
 	}
 	if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) {
@@ -2568,7 +2568,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf )
 
 bool FormWindow::isMainContainer( TQObject *w ) const
 {
-    return w && w->isWidgetType() && ( w == (TQWidget*)this || w == mainContainer() );
+    return w && w->isWidgetType() && ( TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == mainContainer() );
 }
 
 void FormWindow::setMainContainer( TQWidget *w )
@@ -2576,34 +2576,34 @@ void FormWindow::setMainContainer( TQWidget *w )
     bool resetPropertyWidget = isMainContainer( propertyWidget );
     if ( mContainer )
 	insertedWidgets.remove( mContainer );
-    if ( propertyWidget == mContainer )
+    if ( TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer) )
 	propertyWidget = 0;
     delete mContainer;
     mContainer = w;
     insertedWidgets.insert( mContainer, mContainer );
-    delete layout();
+    delete tqlayout();
     TQHBoxLayout *l = new TQHBoxLayout( this );
     l->addWidget( w );
     if ( resetPropertyWidget ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mContainer;
+	propertyWidget = TQT_TQOBJECT(mContainer);
 	if ( opw && opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
     }
     if ( project() ) {
 	LanguageInterface *iface = MetaDataBase::languageInterface( project()->language() );
 	if ( iface && !project()->isCpp() && !isFake() ) {
-	    if ( !MetaDataBase::hasFunction( this, "init()" ) )
-		MetaDataBase::addFunction( this, "init()", "", "private", "function",
+	    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "init()" ) )
+		MetaDataBase::addFunction( TQT_TQOBJECT(this), "init()", "", "private", "function",
 					   project()->language(), "void" );
-	    if ( !MetaDataBase::hasFunction( this, "destroy()" ) )
-		MetaDataBase::addFunction( this, "destroy()", "", "private", "function",
+	    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "destroy()" ) )
+		MetaDataBase::addFunction( TQT_TQOBJECT(this), "destroy()", "", "private", "function",
 					   project()->language(), "void" );
-	    if ( !MetaDataBase::hasConnection( this, mainContainer(), "shown()", mainContainer(), "init" ) )
-		MetaDataBase::addConnection( this, mainContainer(), "shown()", mainContainer(), "init" );
-	    if ( !MetaDataBase::hasConnection( this, mainContainer(), "destroyed()", mainContainer(), "destroy"  ) )
-		MetaDataBase::addConnection( this, mainContainer(), "destroyed()",
-					     mainContainer(), "destroy" );
+	    if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" ) )
+		MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" );
+	    if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()", TQT_TQOBJECT(mainContainer()), "destroy"  ) )
+		MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()",
+					     TQT_TQOBJECT(mainContainer()), "destroy" );
 	}
     }
 }
@@ -2689,17 +2689,17 @@ DesignerFormWindow *FormWindow::iFace()
 
 bool FormWindow::isCentralWidget( TQObject *w ) const
 {
-    if ( !::qt_cast<TQMainWindow*>(mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(mainContainer()) )
 	return FALSE;
-    return w == ( (TQMainWindow*)mainContainer() )->centralWidget();
+    return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(( (TQMainWindow*)mainContainer() )->centralWidget());
 }
 
-int FormWindow::layoutDefaultSpacing() const
+int FormWindow::tqlayoutDefaultSpacing() const
 {
     return defSpacing;
 }
 
-int FormWindow::layoutDefaultMargin() const
+int FormWindow::tqlayoutDefaultMargin() const
 {
     return defMargin;
 }
@@ -2758,17 +2758,15 @@ void FormWindow::setFormFile( FormFile *f )
 
 bool FormWindow::canBeBuddy( const TQWidget *w ) const
 {
-    return w->focusPolicy() != TQWidget::NoFocus;
+    return w->focusPolicy() != TQ_NoFocus;
 }
 
 bool FormWindow::event( TQEvent *e )
 {
     if (e->type() == TQEvent::ShowMaximized)
     {
-#if QT_VERSION >= 0x030300
         if ( isMaximized() )
             setWindowState( windowState() & ~WindowMaximized | WindowActive);
-#endif
         return true;
     }
     return TQWidget::event(e);
diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h
index c241621b..e6d9c65e 100644
--- a/kdevdesigner/designer/formwindow.h
+++ b/kdevdesigner/designer/formwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,20 +56,21 @@ class Project;
 struct DesignerFormWindow;
 class FormFile;
 
-#if defined(Q_CC_MSVC) || defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_CC_MSVC) || defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include "orderindicator.h"
 #else
 class OrderIndicator;
 #endif
 
-class FormWindow : public QWidget
+class FormWindow : public TQWidget
 {
     Q_OBJECT
-    Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+  TQ_OBJECT
+    TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
-    FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 );
-    FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 );
+    FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name = 0 );
+    FormWindow( FormFile *f, TQWidget *tqparent, const char *name = 0 );
     ~FormWindow();
 
     void init();
@@ -86,20 +87,20 @@ public:
     virtual void undo();
     virtual void redo();
     virtual TQString copy();
-    virtual void paste( const TQString &cb, TQWidget *parent );
+    virtual void paste( const TQString &cb, TQWidget *tqparent );
     virtual void lowerWidgets();
     virtual void raiseWidgets();
     virtual void checkAccels();
 
-    virtual void layoutHorizontal();
-    virtual void layoutVertical();
-    virtual void layoutHorizontalSplit();
-    virtual void layoutVerticalSplit();
-    virtual void layoutGrid();
+    virtual void tqlayoutHorizontal();
+    virtual void tqlayoutVertical();
+    virtual void tqlayoutHorizontalSplit();
+    virtual void tqlayoutVerticalSplit();
+    virtual void tqlayoutGrid();
 
-    virtual void layoutHorizontalContainer( TQWidget *w );
-    virtual void layoutVerticalContainer( TQWidget *w );
-    virtual void layoutGridContainer( TQWidget *w );
+    virtual void tqlayoutHorizontalContainer( TQWidget *w );
+    virtual void tqlayoutVerticalContainer( TQWidget *w );
+    virtual void tqlayoutGridContainer( TQWidget *w );
 
     virtual void breakLayout( TQWidget *w );
 
@@ -107,7 +108,7 @@ public:
     virtual void selectAll();
     virtual void updateSelection( TQWidget *w );
     virtual void raiseSelection( TQWidget *w );
-    virtual void repaintSelection( TQWidget *w );
+    virtual void tqrepaintSelection( TQWidget *w );
     virtual void clearSelection( bool changePropertyDisplay = TRUE );
     virtual void selectWidgets();
     bool isWidgetSelected( TQObject *w );
@@ -191,8 +192,8 @@ public:
 
     DesignerFormWindow *iFace();
 
-    int layoutDefaultSpacing() const;
-    int layoutDefaultMargin() const;
+    int tqlayoutDefaultSpacing() const;
+    int tqlayoutDefaultMargin() const;
     void setLayoutDefaultSpacing( int s );
     void setLayoutDefaultMargin( int s );
     TQString spacingFunction() const;
diff --git a/kdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui
index f2acf011..dbd319c8 100644
--- a/kdevdesigner/designer/gotolinedialog.ui
+++ b/kdevdesigner/designer/gotolinedialog.ui
@@ -29,8 +29,8 @@
 <include location="local" implDecl="in declaration">gotolinedialog.ui.h</include>
 <forward>struct EditorInterface;</forward>
 <variable>EditorInterface *editor;</variable>
-<layoutdefaults spacing="6" margin="11"/>
-<widget class="QDialog">
+<tqlayoutdefaults spacing="6" margin="11"/>
+<widget class="TQDialog">
     <property name="name">
         <cstring>GotoLineDialog</cstring>
     </property>
@@ -55,7 +55,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <cstring>spinLine</cstring>
             </property>
         </widget>
-        <widget class="QSpinBox" row="0" column="1">
+        <widget class="TQSpinBox" row="0" column="1">
             <property name="name">
                 <cstring>spinLine</cstring>
             </property>
@@ -77,7 +77,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -101,14 +101,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kdevdesigner/designer/gotolinedialog.ui.h b/kdevdesigner/designer/gotolinedialog.ui.h
index 9ee0ef39..4ddf4114 100644
--- a/kdevdesigner/designer/gotolinedialog.ui.h
+++ b/kdevdesigner/designer/gotolinedialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index bda24784..7428e883 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -66,17 +66,17 @@
 
 TQListViewItem *newItem = 0;
 
-static QPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0;
+static TQPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0;
 
-HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
+HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
 			      const TQString &txt1, const TQString &txt2, const TQString &txt3 )
-    : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type )
+    : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type )
 {
 }
 
-HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
+HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
 			      const TQString &txt1, const TQString &txt2, const TQString &txt3 )
-    : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type )
+    : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type )
 {
 }
 
@@ -84,8 +84,8 @@ void HierarchyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 {
     TQColorGroup g( cg );
     g.setColor( TQColorGroup::Base, backgroundColor() );
-    g.setColor( TQColorGroup::Foreground, Qt::black );
-    g.setColor( TQColorGroup::Text, Qt::black );
+    g.setColor( TQColorGroup::Foreground, TQt::black );
+    g.setColor( TQColorGroup::Text, TQt::black );
     TQString txt = text( 0 );
     if ( rtti() == Function &&
 	 MainWindow::self->currProject()->isCpp() &&
@@ -172,8 +172,8 @@ void HierarchyItem::cancelRename( int col )
 
 
 
-HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects )
-    : TQListView( parent ), formWindow( fw )
+HierarchyList::HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects )
+    : TQListView( tqparent ), formWindow( fw )
 {
     DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance());
     DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance());
@@ -249,39 +249,39 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i )
     TQObject *o = findObject( i );
     if ( !o )
 	return 0;
-    if ( formWindow == o ) {
+    if ( TQT_BASE_OBJECT(formWindow) == TQT_BASE_OBJECT(o) ) {
 	if ( deselect )
 	    formWindow->clearSelection( FALSE );
-	formWindow->emitShowProperties( formWindow );
+	formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) );
 	return 0;
     }
     if ( o->isWidgetType() ) {
 	TQWidget *w = (TQWidget*)o;
-	if ( !formWindow->widgets()->find( w ) ) {
-	    if ( ::qt_cast<TQWidgetStack*>(w->parent()) ) {
-		if (::qt_cast<TQTabWidget*>(w->parent()->parent()) ) {
-		    ((TQTabWidget*)w->parent()->parent())->showPage( w );
-		    o = (TQWidget*)w->parent()->parent();
-		    formWindow->emitUpdateProperties( formWindow->currentWidget() );
-		} else if ( ::qt_cast<TQWizard*>(w->parent()->parent()) ) {
-		    ((QDesignerWizard*)w->parent()->parent())->
-			setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) );
-		    o = (TQWidget*)w->parent()->parent();
-		    formWindow->emitUpdateProperties( formWindow->currentWidget() );
+	if ( !formWindow->widgets()->tqfind( w ) ) {
+	    if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) {
+		if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) {
+		    ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w );
+		    o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent());
+		    formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
+		} else if ( ::tqqt_cast<TQWizard*>(w->tqparent()->tqparent()) ) {
+		    ((TQDesignerWizard*)w->tqparent()->tqparent())->
+			setCurrentPage( ( (TQDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) );
+		    o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent());
+		    formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
 		} else {
-		    ( (TQWidgetStack*)w->parent() )->raiseWidget( w );
-		    if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) )
-			( (QDesignerWidgetStack*)w->parent() )->updateButtons();
+		    ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w );
+		    if ( (TQWidgetStack*)w->tqparent()->isA( "TQDesignerWidgetStack" ) )
+			( (TQDesignerWidgetStack*)w->tqparent() )->updateButtons();
 		}
-	    } else if ( ::qt_cast<TQMenuBar*>(w) || ::qt_cast<TQDockWindow*>(w) ) {
-		formWindow->setActiveObject( w );
-	    } else if ( ::qt_cast<TQPopupMenu*>(w) ) {
+	    } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) {
+		formWindow->setActiveObject( TQT_TQOBJECT(w) );
+	    } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 		return 0; // ### we could try to find our menu bar and change the currentMenu to our index
 	    } else {
 		return 0;
 	    }
 	}
-    } else if ( ::qt_cast<TQAction*>(o) ) {
+    } else if ( ::tqqt_cast<TQAction*>(o) ) {
 	MainWindow::self->actioneditor()->setCurrentAction( (TQAction*)o );
 	deselect = TRUE;
     }
@@ -300,10 +300,10 @@ void HierarchyList::objectDoubleClicked( TQListViewItem *i )
 	return;
     if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) {
 	TQWidget *w = (TQWidget*)o;
-	if ( !w->parentWidget() ||
-	     WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
+	if ( !w->tqparentWidget() ||
+	     WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
 	    w->raise();
-	formWindow->selectWidget( w, TRUE );
+	formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
     }
 }
 
@@ -314,7 +314,7 @@ void HierarchyList::objectClicked( TQListViewItem *i )
 	return;
     if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) {
 	TQWidget *w = (TQWidget*)o;
-	formWindow->selectWidget( w, TRUE );
+	formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
     }
 }
 
@@ -352,7 +352,7 @@ void HierarchyList::changeNameOf( TQObject *o, const TQString &name )
 
 void HierarchyList::changeDatabaseOf( TQObject *o, const TQString &info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !formWindow->isDatabaseAware() )
 	return;
     TQListViewItem *item = findItem( o );
@@ -370,7 +370,7 @@ void HierarchyList::setup()
 	return;
     clear();
     TQWidget *w = formWindow->mainContainer();
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( formWindow->isDatabaseAware() ) {
 	if ( columns() == 2 ) {
 	    addColumn( i18n( "Database" ) );
@@ -388,7 +388,7 @@ void HierarchyList::setup()
     if ( !widgetStacks )
 	widgetStacks = new TQPtrList<TQWidgetStack>;
     if ( w )
-	insertObject( w, 0 );
+	insertObject( TQT_TQOBJECT(w), 0 );
     widgetStacks->clear();
 }
 
@@ -397,13 +397,13 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b )
     TQListView::setOpen( i, b );
 }
 
-void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
+void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
 {
     if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) )
 	return;
     bool fakeMainWindow = FALSE;
-    if ( ::qt_cast<TQMainWindow*>(o) ) {
-	TQObject *cw = ( (TQMainWindow*)o )->centralWidget();
+    if ( ::tqqt_cast<TQMainWindow*>(o) ) {
+	TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
 	if ( cw ) {
 	    o = cw;
 	    fakeMainWindow = TRUE;
@@ -411,8 +411,8 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
     TQListViewItem *item = 0;
     TQString className = WidgetFactory::classNameOf( o );
-    if ( ::qt_cast<QLayoutWidget*>(o) ) {
-	switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
+    if ( ::tqqt_cast<TQLayoutWidget*>(o) ) {
+	switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) {
 	case WidgetFactory::HBox:
 	    className = "HBox";
 	    break;
@@ -428,73 +428,73 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
 
     TQString dbInfo;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     dbInfo = MetaDataBase::fakeProperty( o, "database" ).toStringList().join(".");
 #endif
 
     TQString name = o->name();
-    if ( ::qt_cast<TQWidgetStack*>(o->parent()) ) {
-	if ( ::qt_cast<TQTabWidget*>(o->parent()->parent()) )
-	    name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o );
-	else if ( ::qt_cast<TQWizard*>(o->parent()->parent()) )
-	    name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o );
+    if ( ::tqqt_cast<TQWidgetStack*>(o->tqparent()) ) {
+	if ( ::tqqt_cast<TQTabWidget*>(o->tqparent()->tqparent()) )
+	    name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o );
+	else if ( ::tqqt_cast<TQWizard*>(o->tqparent()->tqparent()) )
+	    name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o );
     }
 
     TQToolBox *tb;
-    if ( o->parent() && o->parent()->parent() &&
-	 (tb = ::qt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
+    if ( o->tqparent() && o->tqparent()->tqparent() &&
+	 (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) )
 	name = tb->itemLabel( tb->indexOf((TQWidget*)o) );
 
     if ( fakeMainWindow ) {
-	name = o->parent()->name();
+	name = o->tqparent()->name();
 	className = TQMAINWINDOW_OBJECT_NAME_STRING;
     }
 
-    if ( !parent )
+    if ( !tqparent )
 	item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo );
     else
-	item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo );
+	item = new HierarchyItem( HierarchyItem::Widget, tqparent, 0, name, className, dbInfo );
     item->setOpen( TRUE );
-    if ( !parent )
+    if ( !tqparent )
 	item->setPixmap( 0, DesignerFormPix );
-    else if ( ::qt_cast<QLayoutWidget*>(o) )
+    else if ( ::tqqt_cast<TQLayoutWidget*>(o) )
 	item->setPixmap( 0, DesignerLayoutPix );
     else
 	item->setPixmap( 0, WidgetDatabase::iconSet(
 		    WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ).
 			 pixmap( TQIconSet::Small, TQIconSet::Normal ) );
-    if ( ::qt_cast<TQAction*>(o) )
+    if ( ::tqqt_cast<TQAction*>(o) )
 	item->setPixmap( 0, ( (TQAction*)o )->iconSet().pixmap() );
 
     ( (HierarchyItem*)item )->setObject( o );
-    const TQObjectList *l = o->children();
-    if ( ::qt_cast<QDesignerToolBar*>(o) )
-	l = 0;
-    if ( l ) {
-	TQObjectListIt it( *l );
+    TQObjectList l = o->childrenListObject();
+    if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	l.clear();
+    if ( !l.isEmpty() ) {
+	TQObjectListIt it( l );
 	it.toLast();
 	for ( ; it.current(); --it ) {
 	    if ( !it.current()->isWidgetType() ||
 		 ( (TQWidget*)it.current() )->isHidden() )
 		continue;
-	    if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) {
-		if ( ::qt_cast<TQWidgetStack*>(it.current()->parent()) ||
-		     ::qt_cast<TQWidgetStack*>(it.current()) ) {
+	    if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) {
+		if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) ||
+		     ::tqqt_cast<TQWidgetStack*>(it.current()) ) {
 		    TQObject *obj = it.current();
-		    QDesignerTabWidget *tw = ::qt_cast<QDesignerTabWidget*>(it.current()->parent());
-		    QDesignerWizard *dw = ::qt_cast<QDesignerWizard*>(it.current()->parent());
+		    TQDesignerTabWidget *tw = ::tqqt_cast<TQDesignerTabWidget*>(it.current()->tqparent());
+		    TQDesignerWizard *dw = ::tqqt_cast<TQDesignerWizard*>(it.current()->tqparent());
 		    TQWidgetStack *stack = 0;
-		    if ( dw || tw || ::qt_cast<TQWidgetStack*>(obj) )
+		    if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) )
 			stack = (TQWidgetStack*)obj;
 		    else
-			stack = (TQWidgetStack*)obj->parent();
-		    if ( widgetStacks->findRef( stack ) != -1 )
+			stack = (TQWidgetStack*)obj->tqparent();
+		    if ( widgetStacks->tqfindRef( stack ) != -1 )
 			continue;
 		    widgetStacks->append( stack );
 		    TQObjectList *l2 = stack->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, TRUE, FALSE );
 		    for ( obj = l2->last(); obj; obj = l2->prev() ) {
 			if ( qstrcmp( obj->className(),
-				      "QWidgetStackPrivate::Invisible" ) == 0 ||
+				      "TQWidgetStackPrivate::Invisible" ) == 0 ||
 			     ( tw && !tw->tabBar()->tab( stack->id( (TQWidget*)obj ) ) ) ||
 			     ( dw && dw->isPageRemoved( (TQWidget*)obj ) ) )
 			    continue;
@@ -505,12 +505,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 			insertObject( obj, item );
 		    }
 		    delete l2;
-		} else if ( ::qt_cast<TQToolBox*>(it.current()->parent()) ) {
-		    if ( !::qt_cast<TQScrollView*>(it.current()) )
+		} else if ( ::tqqt_cast<TQToolBox*>(it.current()->tqparent()) ) {
+		    if ( !::tqqt_cast<TQScrollView*>(it.current()) )
 			continue;
-		    TQToolBox *tb = (TQToolBox*)it.current()->parent();
+		    TQToolBox *tb = (TQToolBox*)it.current()->tqparent();
 		    for ( int i = tb->count() - 1; i >= 0; --i )
-			insertObject( tb->item( i ), item );
+			insertObject( TQT_TQOBJECT(tb->item( i )), item );
 		}
 		continue;
 	    }
@@ -519,19 +519,19 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
 
     if ( fakeMainWindow ) {
-	TQObjectList *l = o->parent()->queryList( "QDesignerToolBar" );
+	TQObjectList *l = o->tqparent()->queryList( "TQDesignerToolBar" );
 	TQObject *obj;
 	for ( obj = l->first(); obj; obj = l->next() )
 	    insertObject( obj, item );
 	delete l;
-	l = o->parent()->queryList( "MenuBarEditor" );
+	l = o->tqparent()->queryList( "MenuBarEditor" );
 	for ( obj = l->first(); obj; obj = l->next() )
 	    insertObject( obj, item );
 	delete l;
-    } else if ( ::qt_cast<QDesignerToolBar*>(o) || ::qt_cast<PopupMenuEditor*>(o) ) {
+    } else if ( ::tqqt_cast<TQDesignerToolBar*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ) {
 	TQPtrList<TQAction> actions;
-	if ( ::qt_cast<QDesignerToolBar*>(o) )
-	    actions = ( (QDesignerToolBar*)o )->insertedActions();
+	if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	    actions = ( (TQDesignerToolBar*)o )->insertedActions();
 	else
 	    ( (PopupMenuEditor*)o )->insertedActions( actions );
 
@@ -539,37 +539,37 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 	it.toLast();
 	while ( it.current() ) {
 	    TQAction *a = it.current();
-	    if ( ::qt_cast<QDesignerAction*>(a) ) {
-		QDesignerAction *da = (QDesignerAction*)a;
+	    if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
+		TQDesignerAction *da = (TQDesignerAction*)a;
 		if ( da->supportsMenu() )
 		    insertObject( da, item );
 		else
-		    insertObject( da->widget(), item );
-	    } else if ( ::qt_cast<QDesignerActionGroup*>(a) ) {
+		    insertObject( TQT_TQOBJECT(da->widget()), item );
+	    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(a) ) {
 		insertObject( a, item );
 	    }
 	    --it;
 	}
-    } else if ( ::qt_cast<QDesignerActionGroup*>(o) && o->children() ) {
-	TQObjectList *l = (TQObjectList*)o->children();
-	for ( TQObject *obj = l->last(); obj; obj = l->prev() ) {
-	    if ( ::qt_cast<QDesignerAction*>(obj) ) {
-		QDesignerAction *da = (QDesignerAction*)obj;
+    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(o) && !o->childrenListObject().isEmpty() ) {
+	TQObjectList l = o->childrenListObject();
+	for ( TQObject *obj = l.last(); obj; obj = l.prev() ) {
+	    if ( ::tqqt_cast<TQDesignerAction*>(obj) ) {
+		TQDesignerAction *da = (TQDesignerAction*)obj;
 		if ( da->supportsMenu() )
 		    insertObject( da, item );
 		else
-		    insertObject( da->widget(), item );
-	    } else if ( ::qt_cast<QDesignerActionGroup*>(obj) ) {
+		    insertObject( TQT_TQOBJECT(da->widget()), item );
+	    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(obj) ) {
 		insertObject( obj, item );
 	    }
 	}
-    } else if ( ::qt_cast<MenuBarEditor*>(o) ) {
+    } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) {
 	MenuBarEditor *mb = (MenuBarEditor*)o;
 	for ( int i = mb->count() -1; i >= 0; --i ) {
 	    MenuBarEditorItem *md = mb->item( i );
 	    if ( !md || !md->menu() )
 		continue;
-	    insertObject( md->menu(), item );
+	    insertObject( TQT_TQOBJECT(md->menu()), item );
 	}
     }
 }
@@ -599,12 +599,12 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p )
 	return;
 
     if ( !o->isWidgetType() ||
-	 ( o != formWindow && !formWindow->widgets()->find( (TQWidget*)o ) ) )
+	 ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->tqfind( (TQWidget*)o ) ) )
 	return;
 
     TQWidget *w = (TQWidget*)o;
     if ( w->isVisibleTo( formWindow ) ) {
-	if ( !::qt_cast<TQTabWidget*>(w) && !::qt_cast<TQWizard*>(w) ) {
+	if ( !::tqqt_cast<TQTabWidget*>(w) && !::tqqt_cast<TQWizard*>(w) ) {
 	    if ( !normalMenu )
 		normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this );
 	    normalMenu->popup( p );
@@ -625,14 +625,14 @@ void HierarchyList::addTabPage()
     if ( !o || !o->isWidgetType() )
 	return;
     TQWidget *w = (TQWidget*)o;
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	TQTabWidget *tw = (TQTabWidget*)w;
 	AddTabPageCommand *cmd = new AddTabPageCommand( i18n( "Add Page to %1" ).
 							arg( tw->name() ), formWindow,
 							tw, "Tab" );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
-    } else if ( ::qt_cast<TQWizard*>(w) ) {
+    } else if ( ::tqqt_cast<TQWizard*>(w) ) {
 	TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
 	AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).
 							      arg( wiz->name() ), formWindow,
@@ -648,24 +648,24 @@ void HierarchyList::removeTabPage()
     if ( !o || !o->isWidgetType() )
 	return;
     TQWidget *w = (TQWidget*)o;
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	TQTabWidget *tw = (TQTabWidget*)w;
 	if ( tw->currentPage() ) {
-	    QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
+	    TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw;
 	    DeleteTabPageCommand *cmd =
 		new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ).
-					  arg( dtw->pageTitle() ).arg( tw->name() ),
+					  tqarg( dtw->pageTitle() ).tqarg( tw->name() ),
 					  formWindow, tw, tw->currentPage() );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	}
-    } else if ( ::qt_cast<TQWizard*>(w) ) {
+    } else if ( ::tqqt_cast<TQWizard*>(w) ) {
 	TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
 	if ( wiz->currentPage() ) {
-	    QDesignerWizard *dw = (QDesignerWizard*)wiz;
+	    TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
 	    DeleteWizardPageCommand *cmd =
 		new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ).
-					     arg( dw->pageTitle() ).arg( wiz->name() ),
+					     tqarg( dw->pageTitle() ).tqarg( wiz->name() ),
 					     formWindow, wiz,
 					     wiz->indexOf( wiz->currentPage() ), TRUE );
 	    formWindow->commandHistory()->addCommand( cmd );
@@ -676,8 +676,8 @@ void HierarchyList::removeTabPage()
 
 // ------------------------------------------------------------
 
-FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw )
-    : HierarchyList( parent, fw, TRUE )
+FormDefinitionView::FormDefinitionView( TQWidget *tqparent, FormWindow *fw )
+    : HierarchyList( tqparent, fw, TRUE )
 {
     header()->hide();
     removeColumn( 1 );
@@ -708,7 +708,7 @@ void FormDefinitionView::setup()
 	TQStringList defs = lIface->definitions();
 	for ( TQStringList::Iterator dit = defs.begin(); dit != defs.end(); ++dit ) {
 	    HierarchyItem *itemDef = new HierarchyItem( HierarchyItem::DefinitionParent, this, 0,
-							i18n( *dit ), TQString::null, TQString::null );
+							i18n( *dit ), TQString(), TQString() );
 	    itemDef->setPixmap( 0, DesignerFolderPix );
 	    itemDef->setOpen( TRUE );
 	    TQStringList entries =
@@ -716,7 +716,7 @@ void FormDefinitionView::setup()
 	    HierarchyItem *item = 0;
 	    for ( TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit ) {
 		item = new HierarchyItem( HierarchyItem::Definition,
-					  itemDef, item, *eit, TQString::null, TQString::null );
+					  itemDef, item, *eit, TQString(), TQString() );
 		item->setRenameEnabled( 0, TRUE );
 	    }
 	}
@@ -751,31 +751,31 @@ void FormDefinitionView::setupVariables()
     }
 
     HierarchyItem *itemVar = new HierarchyItem( HierarchyItem::VarParent, this, 0, i18n( "Class Variables" ),
-						TQString::null, TQString::null );
+						TQString(), TQString() );
     itemVar->setPixmap( 0, DesignerFolderPix );
     itemVar->setOpen( TRUE );
 
     itemVarPriv = new HierarchyItem( HierarchyItem::VarPrivate, itemVar, 0, i18n( "private" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
     itemVarProt = new HierarchyItem( HierarchyItem::VarProtected, itemVar, 0, i18n( "protected" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
     itemVarPubl = new HierarchyItem( HierarchyItem::VarPublic, itemVar, 0, i18n( "public" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
 
-    TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( formWindow );
+    TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Variable>::Iterator it = --( varList.end() );
     if ( !varList.isEmpty() && itemVar ) {
 	for (;;) {
 	    TQListViewItem *item = 0;
 	    if ( (*it).varAccess == "public" )
 		item = new HierarchyItem( HierarchyItem::Variable, itemVarPubl, 0, (*it).varName,
-					  TQString::null, TQString::null );
+					  TQString(), TQString() );
 	    else if ( (*it).varAccess == "private" )
 		item = new HierarchyItem( HierarchyItem::Variable, itemVarPriv, 0, (*it).varName,
-					  TQString::null, TQString::null );
+					  TQString(), TQString() );
 	    else // default is protected
 		item = new HierarchyItem( HierarchyItem::Variable, itemVarProt, 0, (*it).varName,
-					  TQString::null, TQString::null );
+					  TQString(), TQString() );
 	    item->setPixmap( 0, DesignerEditSlotsPix );
 	    if ( it == varList.begin() )
 		break;
@@ -832,27 +832,27 @@ void FormDefinitionView::refresh()
 
 
     itemFunct = new HierarchyItem( HierarchyItem::FunctParent,
-				   this, 0, i18n( "Functions" ), TQString::null, TQString::null );
+				   this, 0, i18n( "Functions" ), TQString(), TQString() );
     itemFunct->moveItem( i );
     itemFunct->setPixmap( 0, DesignerFolderPix );
     itemFunctPriv = new HierarchyItem( HierarchyItem::FunctPrivate, itemFunct, 0,
-				       i18n( "private" ), TQString::null, TQString::null );
+				       i18n( "private" ), TQString(), TQString() );
     itemFunctProt = new HierarchyItem( HierarchyItem::FunctProtected, itemFunct, 0,
-				       i18n( "protected" ), TQString::null, TQString::null );
+				       i18n( "protected" ), TQString(), TQString() );
     itemFunctPubl = new HierarchyItem( HierarchyItem::FunctPublic, itemFunct, 0,
-				       i18n( "public" ), TQString::null, TQString::null );
+				       i18n( "public" ), TQString(), TQString() );
 
     itemSlots = new HierarchyItem( HierarchyItem::SlotParent,
-				   this, 0, i18n( "Slots" ), TQString::null, TQString::null );
+				   this, 0, i18n( "Slots" ), TQString(), TQString() );
     itemSlots->setPixmap( 0, DesignerFolderPix );
     itemPrivate = new HierarchyItem( HierarchyItem::SlotPrivate, itemSlots, 0, i18n( "private" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
     itemProtected = new HierarchyItem( HierarchyItem::SlotProtected, itemSlots, 0, i18n( "protected" ),
-				       TQString::null, TQString::null );
+				       TQString(), TQString() );
     itemPublic = new HierarchyItem( HierarchyItem::SlotPublic, itemSlots, 0, i18n( "public" ),
-				    TQString::null, TQString::null );
+				    TQString(), TQString() );
 
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Function>::Iterator it = --( functionList.end() );
     if ( !functionList.isEmpty() && itemFunct ) {
 	for (;;) {
@@ -860,23 +860,23 @@ void FormDefinitionView::refresh()
 	    if ( (*it).type == "slot" ) {
 		if ( (*it).access == "protected" )
 		    item = new HierarchyItem( HierarchyItem::Slot, itemProtected, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else if ( (*it).access == "private" )
 		    item = new HierarchyItem( HierarchyItem::Slot, itemPrivate, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else // default is public
 		    item = new HierarchyItem( HierarchyItem::Slot, itemPublic, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 	    } else {
 		if ( (*it).access == "protected" )
 		    item = new HierarchyItem( HierarchyItem::Function, itemFunctProt, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else if ( (*it).access == "private" )
 		    item = new HierarchyItem( HierarchyItem::Function, itemFunctPriv, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else // default is public
 		    item = new HierarchyItem( HierarchyItem::Function, itemFunctPubl, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 	    }
 	    item->setPixmap( 0, DesignerEditSlotsPix );
 	    if ( it == functionList.begin() )
@@ -953,13 +953,13 @@ void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const T
     while ( after && after->nextSibling() )
 	after = after->nextSibling();
     HierarchyItem *item = new HierarchyItem( getChildType( i->rtti() ), i, after, s,
-					     TQString::null, TQString::null );
+					     TQString(), TQString() );
     if ( !pix.isNull() )
 	item->setPixmap( 0, pix );
     item->setRenameEnabled( 0, TRUE );
     setCurrentItem( item );
     ensureItemVisible( item );
-    qApp->processEvents();
+    tqApp->processEvents();
     newItem = item;
     item->startRename( 0 );
 }
@@ -976,7 +976,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 
     HierarchyItem::Type t = getChildType( i->rtti() );
     if ( (int)t == i->rtti() )
-	i = i->parent();
+	i = i->tqparent();
 
     if ( formWindow->project()->isCpp() )
 	switch( i->rtti() ) {
@@ -1100,13 +1100,13 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	    if ( !lIface )
 		return;
 	    if ( i->rtti() == HierarchyItem::Definition )
-		i = i->parent();
+		i = i->tqparent();
 	    ListEditor dia( this, 0, TRUE );
-	    dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) );
+	    dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) );
 	    TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() );
 	    dia.setList( entries );
 	    dia.exec();
-	    Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow,
+	    Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( i->text( 0 )), formWindow,
 						       lIface, i->text( 0 ), dia.items() );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -1114,7 +1114,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
     } else if ( res == NEW ) {
 	HierarchyItem::Type t = getChildType( i->rtti() );
 	if ( (int)t == i->rtti() )
-	    i = i->parent();
+	    i = i->tqparent();
 	switch( i->rtti() ) {
 	case HierarchyItem::SlotPublic:
 	    execFunctionDialog( "public", "slot", TRUE );
@@ -1142,8 +1142,8 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 
 	    TQCString funct( MetaDataBase::normalizeFunction( i->text( 0 ) ).latin1() );
 	    Command *cmd = new RemoveFunctionCommand( i18n( "Remove Function" ), formWindow, funct,
-						     TQString::null, TQString::null, TQString::null,
-						     TQString::null, formWindow->project()->language() );
+						     TQString(), TQString(), TQString(),
+						     TQString(), formWindow->project()->language() );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	    formWindow->mainWindow()->objectHierarchy()->updateFormDefinitionView();
@@ -1153,7 +1153,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else {
-	    TQListViewItem *p = i->parent();
+	    TQListViewItem *p = i->tqparent();
 	    delete i;
 	    save( p, 0 );
 	}
@@ -1178,9 +1178,9 @@ void FormDefinitionView::renamed( TQListViewItem *i )
 {
     if ( newItem == i )
 	newItem = 0;
-    if ( !i->parent() )
+    if ( !i->tqparent() )
 	return;
-    save( i->parent(), i );
+    save( i->tqparent(), i );
 }
 
 
@@ -1197,7 +1197,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
 	varName = varName.simplifyWhiteSpace();
 	if ( varName[(int)varName.length() - 1] != ';' )
 	    varName += ";";
-	if ( MetaDataBase::hasVariable( formWindow, varName ) ) {
+	if ( MetaDataBase::hasVariable( TQT_TQOBJECT(formWindow), varName ) ) {
 	    TQMessageBox::information( this, i18n( "Edit Variables" ),
 				      i18n( "This variable has already been declared." ) );
 	} else {
@@ -1218,7 +1218,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
 	    lst << i->text( 0 );
 	    i = i->nextSibling();
 	}
-	Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( p->text( 0 ) ), formWindow,
+	Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( p->text( 0 ) ), formWindow,
 						   lIface, p->text( 0 ), lst );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -1235,8 +1235,8 @@ void FormDefinitionView::addVariable( const TQString &varName, const TQString &a
 
 // ------------------------------------------------------------
 
-HierarchyView::HierarchyView( TQWidget *parent )
-    : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+HierarchyView::HierarchyView( TQWidget *tqparent )
+    : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
 		  WStyle_Tool |WStyle_MinMax | WStyle_SysMenu )
 {
     formwindow = 0;
@@ -1255,20 +1255,20 @@ HierarchyView::HierarchyView( TQWidget *parent )
 
     if ( !classBrowserInterfaceManager ) {
 	classBrowserInterfaceManager =
-	    new QPluginManager<ClassBrowserInterface>( IID_ClassBrowser, TQApplication::libraryPaths(),
+	    new TQPluginManager<ClassBrowserInterface>( IID_ClassBrowser, TQApplication::libraryPaths(),
 						       MainWindow::self->pluginDirectory() );
     }
 
     classBrowsers = new TQMap<TQString, ClassBrowser>();
     TQStringList langs = MetaDataBase::languages();
     for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
-	QInterfacePtr<ClassBrowserInterface> ciface = 0;
+	TQInterfacePtr<ClassBrowserInterface> ciface = 0;
 	classBrowserInterfaceManager->queryInterface( *it, &ciface );
 	if ( ciface ) {
 	    ClassBrowser cb( ciface->createClassBrowser( this ), ciface );
 	    addTab( cb.lv, i18n( "Class Declarations" ) );
 	    setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) );
-	    ciface->onClick( this, TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) );
+	    ciface->onClick( TQT_TQOBJECT(this), TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) );
 	    classBrowsers->insert( *it, cb );
 	    setTabEnabled( cb.lv, FALSE );
 	}
@@ -1307,7 +1307,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o )
     if ( fw == formwindow ) {
 	if ( fw ) {
 	    if ( !fake )
-		listview->setCurrent( (TQWidget*)o );
+		listview->setCurrent( TQT_TQOBJECT(o) );
 	    else
 		listview->clear();
 	    if ( MainWindow::self->qWorkspace()->activeWindow() == fw )
@@ -1330,7 +1330,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o )
     fView->setFormWindow( fw );
     if ( !fake ) {
 	listview->setup();
-	listview->setCurrent( (TQWidget*)o );
+	listview->setCurrent( TQT_TQOBJECT(o) );
     }
     fView->setup();
 
@@ -1367,8 +1367,8 @@ void HierarchyView::showClassesTimeout()
     if ( !se->object() )
 	return;
     if ( se->formWindow() && se->formWindow()->project()->isCpp() ) {
-	setFormWindow( se->formWindow(), se->formWindow()->currentWidget() );
-	MainWindow::self->propertyeditor()->setWidget( se->formWindow()->currentWidget(),
+	setFormWindow( se->formWindow(), TQT_TQOBJECT(se->formWindow()->currentWidget()) );
+	MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(se->formWindow()->currentWidget()),
 						       se->formWindow() );
 	return;
     }
@@ -1445,17 +1445,17 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & )
 void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
 {
     TQWidget *w2 = w;
-    if ( ::qt_cast<TQMainWindow*>(w) )
+    if ( ::tqqt_cast<TQMainWindow*>(w) )
 	w2 = ( (TQMainWindow*)w )->centralWidget();
-    listview->changeNameOf( w2, w->name() );
+    listview->changeNameOf( TQT_TQOBJECT(w2), w->name() );
 }
 
 
 void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQString i = info.join( "." );
-    listview->changeDatabaseOf( w, i );
+    listview->changeDatabaseOf( TQT_TQOBJECT(w), i );
 #endif
 }
 
diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h
index 7405ef3a..5145b3b5 100644
--- a/kdevdesigner/designer/hierarchyview.h
+++ b/kdevdesigner/designer/hierarchyview.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,7 +31,7 @@
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 #include <tqguardedptr.h>
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include "../interfaces/classbrowserinterface.h"
 
 class FormWindow;
@@ -42,7 +42,7 @@ class TQMouseEvent;
 class TQWizard;
 class SourceEditor;
 
-class HierarchyItem : public QListViewItem
+class HierarchyItem : public TQListViewItem
 {
 public:
     enum Type {
@@ -68,9 +68,9 @@ public:
 	Variable
     };
 
-    HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
+    HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
 		   const TQString &txt1, const TQString &txt2, const TQString &txt3 );
-    HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
+    HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
 		   const TQString &txt1, const TQString &txt2, const TQString &txt3 );
 
     void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -95,12 +95,13 @@ private:
 
 };
 
-class HierarchyList : public QListView
+class HierarchyList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE );
+    HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE );
 
     virtual void setup();
     virtual void setCurrent( TQObject *o );
@@ -116,7 +117,7 @@ public:
 	TQListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
     }
 
-    void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString::null );
+    void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString() );
 
 protected:
     void keyPressEvent( TQKeyEvent *e );
@@ -129,7 +130,7 @@ public slots:
     void removeTabPage();
 
 private:
-    void insertObject( TQObject *o, TQListViewItem *parent );
+    void insertObject( TQObject *o, TQListViewItem *tqparent );
     TQObject *findObject( TQListViewItem *i );
     TQListViewItem *findItem( TQObject *o );
     TQObject *current() const;
@@ -155,9 +156,10 @@ protected:
 class FormDefinitionView : public HierarchyList
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FormDefinitionView( TQWidget *parent, FormWindow *fw );
+    FormDefinitionView( TQWidget *tqparent, FormWindow *fw );
 
     void setup();
     void setupVariables();
@@ -185,12 +187,13 @@ private:
 };
 
 
-class HierarchyView : public QTabWidget
+class HierarchyView : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HierarchyView( TQWidget *parent );
+    HierarchyView( TQWidget *tqparent );
     ~HierarchyView();
 
     void setFormWindow( FormWindow *fw, TQObject *o );
@@ -232,9 +235,9 @@ private:
 	ClassBrowser( TQListView * = 0, ClassBrowserInterface * = 0 );
 	~ClassBrowser();
 	TQListView *lv;
-	QInterfacePtr<ClassBrowserInterface> iface;
+	TQInterfacePtr<ClassBrowserInterface> iface;
 
-	Q_DUMMY_COMPARISON_OPERATOR( ClassBrowser )
+	TQ_DUMMY_COMPARISON_OPERATOR( ClassBrowser )
     };
     FormWindow *formwindow;
     HierarchyList *listview;
diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui
index e06367f1..b36341b2 100644
--- a/kdevdesigner/designer/iconvieweditor.ui
+++ b/kdevdesigner/designer/iconvieweditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>IconViewEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QIconView">
+                <widget class="TQIconView">
                     <property name="name">
                         <cstring>preview</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>All items in the iconview.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -92,7 +92,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>itemNew</cstring>
                             </property>
@@ -106,7 +106,7 @@
                                 <string>Create a new item for the iconview.</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>itemDelete</cstring>
                             </property>
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -139,7 +139,7 @@
                         </spacer>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>GroupBox1</cstring>
                     </property>
@@ -164,7 +164,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>Label1</cstring>
                             </property>
@@ -175,11 +175,11 @@
                                 <cstring>itemText</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>itemText</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -192,7 +192,7 @@
                                 <string>Change the text for the selected item.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>Label2</cstring>
                             </property>
@@ -203,7 +203,7 @@
                                 <cstring>itemChoosePixmap</cstring>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="1" column="1">
+                        <widget class="TQLayoutWidget" row="1" column="1">
                             <property name="name">
                                 <cstring>Layout4</cstring>
                             </property>
@@ -217,7 +217,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>itemPixmap</cstring>
                                     </property>
@@ -225,11 +225,11 @@
                                         <string>Label4</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>itemDeletePixmap</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -248,11 +248,11 @@
                                         <string>Delete the selected item's pixmap.</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>itemChoosePixmap</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -274,7 +274,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -288,7 +288,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -309,14 +309,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -333,7 +333,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -347,7 +347,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -380,9 +380,9 @@
     </connection>
     <connection>
         <sender>itemText</sender>
-        <signal>textChanged( const QString &amp; )</signal>
+        <signal>textChanged( const TQString &amp; )</signal>
         <receiver>IconViewEditorBase</receiver>
-        <slot>currentTextChanged(const QString&amp;)</slot>
+        <slot>currentTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -410,15 +410,15 @@
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>selectionChanged(QIconViewItem*)</signal>
+        <signal>selectionChanged(TQIconViewItem*)</signal>
         <receiver>IconViewEditorBase</receiver>
-        <slot>currentItemChanged(QIconViewItem*)</slot>
+        <slot>currentItemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>currentChanged(QIconViewItem*)</signal>
+        <signal>currentChanged(TQIconViewItem*)</signal>
         <receiver>IconViewEditorBase</receiver>
-        <slot>currentItemChanged(QIconViewItem*)</slot>
+        <slot>currentItemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>itemDeletePixmap</sender>
@@ -439,23 +439,23 @@
     <tabstop>buttonHelp</tabstop>
     <tabstop>buttonApply</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">applyClicked()</slot>
     <slot access="protected">cancelClicked()</slot>
     <slot access="protected">choosePixmap()</slot>
-    <slot access="protected">currentItemChanged( QIconViewItem * )</slot>
-    <slot access="protected">currentTextChanged( const QString &amp; )</slot>
+    <slot access="protected">currentItemChanged( TQIconViewItem * )</slot>
+    <slot access="protected">currentTextChanged( const TQString &amp; )</slot>
     <slot access="protected">deleteCurrentItem()</slot>
     <slot access="protected">insertNewItem()</slot>
     <slot access="protected">deletePixmap()</slot>
     <slot access="protected">okClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index a4c3064c..8f0ca643 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/kdevdesigner/designer/iconvieweditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,8 +37,8 @@
 
 #include <klocale.h>
 
-IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
-    : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw )
+IconViewEditor::IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
+    : IconViewEditorBase( tqparent, 0, TRUE ), formwindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     iconview = (TQIconView*)editWidget;
@@ -129,7 +129,7 @@ void IconViewEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).arg( iconview->name() ),
+    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).tqarg( iconview->name() ),
 								formwindow, iconview, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h
index a29276e8..b1823770 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.h
+++ b/kdevdesigner/designer/iconvieweditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,9 +34,10 @@ class FormWindow;
 class IconViewEditor : public IconViewEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
 protected slots:
     void insertNewItem();
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 135751e8..8cbf9a7c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -40,21 +40,21 @@
 #include "designeraction.h"
 #include "formwindow.h"
 
-KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
+KDevDesignerPart::KDevDesignerPart( TQWidget *tqparentWidget, const char *// widgetName
                                     ,
-                                  TQObject *parent, const char *name, const TQStringList &args )
-    : KInterfaceDesigner::Designer(parent, name)
+                                  TQObject *tqparent, const char *name, const TQStringList &args )
+    : KInterfaceDesigner::Designer(tqparent, name)
 {
     setInstance( KDevDesignerPartFactory::instance() );
 
     m_widget = new MainWindow( this, true );
-    m_widget->reparent(parentWidget, TQPoint(0,0));
+    m_widget->reparent(tqparentWidget, TQPoint(0,0));
     setupDesignerWindow();
 
     setWidget(m_widget);
 
     setupActions();
-    if (args.contains("in shell"))
+    if (args.tqcontains("in shell"))
         setXMLFile("kdevdesigner_part_sh.rc");
     else
         setXMLFile("kdevdesigner_part.rc");
@@ -68,7 +68,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge
 void KDevDesignerPart::setupDesignerWindow()
 {
     m_widget->menuBar()->hide();
-    m_widget->layoutToolBar->hide();
+    m_widget->tqlayoutToolBar->hide();
     m_widget->projectToolBar->hide();
     m_widget->toolsToolBar->hide();
     m_widget->statusBar()->hide();
@@ -144,21 +144,21 @@ void KDevDesignerPart::setupActions( )
     new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
     new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
 
-    action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
+    action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(tqlayoutAdjustSize()), actionCollection(), "tqlayout_adjustsize");
     stateSync(action, m_widget->actionEditAdjustSize);
-    action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
+    action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(tqlayoutHLayout()), actionCollection(), "tqlayout_h");
     stateSync(action, m_widget->actionEditHLayout);
-    action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
+    action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(tqlayoutVLayout()), actionCollection(), "tqlayout_v");
     stateSync(action, m_widget->actionEditVLayout);
-    action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
+    action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(tqlayoutGridLayout()), actionCollection(), "tqlayout_grid");
     stateSync(action, m_widget->actionEditGridLayout);
-    action = new KAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
+    action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitHLayout()), actionCollection(), "tqlayout_splith");
     stateSync(action, m_widget->actionEditSplitHorizontal);
-    action = new KAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
+    action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitVLayout()), actionCollection(), "tqlayout_splitv");
     stateSync(action, m_widget->actionEditSplitVertical);
-    action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
+    action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(tqlayoutBreak()), actionCollection(), "tqlayout_break");
     stateSync(action, m_widget->actionEditBreakLayout);
-    toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
+    toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "tqlayout_spacer");
     setupToolsAction(toggle, m_widget->actionInsertSpacer);
 
     action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
@@ -256,12 +256,12 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory()
     s_instance = 0L;
 }
 
-KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                                        TQObject *parent, const char *name,
+KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                                        TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args );
+    KDevDesignerPart* obj = new KDevDesignerPart( tqparentWidget, widgetName, tqparent, name, args );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
@@ -407,37 +407,37 @@ void KDevDesignerPart::toolsConfigureToolbox( )
     m_widget->toolsConfigure();
 }
 
-void KDevDesignerPart::layoutAdjustSize( )
+void KDevDesignerPart::tqlayoutAdjustSize( )
 {
     m_widget->actionEditAdjustSize->activate();
 }
 
-void KDevDesignerPart::layoutHLayout( )
+void KDevDesignerPart::tqlayoutHLayout( )
 {
     m_widget->actionEditHLayout->activate();
 }
 
-void KDevDesignerPart::layoutVLayout( )
+void KDevDesignerPart::tqlayoutVLayout( )
 {
     m_widget->actionEditVLayout->activate();
 }
 
-void KDevDesignerPart::layoutGridLayout( )
+void KDevDesignerPart::tqlayoutGridLayout( )
 {
     m_widget->actionEditGridLayout->activate();
 }
 
-void KDevDesignerPart::layoutSplitHLayout( )
+void KDevDesignerPart::tqlayoutSplitHLayout( )
 {
     m_widget->actionEditSplitHorizontal->activate();
 }
 
-void KDevDesignerPart::layoutSplitVLayout( )
+void KDevDesignerPart::tqlayoutSplitVLayout( )
 {
     m_widget->actionEditSplitVertical->activate();
 }
 
-void KDevDesignerPart::layoutBreak( )
+void KDevDesignerPart::tqlayoutBreak( )
 {
     m_widget->actionEditBreakLayout->activate();
 }
@@ -509,7 +509,7 @@ void KDevDesignerPart::openProject( const TQString & // projectFile
 
 KInterfaceDesigner::DesignerType KDevDesignerPart::designerType( )
 {
-    return KInterfaceDesigner::QtDesigner;
+    return KInterfaceDesigner::TQtDesigner;
 }
 
 void KDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func )
@@ -552,9 +552,9 @@ void KDevDesignerPart::emitEditSource(const TQString &formName)
     emit editSource(designerType(), formName);
 }
 
-void KDevDesignerPart::emitNewStatus(const TQString &formName, int status)
+void KDevDesignerPart::emitNewtqStatus(const TQString &formName, int status)
 {
-    emit newStatus(formName, status);
+    emit newtqStatus(formName, status);
 }
 
 void KDevDesignerPart::toolsEditCustomWidgets( )
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index f33969ef..a3a759e4 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -39,9 +39,10 @@ class KRadioAction;
 class KDevDesignerPart : public KInterfaceDesigner::Designer
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevDesignerPart(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *parent, const char *name, const TQStringList &args);
+    KDevDesignerPart(TQWidget *tqparentWidget, const char *widgetName,
+                    TQObject *tqparent, const char *name, const TQStringList &args);
     virtual ~KDevDesignerPart();
 
     virtual void setReadWrite(bool rw);
@@ -60,7 +61,7 @@ public:
     void emitEditFunction(const TQString &formName, const TQString &functionName);
     void emitEditSource(const TQString &formName);
     
-    void emitNewStatus(const TQString &formName, int status);
+    void emitNewtqStatus(const TQString &formName, int status);
     
 protected:
     virtual bool openFile();
@@ -103,13 +104,13 @@ protected slots:
     void toolsConfigureToolbox();
     void toolsEditCustomWidgets();
     
-    void layoutAdjustSize();
-    void layoutHLayout();
-    void layoutVLayout();
-    void layoutGridLayout();
-    void layoutSplitHLayout();
-    void layoutSplitVLayout();
-    void layoutBreak();
+    void tqlayoutAdjustSize();
+    void tqlayoutHLayout();
+    void tqlayoutVLayout();
+    void tqlayoutGridLayout();
+    void tqlayoutSplitHLayout();
+    void tqlayoutSplitVLayout();
+    void tqlayoutBreak();
     
     void windowPreview();
     void windowNext();
@@ -130,11 +131,12 @@ class KAboutData;
 class KDevDesignerPartFactory : public KParts::Factory
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KDevDesignerPartFactory();
     virtual ~KDevDesignerPartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *parent, const char *name,
+    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                            TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
  
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index 9757d5d9..83db3b7d 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -25,7 +25,7 @@
 **********************************************************************/
 
 #include "formwindow.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include <widgetdatabase.h>
 #include "widgetfactory.h"
 
@@ -44,34 +44,34 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
 }
 
 /*!
-  \class Layout layout.h
-  \brief Baseclass for layouting widgets in the Designer
+  \class Layout tqlayout.h
+  \brief Baseclass for tqlayouting widgets in the Designer
 
-  Classes derived from this abstract base class are used for layouting
+  Classes derived from this abstract base class are used for tqlayouting
   operations in the Designer.
 
 */
 
-/*!  \a p specifies the parent of the layoutBase \a lb. The parent
-  might be changed in setup(). If the layoutBase is a
-  container, the parent and the layoutBase are the same. Also they
+/*!  \a p specifies the tqparent of the tqlayoutBase \a lb. The tqparent
+  might be changed in setup(). If the tqlayoutBase is a
+  container, the tqparent and the tqlayoutBase are the same. Also they
   always have to be a widget known to the designer (e.g. in the case
-  of the tabwidget parent and layoutBase are the tabwidget and not the
+  of the tabwidget tqparent and tqlayoutBase are the tabwidget and not the
   page which actually gets laid out. For actual usage the correct
   widget is found later by Layout.)
  */
 
 Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter )
-    : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
+    : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
 {
     widgets.setAutoDelete( FALSE );
-    layoutBase = lb;
-    if ( !doSetup && layoutBase )
-	oldGeometry = layoutBase->geometry();
+    tqlayoutBase = lb;
+    if ( !doSetup && tqlayoutBase )
+	oldGeometry = tqlayoutBase->tqgeometry();
 }
 
 /*!  The widget list we got in the constructor might contain too much
-  widgets (like widgets with different parents, already laid out
+  widgets (like widgets with different tqparents, already laid out
   widgets, etc.). Here we set up the list and so the only the "best"
   widgets get laid out.
 */
@@ -85,20 +85,20 @@ void Layout::setup()
     TQWidget *w = 0;
 
     // Go through all widgets of the list we got. As we can only
-    // layout widgets which have the same parent, we first do some
-    // sorting which means create a list for each parent containing
+    // tqlayout widgets which have the same tqparent, we first do some
+    // sorting which means create a list for each tqparent containing
     // its child here. After that we keep working on the list of
     // childs which has the most entries.
     // Widgets which are already laid out are thrown away here too
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
-	if ( lastParent != w->parentWidget() ) {
+	if ( lastParent != w->tqparentWidget() ) {
 	    lastList = 0;
-	    lastParent = w->parentWidget();
+	    lastParent = w->tqparentWidget();
 	    TQValueList<TQWidgetList>::Iterator it = lists.begin();
 	    for ( ; it != lists.end(); ++it ) {
-		if ( ( *it ).first()->parentWidget() == w->parentWidget() )
+		if ( ( *it ).first()->tqparentWidget() == w->tqparentWidget() )
 		    lastList = &( *it );
 	    }
 	    if ( !lastList ) {
@@ -120,12 +120,12 @@ void Layout::setup()
     }
 
     // If we found no list (because no widget did fit at all) or the
-    // best list has only one entry and we do not layout a container,
+    // best list has only one entry and we do not tqlayout a container,
     // we leave here.
     if ( !lastList || ( lastList->count() < 2 &&
-			( !layoutBase ||
-			  ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) &&
-			    layoutBase != formWindow->mainContainer() ) )
+			( !tqlayoutBase ||
+			  ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(tqlayoutBase) ) ) ) &&
+			    tqlayoutBase != formWindow->mainContainer() ) )
 			) ) {
 	widgets.clear();
 	startPoint = TQPoint( 0, 0 );
@@ -133,23 +133,23 @@ void Layout::setup()
     }
 
     // Now we have a new and clean widget list, which makes sense
-    // to layout
+    // to tqlayout
     widgets = *lastList;
-    // Also use the only correct parent later, so store it
-    parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
-    // Now calculate the position where the layout-meta-widget should
+    // Also use the only correct tqparent later, so store it
+    tqparent = WidgetFactory::widgetOfContainer( widgets.first()->tqparentWidget() );
+    // Now calculate the position where the tqlayout-meta-widget should
     // be placed and connect to widgetDestroyed() signals of the
     // widgets to get informed if one gets deleted to be able to
     // handle that and do not crash in this case
     for ( w = widgets.first(); w; w = widgets.next() ) {
 	connect( w, TQT_SIGNAL( destroyed() ),
 		 this, TQT_SLOT( widgetDestroyed() ) );
-	startPoint = TQPoint( QMIN( startPoint.x(), w->x() ),
-			     QMIN( startPoint.y(), w->y() ) );
+	startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ),
+			     TQMIN( startPoint.y(), w->y() ) );
 	geometries.insert( w, TQRect( w->pos(), w->size() ) );
 	// Change the Z-order, as saving/loading uses the Z-order for
 	// writing/creating widgets and this has to be the same as in
-	// the layout. Else saving + loading will give different results
+	// the tqlayout. Else saving + loading will give different results
 	w->raise();
     }
 }
@@ -160,46 +160,46 @@ void Layout::widgetDestroyed()
 	widgets.removeRef( (TQWidget*)sender() );
 }
 
-bool Layout::prepareLayout( bool &needMove, bool &needReparent )
+bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
 {
     if ( !widgets.count() )
 	return FALSE;
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
 	w->raise();
-    needMove = !layoutBase;
-    needReparent = needMove || ::qt_cast<QLayoutWidget*>(layoutBase) || ::qt_cast<TQSplitter*>(layoutBase);
-    if ( !layoutBase ) {
+    needMove = !tqlayoutBase;
+    needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(tqlayoutBase) || ::tqqt_cast<TQSplitter*>(tqlayoutBase);
+    if ( !tqlayoutBase ) {
 	if ( !useSplitter )
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
-						WidgetFactory::containerOfWidget( parent ) );
+	    tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
+						WidgetFactory::containerOfWidget( tqparent ) );
 	else
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
-						WidgetFactory::containerOfWidget( parent ) );
+	    tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
+						WidgetFactory::containerOfWidget( tqparent ) );
     } else {
-	WidgetFactory::deleteLayout( layoutBase );
+	WidgetFactory::deleteLayout( tqlayoutBase );
     }
 
     return TRUE;
 }
 
-void Layout::finishLayout( bool needMove, TQLayout *layout )
+void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
 {
     if ( needMove )
-	layoutBase->move( startPoint );
-    TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) );
-    if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak )
-	layoutBase->adjustSize();
+	tqlayoutBase->move( startPoint );
+    TQRect g( TQRect( tqlayoutBase->pos(), tqlayoutBase->size() ) );
+    if ( WidgetFactory::tqlayoutType( tqlayoutBase->tqparentWidget() ) == WidgetFactory::NoLayout && !isBreak )
+	tqlayoutBase->adjustSize();
     else if ( isBreak )
-	layoutBase->setGeometry( oldGeometry );
+	tqlayoutBase->setGeometry( oldGeometry );
     oldGeometry = g;
-    layoutBase->show();
-    layout->activate();
-    formWindow->insertWidget( layoutBase );
-    formWindow->selectWidget( layoutBase );
-    TQString n = layoutBase->name();
-    if ( n.find( "qt_dead_widget_" ) != -1 ) {
+    tqlayoutBase->show();
+    tqlayout->activate();
+    formWindow->insertWidget( tqlayoutBase );
+    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase) );
+    TQString n = tqlayoutBase->name();
+    if ( n.tqfind( "qt_dead_widget_" ) != -1 ) {
 	n.remove( 0, TQString( "qt_dead_widget_" ).length() );
-	layoutBase->setName( n );
+	tqlayoutBase->setName( n );
     }
 }
 
@@ -211,23 +211,23 @@ void Layout::undoLayout()
     for ( ; it != geometries.end(); ++it ) {
 	if ( !it.key() )
 	    continue;
-	it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
+	it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
 	it.key()->resize( ( *it ).size() );
     }
-    formWindow->selectWidget( layoutBase, FALSE );
-    WidgetFactory::deleteLayout( layoutBase );
-    if ( parent != layoutBase && !::qt_cast<TQMainWindow*>(layoutBase) ) {
-	layoutBase->hide();
-	TQString n = layoutBase->name();
+    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), FALSE );
+    WidgetFactory::deleteLayout( tqlayoutBase );
+    if ( tqparent != tqlayoutBase && !::tqqt_cast<TQMainWindow*>(tqlayoutBase) ) {
+	tqlayoutBase->hide();
+	TQString n = tqlayoutBase->name();
 	n.prepend( "qt_dead_widget_" );
-	layoutBase->setName( n );
+	tqlayoutBase->setName( n );
     } else {
-	layoutBase->setGeometry( oldGeometry );
+	tqlayoutBase->setGeometry( oldGeometry );
     }
     if ( widgets.first() )
-	formWindow->selectWidget( widgets.first() );
+	formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
     else
-	formWindow->selectWidget( formWindow );
+	formWindow->selectWidget( TQT_TQOBJECT(formWindow) );
 }
 
 void Layout::breakLayout()
@@ -236,43 +236,43 @@ void Layout::breakLayout()
     if ( !widgets.isEmpty() ) {
 	TQWidget *w;
 	for ( w = widgets.first(); w; w = widgets.next() )
-	    rects.insert( w, w->geometry() );
-    }
-    WidgetFactory::deleteLayout( layoutBase );
-    bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
-			qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
-			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) &&
-			  layoutBase != formWindow->mainContainer() );
-    bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
+	    rects.insert( w, w->tqgeometry() );
+    }
+    WidgetFactory::deleteLayout( tqlayoutBase );
+    bool needRetqparent = qstrcmp( tqlayoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
+			qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
+			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(tqlayoutBase) ) ) ) &&
+			  tqlayoutBase != formWindow->mainContainer() );
+    bool needResize = qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
     bool add = geometries.isEmpty();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent )
-	    w->reparent( layoutBase->parentWidget(), 0,
-			 layoutBase->pos() + w->pos(), TRUE );
+	if ( needRetqparent )
+	    w->reparent( tqlayoutBase->tqparentWidget(), 0,
+			 tqlayoutBase->pos() + w->pos(), TRUE );
 	if ( needResize ) {
-	    TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w );
+	    TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w );
 	    if ( it != rects.end() )
-		w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) );
+		w->setGeometry( TQRect( tqlayoutBase->pos() + (*it).topLeft(), (*it).size() ) );
 	}
 	if ( add )
 	    geometries.insert( w, TQRect( w->pos(), w->size() ) );
     }
-    if ( needReparent ) {
-	layoutBase->hide();
-	parent = layoutBase->parentWidget();
-	TQString n = layoutBase->name();
+    if ( needRetqparent ) {
+	tqlayoutBase->hide();
+	tqparent = tqlayoutBase->tqparentWidget();
+	TQString n = tqlayoutBase->name();
 	n.prepend( "qt_dead_widget_" );
-	layoutBase->setName( n );
+	tqlayoutBase->setName( n );
     } else {
-	parent = layoutBase;
+	tqparent = tqlayoutBase;
     }
     if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
-	formWindow->selectWidget( widgets.first() );
+	formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
     else
-	formWindow->selectWidget( formWindow );
+	formWindow->selectWidget( TQT_TQOBJECT(formWindow) );
 }
 
-class HorizontalLayoutList : public QWidgetList
+class HorizontalLayoutList : public TQWidgetList
 {
 public:
     HorizontalLayoutList( const TQWidgetList &l )
@@ -307,36 +307,36 @@ void HorizontalLayout::setup()
 
 void HorizontalLayout::doLayout()
 {
-    bool needMove, needReparent;
-    if ( !prepareLayout( needMove, needReparent ) )
+    bool needMove, needRetqparent;
+    if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
+    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent && w->parent() != layoutBase )
-	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
+	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
+	    w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
+		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
 	    else
-		layout->addWidget( w );
-	    if ( ::qt_cast<QLayoutWidget*>(w) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+		tqlayout->addWidget( w );
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( ::qt_cast<TQSplitter*>(layoutBase) )
-	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
+    if ( ::tqqt_cast<TQSplitter*>(tqlayoutBase) )
+	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
 
 
-class VerticalLayoutList : public QWidgetList
+class VerticalLayoutList : public TQWidgetList
 {
 public:
     VerticalLayoutList( const TQWidgetList &l )
@@ -371,30 +371,30 @@ void VerticalLayout::setup()
 
 void VerticalLayout::doLayout()
 {
-    bool needMove, needReparent;
-    if ( !prepareLayout( needMove, needReparent ) )
+    bool needMove, needRetqparent;
+    if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
+    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent && w->parent() != layoutBase )
-	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
+	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
+	    w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
+		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
 	    else
-		layout->addWidget( w );
-	    if ( ::qt_cast<QLayoutWidget*>(w) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+		tqlayout->addWidget( w );
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( ::qt_cast<TQSplitter*>(layoutBase) )
-	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
+    if ( ::tqqt_cast<TQSplitter*>(tqlayoutBase) )
+	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
@@ -743,11 +743,11 @@ GridLayout::~GridLayout()
 
 void GridLayout::doLayout()
 {
-    bool needMove, needReparent;
-    if ( !prepareLayout( needMove, needReparent ) )
+    bool needMove, needRetqparent;
+    if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
+    TQDesignerGridLayout *tqlayout = (TQDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -756,21 +756,21 @@ void GridLayout::doLayout()
     int r, c, rs, cs;
     for ( w = widgets.first(); w; w = widgets.next() ) {
 	if ( grid->locateWidget( w, r, c, rs, cs) ) {
-	    if ( needReparent && w->parent() != layoutBase )
-		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
+	    if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
+		w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	    if ( rs * cs == 1 ) {
-		layout->addWidget( w, r, c, ::qt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
+		tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    } else {
-		layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::qt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
+		tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    }
-	    if ( ::qt_cast<QLayoutWidget*>(w) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	    w->show();
 	} else {
-	    qWarning("ooops, widget '%s' does not fit in layout", w->name() );
+	    qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() );
 	}
     }
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 void GridLayout::setup()
@@ -787,7 +787,7 @@ void GridLayout::buildGrid()
     // Pixel to cell conversion:
     // By keeping a list of start'n'stop values (x & y) for each widget,
     // it is possible to create a very small grid of cells to represent
-    // the widget layout.
+    // the widget tqlayout.
     // -----------------------------------------------------------------
 
     // We need a list of both start and stop values for x- & y-axis
@@ -798,7 +798,7 @@ void GridLayout::buildGrid()
     int index  = 0;
     TQWidget* w = 0;
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	TQRect widgetPos = w->geometry();
+	TQRect widgetPos = w->tqgeometry();
 	x[index]   = widgetPos.left();
 	x[index+1] = widgetPos.right();
 	y[index]   = widgetPos.top();
@@ -829,7 +829,7 @@ void GridLayout::buildGrid()
 		current++;
     }
 
-    // Create the smallest grid possible to represent the current layout
+    // Create the smallest grid possible to represent the current tqlayout
     // Since no widget will be placed in the last row and column, we'll
     // skip them to increase speed even further
     delete grid;
@@ -837,7 +837,7 @@ void GridLayout::buildGrid()
 
     // Mark the cells in the grid that contains a widget
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	TQRect c(0,0,0,0), widgetPos = w->geometry();
+	TQRect c(0,0,0,0), widgetPos = w->tqgeometry();
 	// From left til right (not including)
 	for (uint cw=0; cw<x.size(); cw++) {
 	    if ( x[cw] == widgetPos.left() )
@@ -863,9 +863,9 @@ void GridLayout::buildGrid()
 
 
 
-Spacer::Spacer( TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WMouseNoMask ),
-      orient( Vertical ), interactive(TRUE), sh( TQSize(20,20) )
+Spacer::Spacer( TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WMouseNoMask ),
+      orient(Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) )
 {
     setSizeType( Expanding );
     setAutoMask( TRUE );
@@ -874,11 +874,11 @@ Spacer::Spacer( TQWidget *parent, const char *name )
 void Spacer::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
-    p.setPen( Qt::blue );
+    p.setPen( TQt::blue );
 
-    if ( orient == Horizontal ) {
+    if ( orient ==Qt::Horizontal ) {
 	const int dist = 3;
-	const int amplitude = QMIN( 3, height() / 3 );
+	const int amplitude = TQMIN( 3, height() / 3 );
 	const int base = height() / 2;
 	int i = 0;
 	p.setPen( white );
@@ -891,7 +891,7 @@ void Spacer::paintEvent( TQPaintEvent * )
 	p.drawLine( width() - 1, 0, width() - 1, height());
     } else {
 	const int dist = 3;
-	const int amplitude = QMIN( 3, width() / 3 );
+	const int amplitude = TQMIN( 3, width() / 3 );
 	const int base = width() / 2;
 	int i = 0;
 	p.setPen( white );
@@ -908,20 +908,20 @@ void Spacer::paintEvent( TQPaintEvent * )
 void Spacer::resizeEvent( TQResizeEvent* e)
 {
     TQWidget::resizeEvent( e );
-    if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
+    if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
 	sh = size();
 }
 
 void Spacer::updateMask()
 {
     TQRegion r( rect() );
-    if ( orient == Horizontal ) {
-	const int amplitude = QMIN( 3, height() / 3 );
+    if ( orient ==Qt::Horizontal ) {
+	const int amplitude = TQMIN( 3, height() / 3 );
 	const int base = height() / 2;
 	r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) );
 	r = r.subtract( TQRect(1, base + amplitude, width() - 2, height() - base - amplitude ) );
     } else {
-	const int amplitude = QMIN( 3, width() / 3 );
+	const int amplitude = TQMIN( 3, width() / 3 );
 	const int base = width() / 2;
 	r = r.subtract( TQRect(0, 1, base - amplitude, height() - 2 ) );
 	r = r.subtract( TQRect( base + amplitude, 1, width() - base - amplitude, height() - 2 ) );
@@ -932,40 +932,40 @@ void Spacer::updateMask()
 void Spacer::setSizeType( SizeType t )
 {
     TQSizePolicy sizeP;
-    if ( orient == Vertical )
+    if ( orient ==Qt::Vertical )
 	sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
     else
 	sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
-    setSizePolicy( sizeP );
+    tqsetSizePolicy( sizeP );
 }
 
 
 Spacer::SizeType Spacer::sizeType() const
 {
-    if ( orient == Vertical )
-	return (SizeType)sizePolicy().verData();
-    return (SizeType)sizePolicy().horData();
+    if ( orient ==Qt::Vertical )
+	return (SizeType)tqsizePolicy().verData();
+    return (SizeType)tqsizePolicy().horData();
 }
 
-int Spacer::alignment() const
+int Spacer::tqalignment() const
 {
-    if ( orient == Vertical )
+    if ( orient ==Qt::Vertical )
 	return AlignHCenter;
     return AlignVCenter;
 }
 
-TQSize Spacer::minimumSize() const
+TQSize Spacer::tqminimumSize() const
 {
     TQSize s = TQSize( 20,20 );
     if ( sizeType() == Expanding )
-	if ( orient == Vertical )
+	if ( orient ==Qt::Vertical )
 	    s.rheight() = 0;
 	else
 	    s.rwidth() = 0;
     return s;
 }
 
-TQSize Spacer::sizeHint() const
+TQSize Spacer::tqsizeHint() const
 {
     return sh;
 }
@@ -974,8 +974,8 @@ TQSize Spacer::sizeHint() const
 void Spacer::setSizeHint( const TQSize &s )
 {
     sh = s;
-    if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
-	resize( sizeHint() );
+    if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
+	resize( tqsizeHint() );
     updateGeometry();
 }
 
@@ -994,7 +994,7 @@ void Spacer::setOrientation( Qt::Orientation o )
     setSizeType( st );
     if ( interactive ) {
 	sh = TQSize( sh.height(), sh.width() );
-	if (!parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
+	if (!tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
 	    resize( height(), width() );
     }
     updateMask();
@@ -1003,13 +1003,13 @@ void Spacer::setOrientation( Qt::Orientation o )
 }
 
 
-void QDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ )
+void TQDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ )
 {
     items.insert( w, Item(row, col, 1, 1) );
     TQGridLayout::addWidget( w, row, col, align_ );
 }
 
-void QDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
+void TQDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
 					      int fromCol, int toCol, int align_ )
 {
     items.insert( w, Item(fromRow, fromCol, toRow - fromRow + 1, toCol - fromCol +1) );
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index 23fff02b..67061595 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,9 +38,10 @@
 class FormWindow;
 class TQPaintEvent;
 
-class Layout : public QObject
+class Layout : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
@@ -49,15 +50,15 @@ public:
     virtual void doLayout() = 0;
     virtual void undoLayout();
     virtual void breakLayout();
-    virtual bool prepareLayout( bool &needMove, bool &needReparent );
-    virtual void finishLayout( bool needMove, TQLayout *layout );
+    virtual bool prepareLayout( bool &needMove, bool &needRetqparent );
+    virtual void finishLayout( bool needMove, TQLayout *tqlayout );
 
 protected:
     TQWidgetList widgets;
-    TQWidget *parent;
+    TQWidget *tqparent;
     TQPoint startPoint;
     TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
-    TQWidget *layoutBase;
+    TQWidget *tqlayoutBase;
     FormWindow *formWindow;
     TQRect oldGeometry;
     bool isBreak;
@@ -74,7 +75,7 @@ protected slots:
 class HorizontalLayout : public Layout
 {
 public:
-    HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+   HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
 
     void doLayout();
 
@@ -86,7 +87,7 @@ protected:
 class VerticalLayout : public Layout
 {
 public:
-    VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+   VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
 
     void doLayout();
 
@@ -115,16 +116,17 @@ protected:
 
 };
 
-class Spacer : public QWidget
+class Spacer : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_OVERRIDE( TQCString name )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_OVERRIDE( TQCString name )
+    TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
     Q_ENUMS( SizeType )
-    Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
-    Q_OVERRIDE( TQRect geometry DESIGNABLE false )
+    TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
+    TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+    TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
 
 private:
     enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -138,15 +140,15 @@ public:
 		    MinimumExpanding = Minimum|ExpMask,
 		    Expanding = MinimumExpanding|MayShrink };
 
-    Spacer( TQWidget *parent, const char *name );
+    Spacer( TQWidget *tqparent, const char *name );
 
-    TQSize minimumSize() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSize() const;
+    TQSize tqsizeHint() const;
     void setSizeType( SizeType t );
     SizeType sizeType() const;
-    int alignment() const;
-    Orientation orientation() const;
-    void setOrientation( Orientation o );
+    int tqalignment() const;
+    Qt::Orientation orientation() const;
+    void setOrientation( Qt::Orientation o );
     void setInteraciveMode( bool b ) { interactive = b; };
     void setSizeHint( const TQSize &s );
 
@@ -159,12 +161,13 @@ protected:
     TQSize sh;
 };
 
-class QDesignerGridLayout : public QGridLayout
+class TQDesignerGridLayout : public TQGridLayout
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-    QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){};
-    QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
+    TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
+    TQDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
 
     void addWidget( TQWidget *, int row, int col, int align = 0 );
     void addMultiCellWidget( TQWidget *, int fromRow, int toRow,
@@ -178,7 +181,7 @@ public:
 	int column;
 	int rowspan;
 	int colspan;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     TQMap<TQWidget*, Item> items;
diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp
index 8ed979f2..9c57eb18 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/kdevdesigner/designer/listboxdnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,13 +32,13 @@
 #include <tqvaluelist.h>
 
 // The Dragobject Declaration ---------------------------------------
-class ListBoxItemDrag : public QStoredDrag
+class ListBoxItemDrag : public TQStoredDrag
 {
 public:
-    ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 );
+    ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * tqparent = 0, const char * name = 0 );
     ~ListBoxItemDrag() {};
     static bool canDecode( TQDragMoveEvent * event );
-    static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint );
+    static bool decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * insertPoint );
     enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 };
 };
 // ------------------------------------------------------------------
@@ -81,7 +81,7 @@ bool ListBoxDnd::dropEvent( TQDropEvent * event )
 
 bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event )
 {
-    if ( event->state() & LeftButton ) {
+    if ( event->state() & Qt::LeftButton ) {
 	if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) {
 
 	    ListBoxItemList list;
@@ -141,7 +141,7 @@ void ListBoxDnd::removeList( ListBoxItemList & list )
 {
     TQListBoxItem * i = list.first();
     while ( i ) {
-	((TQListBox *)src)->takeItem( i ); // remove item from QListBox
+	((TQListBox *)src)->takeItem( i ); // remove item from TQListBox
 	i = list.next();
     }
 }
@@ -152,8 +152,8 @@ void ListBoxDnd::updateLine( const TQPoint & dragPos )
     TQListBoxItem *item = itemAt( dragPos );
 
     int ypos = item ? 
-	( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : 
-	( src->itemRect( ((TQListBox *)src)->firstItem() ).top() );
+	( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) : 
+	( src->tqitemRect( ((TQListBox *)src)->firstItem() ).top() );
 
     line->resize( src->viewport()->width(), line->height() );
     line->move( 0, ypos );
@@ -166,9 +166,9 @@ TQListBoxItem * ListBoxDnd::itemAt( TQPoint pos )
     TQListBoxItem * last = src->item( src->count() - 1 );
     int i = src->index( result );
 
-    if ( result && ( pos.y() < (src->itemRect(result).top() + src->itemHeight(i)/2) ) )
+    if ( result && ( pos.y() < (src->tqitemRect(result).top() + src->itemHeight(i)/2) ) )
 	result = result->prev();
-    else if ( !result && pos.y() > src->itemRect( last ).bottom() )
+    else if ( !result && pos.y() > src->tqitemRect( last ).bottom() )
 	result = last;
 
     return result;
@@ -184,15 +184,15 @@ bool ListBoxDnd::canDecode( TQDragEnterEvent * event )
 // The Dragobject Implementation ------------------------------------
 // ------------------------------------------------------------------
 
-ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name )
-    : TQStoredDrag( "qt/listboxitem", parent, name )
+ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * tqparent, const char * name )
+    : TQStoredDrag( "qt/listboxitem", tqparent, name )
 {
     // ### FIX!
-    TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
+    TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
     TQDataStream stream( data, IO_WriteOnly );
 
     stream << items.count();
-    stream << (Q_UINT8) sendPtr; // just transfer item pointer; omit data
+    stream << (TQ_UINT8) sendPtr; // just transfer item pointer; omit data
 
     TQListBoxItem * i = items.first();
 
@@ -200,7 +200,7 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
 	
 	while ( i ) {
 	    
-	    stream << (Q_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+	    stream << (TQ_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
 	    i = items.next();
 	    
 	}
@@ -209,21 +209,21 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
   
 	while ( i ) {
 	
-	    Q_UINT8 b = 0;
+	    TQ_UINT8 b = 0;
 
-	    b = (Q_UINT8) ( i->text() != TQString::null ); // does item have text ?
+	    b = (TQ_UINT8) ( i->text() != TQString() ); // does item have text ?
 	    stream << b;
 	    if ( b ) {
 		stream << i->text();
 	    }
     
-	    b = (Q_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
+	    b = (TQ_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
 	    stream << b;
 	    if ( b ) {
 		stream << ( *i->pixmap() );
 	    }
 
-	    stream << (Q_UINT8) i->isSelectable();
+	    stream << (TQ_UINT8) i->isSelectable();
 	    
 	    i = items.next();
 	}
@@ -238,9 +238,9 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event )
     return event->provides( "qt/listboxitem" );
 }
 
-bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after )
+bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * after )
 {
-    TQByteArray data = event->encodedData( "qt/listboxitem" );
+    TQByteArray data = event->tqencodedData( "qt/listboxitem" );
 
     if ( data.size() ) {
 	event->accept();
@@ -249,7 +249,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
 	int count = 0;
 	stream >> count;
 
-	Q_UINT8 recievePtr = 0; // data contains just item pointers; no data
+	TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data
 	stream >> recievePtr;
 
 	TQListBoxItem * item = 0;
@@ -258,11 +258,11 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
 	    
 	    for( int i = 0; i < count; i++ ) {
 
-		Q_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+		TQ_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
 		stream >> p;
 		item = (TQListBoxItem *) p;
 		
-		parent->insertItem( item, after );
+		tqparent->insertItem( item, after );
 		
 	    }
 	    
@@ -270,27 +270,27 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
 
 	    for ( int i = 0; i < count; i++ ) {
 
-		Q_UINT8 hasText = 0;
+		TQ_UINT8 hasText = 0;
 		TQString text;
 		stream >> hasText;
 		if ( hasText ) {
 		    stream >> text;
 		}
 	    
-		Q_UINT8 hasPixmap = 0;
+		TQ_UINT8 hasPixmap = 0;
 		TQPixmap pixmap;
 		stream >> hasPixmap;
 		if ( hasPixmap ) {
 		    stream >> pixmap;
 		}
 	    
-		Q_UINT8 isSelectable = 0;
+		TQ_UINT8 isSelectable = 0;
 		stream >> isSelectable;
 
 		if ( hasPixmap ) {
-		    item = new TQListBoxPixmap( parent, pixmap, text, after );
+		    item = new TQListBoxPixmap( tqparent, pixmap, text, after );
 		} else {
-		    item = new TQListBoxText( parent, text, after );
+		    item = new TQListBoxText( tqparent, text, after );
 		}
 
 		item->setSelectable( isSelectable );
diff --git a/kdevdesigner/designer/listboxdnd.h b/kdevdesigner/designer/listboxdnd.h
index 3885dce2..b4da4d39 100644
--- a/kdevdesigner/designer/listboxdnd.h
+++ b/kdevdesigner/designer/listboxdnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,6 +36,7 @@ typedef TQPtrList<TQListBoxItem> ListBoxItemList;
 class ListBoxDnd : public ListDnd
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     // dragModes are enumerated in ListDnd
     ListBoxDnd( TQListBox * eventSource, const char * name = 0 );
diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui
index ce3d4b79..bb904236 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/kdevdesigner/designer/listboxeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListBoxEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -91,14 +91,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -145,7 +145,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>preview</cstring>
             </property>
@@ -156,7 +156,7 @@
                 <string>The list of items.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="2" rowspan="5" colspan="1">
+        <widget class="TQGroupBox" row="0" column="2" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>Label2</cstring>
                     </property>
@@ -184,7 +184,7 @@
                         <cstring>itemChoosePixmap</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>itemPixmap</cstring>
                     </property>
@@ -192,11 +192,11 @@
                         <string>Label4</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>itemDeletePixmap</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -215,11 +215,11 @@
                         <string>Delete the selected item's pixmap.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="3">
+                <widget class="TQPushButton" row="1" column="3">
                     <property name="name">
                         <cstring>itemChoosePixmap</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -235,7 +235,7 @@
                         <string>Choose a pixmap file for the selected item.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>Label1</cstring>
                     </property>
@@ -250,7 +250,7 @@
                     <property name="name">
                         <cstring>itemText</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -265,7 +265,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>itemNew</cstring>
             </property>
@@ -279,7 +279,7 @@
                 <string>&lt;b&gt;Add a new item.&lt;/b&gt;&lt;p&gt;New items are appended to the list.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>itemDelete</cstring>
             </property>
@@ -303,14 +303,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>itemUp</cstring>
             </property>
@@ -327,7 +327,7 @@
                 <string>Moves the selected item up.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>itemDown</cstring>
             </property>
@@ -361,9 +361,9 @@
     </connection>
     <connection>
         <sender>itemText</sender>
-        <signal>textChanged( const QString &amp; )</signal>
+        <signal>textChanged( const TQString &amp; )</signal>
         <receiver>ListBoxEditorBase</receiver>
-        <slot>currentTextChanged(const QString&amp;)</slot>
+        <slot>currentTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -409,15 +409,15 @@
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>ListBoxEditorBase</receiver>
-        <slot>currentItemChanged(QListBoxItem*)</slot>
+        <slot>currentItemChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>currentChanged( QListBoxItem * )</signal>
+        <signal>currentChanged( TQListBoxItem * )</signal>
         <receiver>ListBoxEditorBase</receiver>
-        <slot>currentItemChanged(QListBoxItem*)</slot>
+        <slot>currentItemChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -434,13 +434,13 @@
     <tabstop>helpButton</tabstop>
     <tabstop>buttonApply</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">insertNewItem()</slot>
     <slot access="protected">deleteCurrentItem()</slot>
-    <slot access="protected">currentItemChanged( QListBoxItem * )</slot>
-    <slot access="protected">currentTextChanged( const QString &amp; )</slot>
+    <slot access="protected">currentItemChanged( TQListBoxItem * )</slot>
+    <slot access="protected">currentTextChanged( const TQString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">cancelClicked()</slot>
     <slot access="protected">applyClicked()</slot>
@@ -448,10 +448,10 @@
     <slot access="protected">deletePixmap()</slot>
     <slot access="protected">moveItemUp()</slot>
     <slot access="protected">moveItemDown()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index 2fade00e..073fdda6 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,8 +40,8 @@
 
 #include <klocale.h>
 
-ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
-    : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw )
+ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
+    : ListBoxEditorBase( tqparent, 0, TRUE ), formwindow( fw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     listbox = (TQListBox*)editWidget;
@@ -70,7 +70,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow
 
     ListBoxRename *editorRename = new ListBoxRename( preview );
 
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+    TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
     TQObjectListIt it( *l );
     TQObject *obj;
     while ( (obj = it.current()) != 0 ) {
@@ -161,7 +161,7 @@ void ListBoxEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).arg( listbox->name() ),
+    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).tqarg( listbox->name() ),
 							      formwindow, listbox, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h
index 960108fa..a73865f2 100644
--- a/kdevdesigner/designer/listboxeditorimpl.h
+++ b/kdevdesigner/designer/listboxeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,10 @@ class FormWindow;
 class ListBoxEditor : public ListBoxEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
 protected slots:
     void insertNewItem();
diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp
index d51381dd..53f0deea 100644
--- a/kdevdesigner/designer/listboxrename.cpp
+++ b/kdevdesigner/designer/listboxrename.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include "listboxrename.h"
 
-class EditableListBoxItem : public QListBoxItem
+class EditableListBoxItem : public TQListBoxItem
 {
 public:
     void setText( const TQString & text )
@@ -84,24 +84,24 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event )
 	
 	switch ( ((TQKeyEvent *) event)->key() ) {
 
-	case Qt::Key_F2:
+	case TQt::Key_F2:
 	    
 	    activity = FALSE;
 	    clickedItem = src->item( src->currentItem() );
 	    showLineEdit();
 	    break;
 
-	case Qt::Key_Escape:
+	case TQt::Key_Escape:
 	    if ( !ed->isHidden() ) {
 		hideLineEdit(); // abort rename
 		return TRUE;
 	    }
 	    break;
 
-	case Qt::Key_Up:
-	case Qt::Key_Down:
-	case Qt::Key_PageUp:
-	case Qt::Key_PageDown:
+	case TQt::Key_Up:
+	case TQt::Key_Down:
+	case TQt::Key_PageUp:
+	case TQt::Key_PageDown:
 	    
 	    if ( !ed->isHidden() )
 		return TRUE; // Filter out the keystrokes
@@ -113,7 +113,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event )
     case TQEvent::Resize:
 
 	if ( clickedItem && ed && !ed->isHidden() ) {
-	    TQRect rect = src->itemRect( clickedItem );
+	    TQRect rect = src->tqitemRect( clickedItem );
 	    ed->resize( rect.right() - rect.left() - 1,
 		rect.bottom() - rect.top() - 1 );
 	}
@@ -130,7 +130,7 @@ void ListBoxRename::showLineEdit()
 {
     if ( !clickedItem || activity )
 	return;
-    TQRect rect = src->itemRect( clickedItem );
+    TQRect rect = src->tqitemRect( clickedItem );
     ed->resize( rect.right() - rect.left() - 1,
 		rect.bottom() - rect.top() - 1 );
     ed->move( rect.left() + 1, rect.top() + 1 );
diff --git a/kdevdesigner/designer/listboxrename.h b/kdevdesigner/designer/listboxrename.h
index 01f4f2e5..80b339a1 100644
--- a/kdevdesigner/designer/listboxrename.h
+++ b/kdevdesigner/designer/listboxrename.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,9 +32,10 @@
 
 class TQLineEdit;
 
-class ListBoxRename : public QObject
+class ListBoxRename : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ListBoxRename( TQListBox * eventSource, const char * name = 0 );
     bool eventFilter( TQObject *, TQEvent * event );
diff --git a/kdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp
index 7df65cbd..8431fd18 100644
--- a/kdevdesigner/designer/listdnd.cpp
+++ b/kdevdesigner/designer/listdnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,8 +37,8 @@ ListDnd::ListDnd( TQScrollView * eventSource, const char * name )
     src->installEventFilter( this );
     src->viewport()->installEventFilter( this );
 
-    line = new TQWidget( src->viewport(), 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop );
-    line->setBackgroundColor( Qt::black );
+    line = new TQWidget( src->viewport(), 0, TQt::WStyle_NoBorder | WStyle_StaysOnTop );
+    line->setBackgroundColor( TQt::black );
     line->resize( src->viewport()->width(), 2 );
     line->hide();
 }
@@ -119,7 +119,7 @@ bool ListDnd::dropEvent( TQDropEvent * )
 
 bool ListDnd::mousePressEvent( TQMouseEvent * event )
 {
-    if ( event->button() == LeftButton )
+    if ( event->button() == Qt::LeftButton )
 	mousePressPos = event->pos();
     return FALSE;
 }
diff --git a/kdevdesigner/designer/listdnd.h b/kdevdesigner/designer/listdnd.h
index 8594085b..6adf1f24 100644
--- a/kdevdesigner/designer/listdnd.h
+++ b/kdevdesigner/designer/listdnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,9 +30,10 @@
 #include <tqobject.h>
 #include <tqscrollview.h>
 
-class ListDnd : public QObject
+class ListDnd : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum DragMode { None = 0, External = 1, Internal = 2, Both = 3, Move = 4, NullDrop = 8 };
     ListDnd( TQScrollView * eventSource, const char * name = 0 );
diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui
index 6118ba2b..02d60cb9 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/kdevdesigner/designer/listeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListEditor</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListView" row="0" column="0" rowspan="5" colspan="1">
             <column>
                 <property name="text">
                     <string>Column 1</string>
@@ -72,7 +72,7 @@
                 <enum>AllColumns</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -80,7 +80,7 @@
                 <string>&amp;Add</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <string>&amp;Remove</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>PushButton3</cstring>
             </property>
@@ -96,7 +96,7 @@
                 <string>Re&amp;name</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>PushButton4</cstring>
             </property>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -144,9 +144,9 @@
     </connection>
     <connection>
         <sender>listview</sender>
-        <signal>itemRenamed(QListViewItem*,int)</signal>
+        <signal>itemRenamed(TQListViewItem*,int)</signal>
         <receiver>ListEditor</receiver>
-        <slot>renamed(QListViewItem*)</slot>
+        <slot>renamed(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>PushButton3</sender>
@@ -159,21 +159,21 @@
     <include location="local" impldecl="in implementation">listeditor.ui.h</include>
 </includes>
 <forwards>
-    <forward>class QStringList;</forward>
+    <forward>class TQStringList;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-    <slot>setList( const QStringList &amp; l )</slot>
+    <slot>setList( const TQStringList &amp; l )</slot>
     <slot>addItem()</slot>
-    <slot>renamed( QListViewItem * i )</slot>
+    <slot>renamed( TQListViewItem * i )</slot>
     <slot>removeItems()</slot>
-    <slot returnType="QStringList">items()</slot>
+    <slot returnType="TQStringList">items()</slot>
     <slot>renameItem()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listeditor.ui.h b/kdevdesigner/designer/listeditor.ui.h
index cd0aa7f0..7f179cef 100644
--- a/kdevdesigner/designer/listeditor.ui.h
+++ b/kdevdesigner/designer/listeditor.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -30,7 +30,7 @@ void ListEditor::addItem()
 {
     TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() );
     i->setRenameEnabled( 0, TRUE );
-    qApp->processEvents();
+    tqApp->processEvents();
     i->startRename( 0 );
 }
 
diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp
index a4abae07..b1d5323d 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/kdevdesigner/designer/listviewdnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,14 +32,14 @@
 #include <tqvaluelist.h>
 
 // The Dragobject Declaration ---------------------------------------
-class ListViewItemDrag : public QStoredDrag
+class ListViewItemDrag : public TQStoredDrag
 {
 public:
     enum DropRelation { Sibling, Child };
-    ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 );
+    ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent = 0, const char * name = 0 );
     ~ListViewItemDrag() {};
     static bool canDecode( TQDragMoveEvent * event );
-    static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr );
+    static bool decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr );
 };
 // ------------------------------------------------------------------
 
@@ -74,7 +74,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event )
 	    } else if ( dpos < item->depth() ) {
 		// Parent(s) Sibling
 		while ( item && (item->depth() > dpos) )
-		    item = item->parent();
+		    item = item->tqparent();
 	    }
 	}
 
@@ -92,7 +92,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event )
 
 bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event )
 {
-    if ( event->state() & LeftButton ) {
+    if ( event->state() & Qt::LeftButton ) {
 	if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) {
 	    ListViewItemList list;
 
@@ -142,22 +142,22 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
 
 	if ( (*it)->isSelected() ) {
 	    if ( (*it)->childCount() == 0 ) {
-		// Selected, no children
+		// Selected, no tqchildren
 		list.append( *it );
 	    } else if ( !addKids ) {
 		// Children processing not set, so set it
 		// Also find the item were we shall quit
-		// processing children...if any such item
+		// processing tqchildren...if any such item
 		addKids = TRUE;
 		nextSibling = (*it)->nextSibling();
-		nextParent = (*it)->parent();
+		nextParent = (*it)->tqparent();
 		while ( nextParent && !nextSibling ) {
 		    nextSibling = nextParent->nextSibling();
-		    nextParent = nextParent->parent();
+		    nextParent = nextParent->tqparent();
 		}
 	    }
 	} else if ( ((*it)->childCount() == 0) && addKids ) {
-	    // Leaf node, and we _do_ process children
+	    // Leaf node, and we _do_ process tqchildren
 	    list.append( *it );
 	}
     }
@@ -191,8 +191,8 @@ void ListViewDnd::updateLine( const TQPoint & dragPos )
     TQListView * src = (TQListView *) this->src;
 
     int ypos = item ? 
-	( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : 
-	( src->itemRect( src->firstChild() ).top() );
+	( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) : 
+	( src->tqitemRect( src->firstChild() ).top() );
 
     int xpos = dropDepth( item, dragPos ) * src->treeStepSize();
     line->resize( src->viewport()->width() - xpos, line->height() );
@@ -209,15 +209,15 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos )
     if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) )
 	result = result->itemAbove();
 
-    // Wind back if has parent, and we're in flat mode
-    while ( result && result->parent() && (dMode & Flat) )
-	result = result->parent();
+    // Wind back if has tqparent, and we're in flat mode
+    while ( result && result->tqparent() && (dMode & Flat) )
+	result = result->tqparent();
 
-    // Wind back if has parent, and we're in flat mode
-    while ( result && !result->isVisible() && result->parent() )
-	result = result->parent();
+    // Wind back if has tqparent, and we're in flat mode
+    while ( result && !result->isVisible() && result->tqparent() )
+	result = result->tqparent();
 
-    if ( !result && src->firstChild() && (pos.y() > src->itemRect(src->firstChild()).bottom()) ) {
+    if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) {
 	result = src->lastItem();
 	if ( !result->isVisible() )
 	    // Handle special case where last item is actually hidden
@@ -259,11 +259,11 @@ bool ListViewDnd::canDecode( TQDragEnterEvent * event )
 TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item );
 TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item );
 
-ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name )
-    : TQStoredDrag( "qt/listviewitem", parent, name )
+ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent, const char * name )
+    : TQStoredDrag( "qt/listviewitem", tqparent, name )
 {
     // ### FIX!
-    TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListViewItem ) * items.count() );
+    TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() );
     TQDataStream stream( data, IO_WriteOnly );
 
     stream << items.count();
@@ -282,10 +282,10 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event )
     return event->provides( "qt/listviewitem" );
 }
 
-bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr )
+bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr )
 {
-    TQByteArray data = event->encodedData( "qt/listviewitem" );
-    TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0;
+    TQByteArray data = event->tqencodedData( "qt/listviewitem" );
+    TQListViewItem* itemParent = insertPoint ? insertPoint->tqparent() : 0;
 
     // Change from sibling (default) to child creation
     if ( insertPoint && dr == Child ) {
@@ -304,8 +304,8 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListV
 	    if ( itemParent ) {
 		insertPoint = new TQListViewItem( itemParent, insertPoint );
 		itemParent->setOpen( TRUE );
-	    } else { // No parent for insertPoint, use QListView
-		insertPoint = new TQListViewItem( parent, insertPoint );
+	    } else { // No tqparent for insertPoint, use TQListView
+		insertPoint = new TQListViewItem( tqparent, insertPoint );
 	    }
 	    stream >> *insertPoint;
 	}
@@ -320,11 +320,11 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
     int columns = item.listView()->columns();
     stream << columns;
  
-    Q_UINT8 b = 0;
+    TQ_UINT8 b = 0;
 
     int i;
     for ( i = 0; i < columns; i++ ) {
-	b = (Q_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ?
+	b = (TQ_UINT8) ( item.text( i ) != TQString() ); // does column i have a string ?
 	stream << b;
 	if ( b ) {
 	    stream << item.text( i );
@@ -332,25 +332,25 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
     }
     
     for ( i = 0; i < columns; i++ ) {
-	b = (Q_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
+	b = (TQ_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
 	stream << b;
 	if ( b ) {
 	    stream << ( *item.pixmap( i ) );
 	}
     }
 
-    stream << (Q_UINT8) item.isOpen();
-    stream << (Q_UINT8) item.isSelectable();
-    stream << (Q_UINT8) item.isExpandable();
-    stream << (Q_UINT8) item.dragEnabled();
-    stream << (Q_UINT8) item.dropEnabled();
-    stream << (Q_UINT8) item.isVisible();
+    stream << (TQ_UINT8) item.isOpen();
+    stream << (TQ_UINT8) item.isSelectable();
+    stream << (TQ_UINT8) item.isExpandable();
+    stream << (TQ_UINT8) item.dragEnabled();
+    stream << (TQ_UINT8) item.dropEnabled();
+    stream << (TQ_UINT8) item.isVisible();
 
     for ( i = 0; i < columns; i++ ) {
-	stream << (Q_UINT8) item.renameEnabled( i );
+	stream << (TQ_UINT8) item.renameEnabled( i );
     }
 
-    stream << (Q_UINT8) item.multiLinesEnabled();
+    stream << (TQ_UINT8) item.multiLinesEnabled();
     stream << item.childCount();
 
     if ( item.childCount() > 0 ) {
@@ -366,10 +366,10 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
     
 TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item )
 {
-    Q_INT32 columns;
+    TQ_INT32 columns;
     stream >> columns;
 
-    Q_UINT8 b = 0;
+    TQ_UINT8 b = 0;
 
     TQString text;
     int i;
diff --git a/kdevdesigner/designer/listviewdnd.h b/kdevdesigner/designer/listviewdnd.h
index c564326c..86c879ac 100644
--- a/kdevdesigner/designer/listviewdnd.h
+++ b/kdevdesigner/designer/listviewdnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,6 +38,7 @@ typedef TQPtrList<TQListViewItem> ListViewItemList;
 class ListViewDnd : public ListDnd
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum DragMode { Flat = 16 }; // see ListDnd::DragMode
 
diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui
index d9e87240..c3e4df1b 100644
--- a/kdevdesigner/designer/listvieweditor.ui
+++ b/kdevdesigner/designer/listvieweditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListViewEditorBase</cstring>
     </property>
@@ -56,11 +56,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget10</cstring>
                 </property>
@@ -77,7 +77,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QPushButton" row="2" column="1">
+                    <widget class="TQPushButton" row="2" column="1">
                         <property name="name">
                             <cstring>itemDelete</cstring>
                         </property>
@@ -91,7 +91,7 @@
                             <string>&lt;b&gt;Deletes the selected item.&lt;/b&gt;&lt;p&gt;Any sub-items are also deleted.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="2" rowspan="8" colspan="1">
+                    <widget class="TQGroupBox" row="0" column="2" rowspan="8" colspan="1">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
@@ -116,7 +116,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>Label2</cstring>
                                 </property>
@@ -127,7 +127,7 @@
                                     <cstring>itemChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>Label1</cstring>
                                 </property>
@@ -138,11 +138,11 @@
                                     <cstring>itemText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>itemText</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -155,7 +155,7 @@
                                     <string>&lt;b&gt;Change the text of the item.&lt;/b&gt;&lt;p&gt;The text will be changed in the current column of the selected item.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="0" column="1">
+                            <widget class="TQSpinBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>itemColumn</cstring>
                                 </property>
@@ -166,7 +166,7 @@
                                     <string>&lt;b&gt;Select the current column.&lt;/b&gt;&lt;p&gt;The item's text and pixmap will be changed for the current column&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>Label4</cstring>
                                 </property>
@@ -177,7 +177,7 @@
                                     <cstring>itemColumn</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="2" column="1">
+                            <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
                                     <cstring>Layout2</cstring>
                                 </property>
@@ -191,7 +191,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>itemPixmap</cstring>
                                         </property>
@@ -199,11 +199,11 @@
                                             <string>Label4</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>itemDeletePixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -222,11 +222,11 @@
                                             <string>&lt;b&gt;Delete the selected item's pixmap.&lt;/b&gt;&lt;p&gt;The pixmap in the current column of the selected item will be deleted.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>itemChoosePixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -246,7 +246,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>itemNew</cstring>
                         </property>
@@ -260,7 +260,7 @@
                             <string>&lt;b&gt;Adds a new item to the list.&lt;/b&gt;&lt;p&gt;The item will be inserted at the top of the list and can be moved using the up- and down-buttons.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListView" row="0" column="0" rowspan="8" colspan="1">
+                    <widget class="TQListView" row="0" column="0" rowspan="8" colspan="1">
                         <property name="name">
                             <cstring>itemsPreview</cstring>
                         </property>
@@ -268,7 +268,7 @@
                             <string>The list of items.</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>itemNewSub</cstring>
                         </property>
@@ -292,14 +292,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>itemUp</cstring>
                         </property>
@@ -316,7 +316,7 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The item will be moved within its level in the hierarchy.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>itemDown</cstring>
                         </property>
@@ -333,7 +333,7 @@
                             <string>&lt;b&gt;Move the selected item down.&lt;/b&gt;&lt;p&gt;The item will be moved within its level in the hierarchy.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="6" column="1">
+                    <widget class="TQPushButton" row="6" column="1">
                         <property name="name">
                             <cstring>itemLeft</cstring>
                         </property>
@@ -350,7 +350,7 @@
                             <string>&lt;b&gt;Move the selected item one level up.&lt;/b&gt;&lt;p&gt;This will also change the level of the item's sub-items.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="7" column="1">
+                    <widget class="TQPushButton" row="7" column="1">
                         <property name="name">
                             <cstring>itemRight</cstring>
                         </property>
@@ -369,7 +369,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget11</cstring>
                 </property>
@@ -386,7 +386,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox" row="0" column="2" rowspan="5" colspan="1">
+                    <widget class="TQGroupBox" row="0" column="2" rowspan="5" colspan="1">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
@@ -403,7 +403,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>Label2</cstring>
                                 </property>
@@ -414,7 +414,7 @@
                                     <cstring>colChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="1">
+                            <widget class="TQLabel" row="1" column="1">
                                 <property name="name">
                                     <cstring>colPixmap</cstring>
                                 </property>
@@ -422,11 +422,11 @@
                                     <string>Label4</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="2">
+                            <widget class="TQPushButton" row="1" column="2">
                                 <property name="name">
                                     <cstring>colDeletePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -445,11 +445,11 @@
                                     <string>Delete the pixmap of the selected column.</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="3">
+                            <widget class="TQPushButton" row="1" column="3">
                                 <property name="name">
                                     <cstring>colChoosePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -465,7 +465,7 @@
                                     <string>&lt;b&gt;Select a pixmap file for the selected column.&lt;/b&gt;&lt;p&gt;The pixmap will be displayed in the header of the listview.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>Label1</cstring>
                                 </property>
@@ -476,11 +476,11 @@
                                     <cstring>colText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>colText</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -493,7 +493,7 @@
                                     <string>&lt;b&gt;Enter the text for the selected column.&lt;/b&gt;&lt;p&gt;The text will be displayed in the header of the listview.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>colClickable</cstring>
                                 </property>
@@ -504,7 +504,7 @@
                                     <string>If this option is checked, the selected column will react to mouse clicks on the header.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>colResizable</cstring>
                                 </property>
@@ -517,7 +517,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>colDelete</cstring>
                         </property>
@@ -531,7 +531,7 @@
                             <string>Deletes the selected Column.</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>colDown</cstring>
                         </property>
@@ -548,7 +548,7 @@
                             <string>&lt;b&gt;Move the selected item down.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column in the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>colNew</cstring>
                         </property>
@@ -562,7 +562,7 @@
                             <string>&lt;b&gt;Create a new column.&lt;/b&gt;&lt;p&gt;New columns are appended at the end of (right of) the list and may be moved using the up- and down-buttons.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="3" column="1">
+                    <widget class="TQPushButton" row="3" column="1">
                         <property name="name">
                             <cstring>colUp</cstring>
                         </property>
@@ -579,7 +579,7 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column in the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+                    <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
                         <property name="name">
                             <cstring>colPreview</cstring>
                         </property>
@@ -597,7 +597,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -607,7 +607,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -621,7 +621,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -642,14 +642,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -666,7 +666,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>applyButton</cstring>
                     </property>
@@ -680,7 +680,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -737,9 +737,9 @@
     </connection>
     <connection>
         <sender>itemText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>itemTextChanged(const QString&amp;)</slot>
+        <slot>itemTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>itemDeletePixmap</sender>
@@ -779,9 +779,9 @@
     </connection>
     <connection>
         <sender>colText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>columnTextChanged(const QString&amp;)</slot>
+        <slot>columnTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>colDeletePixmap</sender>
@@ -809,9 +809,9 @@
     </connection>
     <connection>
         <sender>tabWidget</sender>
-        <signal>selected(const QString&amp;)</signal>
+        <signal>selected(const TQString&amp;)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>initTabPage(const QString&amp;)</slot>
+        <slot>initTabPage(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>okButton</sender>
@@ -827,27 +827,27 @@
     </connection>
     <connection>
         <sender>colPreview</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>colPreview</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>itemsPreview</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>itemsPreview</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>itemNewSub</sender>
@@ -897,7 +897,7 @@
     <tabstop>colClickable</tabstop>
     <tabstop>colResizable</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">applyClicked()</slot>
@@ -906,12 +906,12 @@
     <slot access="protected">columnPixmapChosen()</slot>
     <slot access="protected">columnPixmapDeleted()</slot>
     <slot access="protected">columnResizable(bool)</slot>
-    <slot access="protected">columnTextChanged(const QString &amp;)</slot>
+    <slot access="protected">columnTextChanged(const TQString &amp;)</slot>
     <slot access="protected">columnUpClicked()</slot>
-    <slot access="protected">currentColumnChanged(QListBoxItem*)</slot>
-    <slot access="protected">currentItemChanged(QListViewItem*)</slot>
+    <slot access="protected">currentColumnChanged(TQListBoxItem*)</slot>
+    <slot access="protected">currentItemChanged(TQListViewItem*)</slot>
     <slot access="protected">deleteColumnClicked()</slot>
-    <slot access="protected">initTabPage(const QString &amp;)</slot>
+    <slot access="protected">initTabPage(const TQString &amp;)</slot>
     <slot access="protected">itemColChanged(int)</slot>
     <slot access="protected">itemDeleteClicked()</slot>
     <slot access="protected">itemDownClicked()</slot>
@@ -920,16 +920,16 @@
     <slot access="protected">itemNewSubClicked()</slot>
     <slot access="protected">itemPixmapChoosen()</slot>
     <slot access="protected">itemPixmapDeleted()</slot>
-    <slot access="protected">itemTextChanged(const QString &amp;)</slot>
+    <slot access="protected">itemTextChanged(const TQString &amp;)</slot>
     <slot access="protected">itemUpClicked()</slot>
     <slot access="protected">newColumnClicked()</slot>
     <slot access="protected">itemRightClicked()</slot>
     <slot access="protected">okClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index dfec1860..ce9ee737 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -46,8 +46,8 @@
 
 #include <klocale.h>
 
-ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
-    : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw )
+ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw )
+    : ListViewEditorBase( tqparent, 0, TRUE ), listview( lv ), formwindow( fw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     itemText->setEnabled( FALSE );
@@ -68,13 +68,13 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 	itemsPreview->setSelected( itemsPreview->firstChild(), TRUE );
     }
 
-    // Clamp on drag and drop to QListView
+    // Clamp on drag and drop to TQListView
     ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview );
     itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move );
     TQObject::connect( itemsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ),
 		      itemsDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) );
 
-    // Enable rename for all QListViewItems
+    // Enable rename for all TQListViewItems
     TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild();
     for ( ; *it; it++ )
 	(*it)->setRenameEnabled( 0, TRUE );
@@ -86,7 +86,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 		      TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
 
     // Connect signal-relay to TQLineEdit "itemText"
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+    TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
     TQObject *obj;
     TQObjectListIt itemsLineEditIt( *l );
     while ( (obj = itemsLineEditIt.current()) != 0 ) {
@@ -98,13 +98,13 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
     }
     delete l;
 
-    // Clamp on drag and drop to QListBox
+    // Clamp on drag and drop to TQListBox
     ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview );
     columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move );
     TQObject::connect( columnsDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ),
 		      columnsDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) );
 
-    // Clamp on rename to QListBox
+    // Clamp on rename to TQListBox
     ListBoxRename *columnsRename = new ListBoxRename( colPreview );
     TQObject::connect( columnsRename,
 		      TQT_SIGNAL( itemTextChanged( const TQString & ) ),
@@ -112,7 +112,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 		      TQT_SLOT( columnTextChanged( const TQString & ) ) );
 
     // Find TQLineEdit "colText" and connect
-    l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
+    l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
     TQObjectListIt columnsLineEditIt( *l );
     while ( (obj = columnsLineEditIt.current()) != 0 ) {
         ++columnsLineEditIt;
@@ -127,7 +127,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 void ListViewEditor::applyClicked()
 {
     setupItems();
-    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).arg( listview->name() ),
+    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).tqarg( listview->name() ),
 								formwindow, listview, itemsPreview );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
@@ -378,10 +378,10 @@ void ListViewEditor::itemDownClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
+    TQListViewItem *tqparent = i->tqparent();
     it++;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	it++;
     }
@@ -406,11 +406,11 @@ void ListViewEditor::itemNewClicked()
 
 void ListViewEditor::itemNewSubClicked()
 {
-    TQListViewItem *parent = itemsPreview->currentItem();
+    TQListViewItem *tqparent = itemsPreview->currentItem();
     TQListViewItem *item = 0;
-    if ( parent ) {
-	item = new TQListViewItem( parent );
-	parent->setOpen( TRUE );
+    if ( tqparent ) {
+	item = new TQListViewItem( tqparent );
+	tqparent->setOpen( TRUE );
     } else {
 	item = new TQListViewItem( itemsPreview );
     }
@@ -466,10 +466,10 @@ void ListViewEditor::itemUpClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
+    TQListViewItem *tqparent = i->tqparent();
     --it;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	--it;
     }
@@ -488,13 +488,13 @@ void ListViewEditor::itemRightClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
-    parent = parent ? parent->firstChild() : itemsPreview->firstChild();
-    if ( !parent )
+    TQListViewItem *tqparent = i->tqparent();
+    tqparent = tqparent ? tqparent->firstChild() : itemsPreview->firstChild();
+    if ( !tqparent )
 	return;
     it++;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	it++;
     }
@@ -528,13 +528,13 @@ void ListViewEditor::itemLeftClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
-    if ( !parent )
+    TQListViewItem *tqparent = i->tqparent();
+    if ( !tqparent )
 	return;
-    parent = parent->parent();
+    tqparent = tqparent->tqparent();
     --it;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	--it;
     }
@@ -592,7 +592,7 @@ void ListViewEditor::setupColumns()
 void ListViewEditor::setupItems()
 {
     itemColumn->setMinValue( 0 );
-    itemColumn->setMaxValue( QMAX( numColumns - 1, 0 ) );
+    itemColumn->setMaxValue( TQMAX( numColumns - 1, 0 ) );
     int i = 0;
     TQHeader *header = itemsPreview->header();
     for ( TQListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) {
@@ -609,7 +609,7 @@ void ListViewEditor::setupItems()
     while ( itemsPreview->columns() > i )
 	itemsPreview->removeColumn( i );
 
-    itemColumn->setValue( QMIN( numColumns - 1, itemColumn->value() ) );
+    itemColumn->setValue( TQMIN( numColumns - 1, itemColumn->value() ) );
 }
 
 ListViewEditor::Column *ListViewEditor::findColumn( TQListBoxItem *i )
diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h
index cdeeabe6..1555823e 100644
--- a/kdevdesigner/designer/listvieweditorimpl.h
+++ b/kdevdesigner/designer/listvieweditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,9 +38,10 @@ class FormWindow;
 class ListViewEditor : public ListViewEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw );
+    ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw );
 
 signals:
     void itemRenamed(const TQString &);
@@ -80,7 +81,7 @@ private:
 	TQString text;
 	TQPixmap pixmap;
 	bool clickable, resizable;
-	Q_DUMMY_COMPARISON_OPERATOR( Column )
+	TQ_DUMMY_COMPARISON_OPERATOR( Column )
     };
 
 private:
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 8ea48706..b4b5c1ac 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -65,7 +65,7 @@
 #include "formsettings.h"
 #include "preferences.h"
 #include "pixmapcollectioneditor.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 //#include "connectioneditor.h"
@@ -114,7 +114,7 @@
 #include <tqtooltip.h>
 #include <tqsizegrip.h>
 #include <tqtextview.h>
-#include <qassistantclient.h>
+#include <tqassistantclient.h>
 #include <stdlib.h>
 
 #include "kdevdesigner_part.h"
@@ -142,7 +142,7 @@ static TQString textNoAccel( const TQString& text)
 {
     TQString t = text;
     int i;
-    while ( (i = t.find('&') )>= 0 ) {
+    while ( (i = t.tqfind('&') )>= 0 ) {
 	t.remove(i,1);
     }
     return t;
@@ -152,7 +152,7 @@ static TQString textNoAccel( const TQString& text)
 MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir )
     : TQMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ),
       grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
-      fileFilter( i18n( "Qt User-Interface Files (*.ui)" ) ), client( asClient ),
+      fileFilter( i18n( "TQt User-Interface Files (*.ui)" ) ), client( asClient ),
       previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 ), m_part(part)
 {
 //    extern void qInitImages_designercore();
@@ -184,9 +184,9 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     setupPluginManagers();
 
 /*    if ( !single )
-	qApp->setMainWidget( this );*/
+	tqApp->setMainWidget( this );*/
     TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
     setIcon( BarIcon( "designer_appicon.png", KDevDesignerPartFactory::instance() ) );
 #endif
 
@@ -201,8 +201,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     singleProject = single;
 
     statusBar()->clear();
-#if defined(QT_NON_COMMERCIAL)
-    statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of Qt - "
+#if defined(TQT_NON_COMMERCIAL)
+    statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of TQt - "
 	"For commercial evaluations, use the help menu to register with Trolltech."), statusBar()), 1 );
 #else
     statusBar()->addWidget( new TQLabel("Ready", statusBar()), 1 );
@@ -219,9 +219,9 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     setupEditActions();
     setupProjectActions();
     setupSearchActions();
-    layoutToolBar = new TQToolBar( this, "Layout" );
-    layoutToolBar->setCloseMode( TQDockWindow::Undocked );
-    addToolBar( layoutToolBar, i18n( "Layout" ) );
+    tqlayoutToolBar = new TQToolBar( this, "Layout" );
+    tqlayoutToolBar->setCloseMode( TQDockWindow::Undocked );
+    addToolBar( tqlayoutToolBar, i18n( "Layout" ) );
     interpreterPluginManager = 0;
     setupToolActions();
     setupLayoutActions();
@@ -246,17 +246,17 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     emit hasActiveWindow( FALSE );
 
     lastPressWidget = 0;
-    qApp->installEventFilter( this );
+    tqApp->installEventFilter( this );
 
-    TQSize as( qApp->desktop()->size() );
+    TQSize as( tqApp->desktop()->size() );
     as -= TQSize( 30, 30 );
     resize( TQSize( 1200, 1000 ).boundedTo( as ) );
 
-    connect( qApp->clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( tqApp->clipboard(), TQT_SIGNAL( dataChanged() ),
 	     this, TQT_SLOT( clipboardChanged() ) );
     clipboardChanged();
-    layoutChilds = FALSE;
-    layoutSelected = FALSE;
+    tqlayoutChilds = FALSE;
+    tqlayoutSelected = FALSE;
     breakLayout = FALSE;
     backPix = TRUE;
 
@@ -273,10 +273,10 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     delete w;
     w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
-    setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE );
-    actionEditor->parentWidget()->hide();
+    setAppropriate( (TQDockWindow*)actionEditor->tqparentWidget(), FALSE );
+    actionEditor->tqparentWidget()->hide();
 
-    assistant = new QAssistantClient( assistantPath(), this );
+    assistant = new TQAssistantClient( assistantPath(), TQT_TQOBJECT(this) );
 
     statusBar()->setSizeGripEnabled( TRUE );
     set_splash_status( "Initialization Done." );
@@ -286,7 +286,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     if ( autoSaveEnabled )
 	autoSaveTimer->start( autoSaveInterval * 1000 );
 
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 }
 
 MainWindow::~MainWindow()
@@ -355,7 +355,7 @@ void MainWindow::setupPropertyEditor()
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     propertyEditor = new PropertyEditor( dw );
-    addToolBar( dw, Qt::DockRight );
+    addToolBar( dw, TQt::DockRight );
     dw->setWidget( propertyEditor );
     dw->setFixedExtentWidth( 250 );
     dw->setCaption( i18n( "Property Editor/Signal Handlers" ) );
@@ -383,7 +383,7 @@ void MainWindow::setupOutputWindow()
     TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this );
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
-    addToolBar( dw, Qt::DockBottom );
+    addToolBar( dw, TQt::DockBottom );
     oWindow = new OutputWindow( dw );
     dw->setWidget( oWindow );
     dw->setFixedExtentHeight( 150 );
@@ -398,7 +398,7 @@ void MainWindow::setupHierarchyView()
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     hierarchyView = new HierarchyView( dw );
-    addToolBar( dw, Qt::DockRight );
+    addToolBar( dw, TQt::DockRight );
     dw->setWidget( hierarchyView );
 
     dw->setCaption( i18n( "Object Explorer" ) );
@@ -408,7 +408,7 @@ void MainWindow::setupHierarchyView()
 			"<p>The Object Explorer provides an overview of the relationships "
 			"between the widgets in a form. You can use the clipboard functions using "
 			"a context menu for each item in the view. It is also useful for selecting widgets "
-			"in forms that have complex layouts.</p>"
+			"in forms that have complex tqlayouts.</p>"
 			"<p>The columns can be resized by dragging the separator in the list's header.</p>"
 			"<p>The second tab shows all the form's slots, class variables, includes, etc.</p>") );
     dw->show();
@@ -420,14 +420,14 @@ void MainWindow::setupWorkspace()
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     TQVBox *vbox = new TQVBox( dw );
-    QCompletionEdit *edit = new QCompletionEdit( vbox );
+    TQCompletionEdit *edit = new TQCompletionEdit( vbox );
     TQToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) );
     TQAccel *a = new TQAccel( this );
     a->connectItem( a->insertItem( ALT + Key_B ), edit, TQT_SLOT( setFocus() ) );
     wspace = new Workspace( vbox, this );
     wspace->setBufferEdit( edit );
     wspace->setCurrentProject( currentProject );
-    addToolBar( dw, Qt::DockRight );
+    addToolBar( dw, TQt::DockRight );
     dw->setWidget( vbox );
 
     dw->setCaption( i18n( "Project Overview" ) );
@@ -442,7 +442,7 @@ void MainWindow::setupWorkspace()
 void MainWindow::setupActionEditor()
 {
     TQDockWindow *dw = new TQDockWindow( TQDockWindow::OutsideDock, this, 0 );
-    addDockWindow( dw, Qt::DockTornOff );
+    addDockWindow( dw, TQt::DockTornOff );
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     actionEditor = new ActionEditor( dw );
@@ -465,14 +465,14 @@ void MainWindow::setupToolbox()
     TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this );
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
-    addToolBar( dw, Qt::DockLeft );
+    addToolBar( dw, TQt::DockLeft );
     toolBox = new TQToolBox( dw );
     dw->setWidget( toolBox );
     dw->setFixedExtentWidth( 160 );
     dw->setCaption( i18n( "Toolbox" ) );
     dw->show();
-    setDockEnabled( dw, Qt::DockTop, FALSE );
-    setDockEnabled( dw, Qt::DockBottom, FALSE );
+    setDockEnabled( dw, TQt::DockTop, FALSE );
+    setDockEnabled( dw, TQt::DockBottom, FALSE );
     commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" );
     commonWidgetsToolBar->setFrameStyle( TQFrame::NoFrame );
     commonWidgetsToolBar->setOrientation( Qt::Vertical );
@@ -537,7 +537,7 @@ int MainWindow::currentTool() const
 {
     if ( !actionCurrentTool )
 	return POINTER_TOOL;
-    return TQString::fromLatin1(actionCurrentTool->name()).toInt();
+    return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
 }
 
 void MainWindow::runProjectPrecondition()
@@ -582,7 +582,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
     TQStringList databases;
     TQPtrDictIterator<TQWidget> wit( *fw->widgets() );
     while ( wit.current() ) {
-	TQStringList lst = MetaDataBase::fakeProperty( wit.current(), "database" ).toStringList();
+	TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(wit.current()), "database" ).toStringList();
 	if ( !lst.isEmpty() )
 	    databases << lst [ 0 ];
 	++wit;
@@ -601,12 +601,12 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
     Resource resource( this );
     resource.setWidget( fw );
     TQValueList<Resource::Image> images;
-    resource.save( &buffer );
+    resource.save( TQT_TQIODEVICE(&buffer) );
 
     buffer.close();
     buffer.open( IO_ReadOnly );
 
-    TQWidget *w = TQWidgetFactory::create( &buffer );
+    TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&buffer) );
     if ( w ) {
 	previewedForm = w;
 	if ( palet ) {
@@ -662,21 +662,21 @@ void MainWindow::previewForm( const TQString & style )
 	p.setColor( TQPalette::Active, TQColorGroup::Base, TQColor( 55, 77, 78 ) );
 	p.setColor( TQPalette::Inactive, TQColorGroup::Base, TQColor( 55, 77, 78 ) );
 	p.setColor( TQPalette::Disabled, TQColorGroup::Base, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Active, TQColorGroup::Highlight, Qt::white );
+	p.setColor( TQPalette::Active, TQColorGroup::Highlight, TQt::white );
 	p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Inactive, TQColorGroup::Highlight, Qt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::Highlight, TQt::white );
 	p.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Disabled, TQColorGroup::Highlight, Qt::white );
+	p.setColor( TQPalette::Disabled, TQColorGroup::Highlight, TQt::white );
 	p.setColor( TQPalette::Disabled, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Active, TQColorGroup::Foreground, Qt::white );
-	p.setColor( TQPalette::Active, TQColorGroup::Text, Qt::white );
-	p.setColor( TQPalette::Active, TQColorGroup::ButtonText, Qt::white );
-	p.setColor( TQPalette::Inactive, TQColorGroup::Foreground, Qt::white );
-	p.setColor( TQPalette::Inactive, TQColorGroup::Text, Qt::white );
-	p.setColor( TQPalette::Inactive, TQColorGroup::ButtonText, Qt::white );
-	p.setColor( TQPalette::Disabled, TQColorGroup::Foreground, Qt::lightGray );
-	p.setColor( TQPalette::Disabled, TQColorGroup::Text, Qt::lightGray );
-	p.setColor( TQPalette::Disabled, TQColorGroup::ButtonText, Qt::lightGray );
+	p.setColor( TQPalette::Active, TQColorGroup::Foreground, TQt::white );
+	p.setColor( TQPalette::Active, TQColorGroup::Text, TQt::white );
+	p.setColor( TQPalette::Active, TQColorGroup::ButtonText, TQt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::Text, TQt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::ButtonText, TQt::white );
+	p.setColor( TQPalette::Disabled, TQColorGroup::Foreground, TQt::lightGray );
+	p.setColor( TQPalette::Disabled, TQColorGroup::Text, TQt::lightGray );
+	p.setColor( TQPalette::Disabled, TQColorGroup::ButtonText, TQt::lightGray );
 
 	w = previewFormInternal( st, &p );
     } else if ( style == "SGI" ) {
@@ -729,20 +729,20 @@ void MainWindow::previewForm( const TQString & style )
 
     if ( !w )
 	return;
-    w->insertChild( st );
+    w->insertChild( TQT_TQOBJECT(st) );
     w->show();
 }
 
 void MainWindow::helpContents()
 {
-    TQWidget *focusWidget = qApp->focusWidget();
+    TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
     bool showClassDocu = TRUE;
-    while ( focusWidget ) {
-	if ( focusWidget->isA( "PropertyList" ) ) {
+    while ( tqfocusWidget ) {
+	if ( tqfocusWidget->isA( "PropertyList" ) ) {
 	    showClassDocu = FALSE;
 	    break;
 	}
-	focusWidget = focusWidget->parentWidget();
+	tqfocusWidget = tqfocusWidget->tqparentWidget();
     }
 
     TQString source = "designer-manual.html";
@@ -753,10 +753,10 @@ void MainWindow::helpContents()
 	    TQTextStream ts( &f );
 	    while ( !ts.eof() ) {
 		TQString s = ts.readLine();
-		int from = s.find( "\"" );
+		int from = s.tqfind( "\"" );
 		if ( from == -1 )
 		    continue;
-		int to = s.findRev( "\"" );
+		int to = s.tqfindRev( "\"" );
 		if ( to == -1 )
 		    continue;
 		propertyDocumentation[ s.mid( from + 1, to - from - 1 ) ] = s.mid( to + 2 ) + "-prop";
@@ -767,23 +767,23 @@ void MainWindow::helpContents()
 
     if ( propertyEditor->widget() && !showClassDocu ) {
 	if ( !propertyEditor->currentProperty().isEmpty() ) {
-	    TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty();
+	    TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty();
 	    TQString s;
 	    TQString cp = propertyEditor->currentProperty();
-	    if ( cp == "layoutMargin" ) {
-		source = propertyDocumentation[ "QLayout/margin" ];
-	    } else if ( cp == "layoutSpacing" ) {
-		source = propertyDocumentation[ "QLayout/spacing" ];
+	    if ( cp == "tqlayoutMargin" ) {
+		source = propertyDocumentation[ "TQLayout/margin" ];
+	    } else if ( cp == "tqlayoutSpacing" ) {
+		source = propertyDocumentation[ "TQLayout/spacing" ];
 	    } else if ( cp == "toolTip" ) {
 		source = "tqtooltip.html#details";
 	    } else if ( mo && qstrcmp( mo->className(), "Spacer" ) == 0 ) {
 		if ( cp != "name" )
 		    source = "tqsizepolicy.html#SizeType";
 		else
-		    source = propertyDocumentation[ "QObject/name" ];
+		    source = propertyDocumentation[ "TQObject/name" ];
 	    } else {
-		while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
-		    mo = mo->superClass();
+		while ( mo && !propertyDocumentation.tqcontains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
+		    mo = mo->tqsuperClass();
 		if ( mo )
 		    source = "p:" + propertyDocumentation[s];
 	    }
@@ -793,8 +793,8 @@ void MainWindow::helpContents()
 	if ( source.isEmpty() || source == "designer-manual.html" ) {
 	    if ( classname.lower() == "spacer" )
 		source = "qspaceritem.html#details";
-	    else if ( classname == "QLayoutWidget" )
-		source = "layout.html";
+	    else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
+		source = "tqlayout.html";
 	    else
 		source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details";
 	}
@@ -821,18 +821,18 @@ void MainWindow::helpAbout()
 	LanguageInterface *iface = MetaDataBase::languageInterface( eProject->language() );
 	dlg.aboutLicense->setText( iface->aboutText() );
     }
-    dlg.aboutVersion->setText(TQString("Version ") + TQString(QT_VERSION_STR));
-    dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) );
+    dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR));
+    dlg.resize( dlg.width(), dlg.tqlayout()->heightForWidth(dlg.width()) );
     dlg.exec();
 }
 
-void MainWindow::helpAboutQt()
+void MainWindow::helpAboutTQt()
 {
-    TQMessageBox::aboutQt( this, "Qt Designer" );
+    TQMessageBox::aboutTQt( this, "TQt Designer" );
 }
 
 #if defined(_WS_WIN_)
-#include <qt_windows.h>
+#include <tqt_windows.h>
 #include <tqprocess.h>
 #endif
 
@@ -847,16 +847,16 @@ void MainWindow::helpRegister()
     TQString command;
     TQString sub( "htmlfile\\shell" );
 #if defined(UNICODE)
-    if ( TQApplication::winVersion() & Qt::WV_NT_based ) {
+    if ( TQApplication::winVersion() & TQt::WV_NT_based ) {
 	unsigned char data[256];
 	res = RegOpenKeyExW( HKEY_CLASSES_ROOT, NULL, 0, KEY_READ, &key );
 	res = RegOpenKeyExW( key, (TCHAR*)sub.ucs2(), 0, KEY_READ, &subkey );
 	res = RegQueryValueExW( subkey, NULL, NULL, &type, data, &size );
-	command = qt_winQString( data ) + "\\command";
+	command = qt_winTQString( data ) + "\\command";
 	size = 255;
 	res = RegOpenKeyExW( subkey, (TCHAR*)command.ucs2(), 0, KEY_READ, &subkey );
 	res = RegQueryValueExW( subkey, NULL, NULL, &type, data, &size );
-	command = qt_winQString( data );
+	command = qt_winTQString( data );
     } else
 #endif
     {
@@ -876,8 +876,8 @@ void MainWindow::helpRegister()
 
     TQProcess process( command + " www.trolltech.com/products/download/eval/evaluation.html" );
     if ( !process.start() )
-	TQMessageBox::information( this, "Register Qt", "Launching your web browser failed.\n"
-	"To register Qt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" );
+	TQMessageBox::information( this, "Register TQt", "Launching your web browser failed.\n"
+	"To register TQt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" );
 #endif
 }
 
@@ -886,14 +886,14 @@ void MainWindow::showProperties( TQObject *o )
     if ( !o->isWidgetType() ) {
 	propertyEditor->setWidget( o, lastActiveFormWindow );
 	if ( lastActiveFormWindow )
-	    hierarchyView->setFormWindow( lastActiveFormWindow, lastActiveFormWindow->mainContainer() );
+	    hierarchyView->setFormWindow( lastActiveFormWindow, TQT_TQOBJECT(lastActiveFormWindow->mainContainer()) );
 	else
 	    hierarchyView->setFormWindow( 0, 0 );
 	return;
     }
     TQWidget *w = (TQWidget*)o;
     setupHierarchyView();
-    FormWindow *fw = (FormWindow*)isAFormWindowChild( w );
+    FormWindow *fw = (FormWindow*)isAFormWindowChild( TQT_TQOBJECT(w) );
     if ( fw ) {
 	if ( fw->numSelectedWidgets() > 1 ) {
 	    TQWidgetList wl = fw->selectedWidgets();
@@ -903,16 +903,16 @@ void MainWindow::showProperties( TQObject *o )
 	    }
 	    propertyEditor->setWidget( new PropertyObject( wl ), fw );
 	} else {
-	    propertyEditor->setWidget( w, fw );
+	    propertyEditor->setWidget( TQT_TQOBJECT(w), fw );
 	}
-	hierarchyView->setFormWindow( fw, w );
+	hierarchyView->setFormWindow( fw, TQT_TQOBJECT(w) );
     } else {
 	propertyEditor->setWidget( 0, 0 );
 	hierarchyView->setFormWindow( 0, 0 );
     }
 
     if ( currentTool() == POINTER_TOOL && fw &&
-	 ( !qworkspace->activeWindow() || !::qt_cast<SourceEditor*>(qworkspace->activeWindow()) ) )
+	 ( !qworkspace->activeWindow() || !::tqqt_cast<SourceEditor*>(qworkspace->activeWindow()) ) )
 	fw->setFocus();
 }
 
@@ -929,23 +929,23 @@ void MainWindow::updateProperties( TQObject * )
 
 bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( ::qt_cast<MenuBarEditor*>(o) || ::qt_cast<PopupMenuEditor*>(o) ||
+    if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ||
 	 ( o &&
-	   ( ::qt_cast<MenuBarEditor*>(o->parent()) ||
-	     ::qt_cast<PopupMenuEditor*>(o->parent()) ) ) ) {
+	   ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) ||
+	     ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) {
 
-	if ( e->type() == TQEvent::Accel && ::qt_cast<PopupMenuEditor*>(o) ) {
+	if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) {
 	    return TRUE; // consume accel events
- 	} else if ( e->type() == TQEvent::MouseButtonPress && ::qt_cast<MenuBarEditor*>(o) ) {
+ 	} else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<MenuBarEditor*>(o) ) {
 	    TQPoint pos = ((TQMouseEvent*)e)->pos();
-	    MenuBarEditor *m = ::qt_cast<MenuBarEditor*>(o);
+	    MenuBarEditor *m = ::tqqt_cast<MenuBarEditor*>(o);
 	    showProperties( o );
 	    if ( m->findItem( pos ) >= m->count() )
 		m->setFocus();
-	} else if ( e->type() == TQEvent::MouseButtonPress && ::qt_cast<PopupMenuEditor*>(o) ) {
-	    PopupMenuEditor *m = ::qt_cast<PopupMenuEditor*>(o);
+	} else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) {
+	    PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o);
 	    PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() );
-	    if ( m->find( i->action() ) != -1 && !i->isSeparator() )
+	    if ( m->tqfind( i->action() ) != -1 && !i->isSeparator() )
 		showProperties( i->action() );
 	}
 	return TQMainWindow::eventFilter( o, e );
@@ -962,9 +962,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	     ( ( (TQKeyEvent*)e )->state() & ShiftButton ) != ShiftButton ) {
 	    w = (TQWidget*)o;
 	    while ( w ) {
-		if ( ::qt_cast<PropertyList*>(w) )
+		if ( ::tqqt_cast<PropertyList*>(w) )
 		    break;
-		w = w->parentWidget( TRUE );
+		w = w->tqparentWidget( TRUE );
 	    }
 	    if ( w ) {
 		propertyEditor->propertyList()->showCurrentWhatsThis();
@@ -978,7 +978,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	       ( (TQKeyEvent*)e )->key() == Key_E ) &&
 	     ( (TQKeyEvent*)e )->state() & ControlButton ) {
 	    if ( qWorkspace()->activeWindow() &&
-		 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+		 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 		( (TQKeyEvent*)e )->ignore();
 		return TRUE;
 	    }
@@ -987,44 +987,44 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
     case TQEvent::ContextMenu:
     case TQEvent::MouseButtonPress:
 	if ( o && currentTool() == POINTER_TOOL &&
-	     ( ::qt_cast<MenuBarEditor*>(o) ||
-	       ::qt_cast<PopupMenuEditor*>(o) ||
-	       ::qt_cast<QDesignerToolBar*>(o) ||
-	       ( ::qt_cast<TQComboBox*>(o) ||
-		 ::qt_cast<TQToolButton*>(o) ||
-		 ::qt_cast<QDesignerToolBarSeparator*>(o) ) &&
-	       o->parent()
-	       && ( ::qt_cast<QDesignerToolBar*>(o->parent())
-		   || ::qt_cast<QDesignerWidgetStack*>(o->parent())) ) ) {
+	     ( ::tqqt_cast<MenuBarEditor*>(o) ||
+	       ::tqqt_cast<PopupMenuEditor*>(o) ||
+	       ::tqqt_cast<TQDesignerToolBar*>(o) ||
+	       ( ::tqqt_cast<TQComboBox*>(o) ||
+		 ::tqqt_cast<TQToolButton*>(o) ||
+		 ::tqqt_cast<TQDesignerToolBarSeparator*>(o) ) &&
+	       o->tqparent()
+	       && ( ::tqqt_cast<TQDesignerToolBar*>(o->tqparent())
+		   || ::tqqt_cast<TQDesignerWidgetStack*>(o->tqparent())) ) ) {
 	    TQWidget *w = (TQWidget*)o;
-	    if ( ::qt_cast<TQToolButton*>(w) ||
-		 ::qt_cast<TQComboBox*>(w) ||
-		 ::qt_cast<PopupMenuEditor*>(w) ||
-		 ::qt_cast<QDesignerToolBarSeparator*>(w) )
-		w = w->parentWidget();
-	    TQWidget *pw = w->parentWidget();
+	    if ( ::tqqt_cast<TQToolButton*>(w) ||
+		 ::tqqt_cast<TQComboBox*>(w) ||
+		 ::tqqt_cast<PopupMenuEditor*>(w) ||
+		 ::tqqt_cast<TQDesignerToolBarSeparator*>(w) )
+		w = w->tqparentWidget();
+	    TQWidget *pw = w->tqparentWidget();
 	    while ( pw ) {
-		if ( ::qt_cast<FormWindow*>(pw) ) {
-		    ( (FormWindow*)pw )->emitShowProperties( w );
-		    if ( !::qt_cast<QDesignerToolBar*>(o) )
-			return ( !::qt_cast<TQToolButton*>(o) &&
-				 !::qt_cast<MenuBarEditor*>(o) &&
-				 !::qt_cast<TQComboBox*>(o) &&
-				 !::qt_cast<QDesignerToolBarSeparator*>(o) );
+		if ( ::tqqt_cast<FormWindow*>(pw) ) {
+		    ( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) );
+		    if ( !::tqqt_cast<TQDesignerToolBar*>(o) )
+			return ( !::tqqt_cast<TQToolButton*>(o) &&
+				 !::tqqt_cast<MenuBarEditor*>(o) &&
+				 !::tqqt_cast<TQComboBox*>(o) &&
+				 !::tqqt_cast<TQDesignerToolBarSeparator*>(o) );
 		}
-		pw = pw->parentWidget();
+		pw = pw->tqparentWidget();
 	    }
 	}
-	if ( o && ( ::qt_cast<QDesignerToolBar*>(o) || o->inherits("QDockWindowHandle") )
+	if ( o && ( ::tqqt_cast<TQDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
 	     && e->type() == TQEvent::ContextMenu )
 	    break;
 	if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL )
 	    break;
-	if ( ::qt_cast<TQSizeGrip*>(o) )
+	if ( ::tqqt_cast<TQSizeGrip*>(o) )
 	    break;
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	if ( !w->hasFocus() )
 	    w->setFocus();
@@ -1049,11 +1049,11 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	lastPressWidget = 0;
 	if ( isAToolBarChild( o )  && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL )
 	    break;
-	if ( ::qt_cast<TQSizeGrip*>(o) )
+	if ( ::tqqt_cast<TQSizeGrip*>(o) )
 	    break;
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	passiveInteractor = WidgetFactory::isPassiveInteractor( o );
 	if ( !passiveInteractor )
@@ -1069,15 +1069,15 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	    break;
 	w = isAFormWindowChild( o );
 	if ( lastPressWidget != (TQWidget*)o && w &&
-	     !::qt_cast<SizeHandle*>(o) && !::qt_cast<OrderIndicator*>(o) &&
-	     !::qt_cast<PopupMenuEditor*>(o) && !::qt_cast<TQMenuBar*>(o) &&
-	     !::qt_cast<TQSizeGrip*>(o) )
+	     !::tqqt_cast<SizeHandle*>(o) && !::tqqt_cast<OrderIndicator*>(o) &&
+	     !::tqqt_cast<PopupMenuEditor*>(o) && !::tqqt_cast<TQMenuBar*>(o) &&
+	     !::tqqt_cast<TQSizeGrip*>(o) )
 	    return TRUE;
-	if ( o && ::qt_cast<TQSizeGrip*>(o) )
+	if ( o && ::tqqt_cast<TQSizeGrip*>(o) )
 	    break;
 	if ( lastPressWidget != (TQWidget*)o ||
-	     ( !w || ::qt_cast<SizeHandle*>(o) ) ||
-	       ::qt_cast<OrderIndicator*>(o) )
+	     ( !w || ::tqqt_cast<SizeHandle*>(o) ) ||
+	       ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	passiveInteractor = WidgetFactory::isPassiveInteractor( o );
 	if ( !passiveInteractor )
@@ -1090,14 +1090,14 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	    return FALSE;
 	}
 	if ( ( (TQKeyEvent*)e )->key() == Key_Escape && incrementalSearch->hasFocus() ) {
-	    if ( ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	    if ( ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 		qWorkspace()->activeWindow()->setFocus();
 		return TRUE;
 	    }
 	}
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	( (FormWindow*)w )->handleKeyPress( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) );
 	if ( ((TQKeyEvent*)e)->isAccepted() )
@@ -1105,10 +1105,10 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	break;
     case TQEvent::MouseButtonDblClick:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) ) {
-	    if ( ::qt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() &&
-		 o->parent() && ::qt_cast<TQToolBar*>(o->parent()) && formWindow() )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) ) {
+	    if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() &&
+		 o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() )
 		formWindow()->setToolFixed();
 	    break;
 	}
@@ -1122,8 +1122,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	return TRUE;
     case TQEvent::KeyRelease:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	( (FormWindow*)w )->handleKeyRelease( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) );
 	if ( ((TQKeyEvent*)e)->isAccepted() )
@@ -1131,27 +1131,27 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	break;
     case TQEvent::Hide:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
-	if ( ( (FormWindow*)w )->isWidgetSelected( (TQWidget*)o ) )
-	    ( (FormWindow*)w )->selectWidget( (TQWidget*)o, FALSE );
+	if ( ( (FormWindow*)w )->isWidgetSelected( TQT_TQOBJECT(o) ) )
+	    ( (FormWindow*)w )->selectWidget( TQT_TQOBJECT(o), FALSE );
 	break;
     case TQEvent::Enter:
     case TQEvent::Leave:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) ||
-	     ::qt_cast<MenuBarEditor*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) ||
+	     ::tqqt_cast<MenuBarEditor*>(o) )
 	    break;
 	return TRUE;
     case TQEvent::Resize:
     case TQEvent::Move:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
-	if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) {
+	if ( WidgetFactory::tqlayoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) {
 	    ( (FormWindow*)w )->updateSelection( (TQWidget*)o );
 	    if ( e->type() != TQEvent::Resize )
 		( (FormWindow*)w )->updateChildSelections( (TQWidget*)o );
@@ -1161,31 +1161,31 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	if ( o->isWidgetType() && (TQWidget*)o == (TQWidget*)previewedForm ) {
 	    if ( lastActiveFormWindow && lastActiveFormWindow->project() ) {
 		TQStringList lst =
-		    MetaDataBase::fakeProperty( lastActiveFormWindow, "database" ).toStringList();
+		    MetaDataBase::fakeProperty( TQT_TQOBJECT(lastActiveFormWindow), "database" ).toStringList();
 		lastActiveFormWindow->project()->closeDatabase( lst[ 0 ] );
 	    }
 	}
 	break;
     case TQEvent::DragEnter:
-	if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) {
+	if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) {
 	    workspace()->contentsDragEnterEvent( (TQDragEnterEvent*)e );
 	    return TRUE;
 	}
 	break;
     case TQEvent::DragMove:
-	if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) {
+	if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) {
 	    workspace()->contentsDragMoveEvent( (TQDragMoveEvent*)e );
 	    return TRUE;
 	}
 	break;
     case TQEvent::Drop:
-	if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) {
+	if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) {
 	    workspace()->contentsDropEvent( (TQDropEvent*)e );
 	    return TRUE;
 	}
 	break;
     case TQEvent::Show:
-	if ( o != this )
+	if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) )
 	    break;
 	if ( ((TQShowEvent*)e)->spontaneous() )
 	    break;
@@ -1195,33 +1195,33 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	return TRUE;
     case TQEvent::Wheel:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	return TRUE;
     case TQEvent::FocusIn:
-	if ( !::qt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
+	if ( !::tqqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
 	    return TRUE; //FIXME
 	if ( hierarchyView->formDefinitionView()->isRenaming()
-	     && ( o->inherits( "Editor" ) || ::qt_cast<FormWindow*>(o) ) )
+	     && ( o->inherits( "Editor" ) || ::tqqt_cast<FormWindow*>(o) ) )
 		TQApplication::sendPostedEvents();
 	if ( o->inherits( "Editor" ) ) {
 	    TQWidget *w = (TQWidget*)o;
 	    while ( w ) {
-		if ( ::qt_cast<SourceEditor*>(w) )
+		if ( ::tqqt_cast<SourceEditor*>(w) )
 		    break;
-		w = w->parentWidget( TRUE );
+		w = w->tqparentWidget( TRUE );
 	    }
-	    if ( ::qt_cast<SourceEditor*>(w) )
+	    if ( ::tqqt_cast<SourceEditor*>(w) )
 		( (SourceEditor*)w )->checkTimeStamp();
-	} else if ( ::qt_cast<FormWindow*>(o) ) {
+	} else if ( ::tqqt_cast<FormWindow*>(o) ) {
 	    FormWindow *fw = (FormWindow*)o;
 	    if ( fw->formFile() && fw->formFile()->editor() )
 		fw->formFile()->editor()->checkTimeStamp();
 	}
 	break;
     case TQEvent::FocusOut:
-	if ( !::qt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
+	if ( !::tqqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
 	    return TRUE;
 	break;
     default:
@@ -1233,12 +1233,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 
 TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
 {
-    if ( ::qt_cast<TQWizard*>(o->parent()) && !::qt_cast<TQPushButton*>(o) )
+    if ( ::tqqt_cast<TQWizard*>(o->tqparent()) && !::tqqt_cast<TQPushButton*>(o) )
 	return 0;
     while ( o ) {
-	if ( ::qt_cast<FormWindow*>(o) )
+	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return (TQWidget*)o;
-	o = o->parent();
+	o = o->tqparent();
     }
     return 0;
 }
@@ -1246,11 +1246,11 @@ TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
 TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const
 {
     while ( o ) {
-	if ( ::qt_cast<QDesignerToolBar*>(o) )
+	if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
 	    return (TQWidget*)o;
-	if ( ::qt_cast<FormWindow*>(o) )
+	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return 0;
-	o = o->parent();
+	o = o->tqparent();
     }
     return 0;
 }
@@ -1259,10 +1259,10 @@ FormWindow *MainWindow::formWindow()
 {
     if ( qworkspace->activeWindow() ) {
 	FormWindow *fw = 0;
-	if ( ::qt_cast<FormWindow*>(qworkspace->activeWindow()) )
+	if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) )
 	    fw = (FormWindow*)qworkspace->activeWindow();
 	else if ( lastActiveFormWindow &&
-		    qworkspace->windowList().find( lastActiveFormWindow ) != -1)
+		    qworkspace->windowList().tqfind( lastActiveFormWindow ) != -1)
 	    fw = lastActiveFormWindow;
 	return fw;
     }
@@ -1279,7 +1279,7 @@ void MainWindow::insertFormWindow( FormWindow *fw )
 {
     if ( fw )
 	TQWhatsThis::add( fw, i18n( "<b>The Form Window</b>"
-			       "<p>Use the various tools to add widgets or to change the layout "
+			       "<p>Use the various tools to add widgets or to change the tqlayout "
 			       "and behavior of the components in the form. Select one or multiple "
 			       "widgets to move them or lay them out. If a single widget is chosen it can "
 			       "be resized using the resize handles.</p>"
@@ -1307,12 +1307,12 @@ void MainWindow::insertFormWindow( FormWindow *fw )
     }
     fw->show();
     fw->currentToolChanged();
-    if ( fw->caption().isEmpty() && qstrlen( fw->name() )  )
+    if ( fw->caption().isEmpty() && tqstrlen( fw->name() )  )
 	fw->setCaption( fw->name() );
     fw->mainContainer()->setCaption( fw->caption() );
-    WidgetFactory::saveDefaultProperties( fw->mainContainer(),
+    WidgetFactory::saveDefaultProperties( TQT_TQOBJECT(fw->mainContainer()),
 					  WidgetDatabase::
-					  idFromClassName( WidgetFactory::classNameOf( fw->mainContainer() ) ) );
+					  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(fw->mainContainer()) ) ) );
     activeWindowChanged( fw );
     emit formWindowsChanged();
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
@@ -1356,13 +1356,13 @@ bool MainWindow::unregisterClient( FormWindow *w )
     TQPtrList<SourceEditor> waitingForDelete;
     waitingForDelete.setAutoDelete( TRUE );
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
-	if ( e->object() == w )
+	if ( TQT_BASE_OBJECT(e->object()) == TQT_BASE_OBJECT(w) )
 	    waitingForDelete.append( e );
     }
 
     if ( actionEditor->form() == w ) {
 	actionEditor->setFormWindow( 0 );
-	actionEditor->parentWidget()->hide();
+	actionEditor->tqparentWidget()->hide();
     }
 
     return TRUE;
@@ -1371,7 +1371,7 @@ bool MainWindow::unregisterClient( FormWindow *w )
 void MainWindow::activeWindowChanged( TQWidget *w )
 {
     TQWidget *old = formWindow();
-    if ( ::qt_cast<FormWindow*>(w) ) {
+    if ( ::tqqt_cast<FormWindow*>(w) ) {
 	FormWindow *fw = (FormWindow*)w;
 	FormWindow *ofw = lastActiveFormWindow;
 	lastActiveFormWindow = fw;
@@ -1384,16 +1384,16 @@ void MainWindow::activeWindowChanged( TQWidget *w )
 		formWindow()->clearSelection();
 	}
 	workspace()->activeFormChanged( fw );
-	setAppropriate( (TQDockWindow*)actionEditor->parentWidget(),
-			::qt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) );
-	if ( appropriate( (TQDockWindow*)actionEditor->parentWidget() ) ) {
+	setAppropriate( (TQDockWindow*)actionEditor->tqparentWidget(),
+			::tqqt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) );
+	if ( appropriate( (TQDockWindow*)actionEditor->tqparentWidget() ) ) {
 	    if ( actionEditor->wantToBeShown() )
-		actionEditor->parentWidget()->show();
+		actionEditor->tqparentWidget()->show();
 	} else {
 	    TQWidget *mc = 0;
-	    if ( ofw && (mc = ofw->mainContainer()) && ::qt_cast<TQMainWindow*>(mc) )
-		actionEditor->setWantToBeShown( !actionEditor->parentWidget()->isHidden() );
-	    actionEditor->parentWidget()->hide();
+	    if ( ofw && (mc = ofw->mainContainer()) && ::tqqt_cast<TQMainWindow*>(mc) )
+		actionEditor->setWantToBeShown( !actionEditor->tqparentWidget()->isHidden() );
+	    actionEditor->tqparentWidget()->hide();
 	}
 
 	actionEditor->setFormWindow( lastActiveFormWindow );
@@ -1421,12 +1421,12 @@ void MainWindow::activeWindowChanged( TQWidget *w )
 	emit hasActiveForm( FALSE );
 	propertyEditor->clear();
 	hierarchyView->clear();
-	updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null );
+	updateUndoRedo( FALSE, FALSE, TQString(), TQString() );
     }
 
     selectionChanged();
 
-    if ( ::qt_cast<SourceEditor*>(w) ) {
+    if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	SourceEditor *se = (SourceEditor*)w;
 	TQGuardedPtr<FormWindow> fw = se->formWindow();
 	if ( se->formWindow() &&
@@ -1479,16 +1479,16 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
 				 const TQString &undoCmd, const TQString &redoCmd )
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return; // do not set a formWindow related command
     actionEditUndo->setEnabled( undoAvailable );
     actionEditRedo->setEnabled( redoAvailable );
     if ( !undoCmd.isEmpty() )
-	actionEditUndo->setMenuText( i18n( "&Undo: %1" ).arg( undoCmd ) );
+	actionEditUndo->setMenuText( i18n( "&Undo: %1" ).tqarg( undoCmd ) );
     else
 	actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) );
     if ( !redoCmd.isEmpty() )
-	actionEditRedo->setMenuText( i18n( "&Redo: %1" ).arg( redoCmd ) );
+	actionEditRedo->setMenuText( i18n( "&Redo: %1" ).tqarg( redoCmd ) );
     else
 	actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) );
 
@@ -1504,7 +1504,7 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
 void MainWindow::updateEditorUndoRedo()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	return;
     SourceEditor *editor = (SourceEditor*)qWorkspace()->activeWindow();
     actionEditUndo->setEnabled( editor->editIsUndoAvailable() );
@@ -1524,7 +1524,7 @@ void MainWindow::popupFormWindowMenu( const TQPoint & gp, FormWindow *fw )
     setupRMBSpecialCommands( ids, commands, fw );
     setupRMBProperties( ids, commands, fw );
 
-    qApp->processEvents();
+    tqApp->processEvents();
     int r = rmbFormWindow->exec( gp );
 
     handleRMBProperties( r, commands, fw );
@@ -1542,7 +1542,7 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
     setupRMBSpecialCommands( ids, commands, w );
     setupRMBProperties( ids, commands, w );
 
-    qApp->processEvents();
+    tqApp->processEvents();
     int r = rmbWidgets->exec( gp );
 
     handleRMBProperties( r, commands, w );
@@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
 
 void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w )
 {
-    const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE );
     if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	text = 0;
-    const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE );
     if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	title = 0;
     const TQMetaProperty* pagetitle =
-	w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+	w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE );
     if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	pagetitle = 0;
     const TQMetaProperty* pixmap =
-	w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
+	w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pixmap", TRUE ), TRUE );
     if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
 	pixmap = 0;
 
@@ -1580,7 +1580,7 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int
 	    ids << ( id = rmbWidgets->insertItem( i18n("Choose Pixmap..."), -1, 0) );
 	    props.insert( "pixmap", id );
 	}
-	if ( text && text->designable(w) && !::qt_cast<TQTextEdit*>(w) ) {
+	if ( text && text->designable(w) && !::tqqt_cast<TQTextEdit*>(w) ) {
 	    ids << ( id = rmbWidgets->insertItem( i18n("Edit Text..."), -1, 0) );
 	    props.insert( "text", id );
 	}
@@ -1595,15 +1595,15 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int
     }
 }
 
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
-static QWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w )
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
+static TQWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w )
 {
     WidgetInterface *iface = 0;
-    widgetManager()->queryInterface( WidgetFactory::classNameOf( w ), &iface );
+    widgetManager()->queryInterface( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), &iface );
     if ( !iface )
 	return 0;
-    QWidgetContainerInterfacePrivate *iface2 = 0;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+    TQWidgetContainerInterfacePrivate *iface2 = 0;
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
     if ( !iface2 )
 	return 0;
     iface->release();
@@ -1616,19 +1616,19 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 {
     int id;
 
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
-	if ( ( (QDesignerTabWidget*)w )->count() > 1) {
+	if ( ( (TQDesignerTabWidget*)w )->count() > 1) {
 	    ids << ( id = rmbWidgets->insertItem( i18n("Delete Page"), -1, 0 ) );
 	    commands.insert( "remove", id );
 	}
 	ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	commands.insert( "add", id );
-    } else if ( ::qt_cast<QDesignerWidgetStack*>(w) ) {
+    } else if ( ::tqqt_cast<TQDesignerWidgetStack*>(w) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
-	if ( ( (QDesignerWidgetStack*)w )->count() > 1) {
+	if ( ( (TQDesignerWidgetStack*)w )->count() > 1) {
 	    ids << ( id = rmbWidgets->insertItem( i18n("Previous Page"), -1, 0 ) );
 	    commands.insert( "prevpage", id );
 	    ids << ( id = rmbWidgets->insertItem( i18n("Next Page"), -1, 0 ) );
@@ -1639,7 +1639,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 	}
 	ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	commands.insert( "add", id );
-    } else if ( ::qt_cast<TQToolBox*>(w) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(w) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
 	if ( ( (TQToolBox*)w )->count() > 1 ) {
@@ -1648,33 +1648,33 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 	}
 	ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	commands.insert( "add", id );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     } else if ( WidgetDatabase::
 		isCustomPluginWidget( WidgetDatabase::
-				      idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
-	QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
-	if ( iface && iface->supportsPages( WidgetFactory::classNameOf( w ) ) ) {
+				      idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
+	TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
+	if ( iface && iface->supportsPages( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) {
 	    if ( ids.isEmpty() )
 		ids << rmbWidgets->insertSeparator( 0 );
 
-	    if ( iface->count( WidgetFactory::classNameOf( w ), w ) > 1 ) {
+	    if ( iface->count( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) > 1 ) {
 		ids << ( id = rmbWidgets->insertItem( i18n( "Delete Page" ), -1, 0 ) );
 		commands.insert( "remove", id );
 	    }
 	    ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	    commands.insert( "add", id );
-	    if ( iface->currentIndex( WidgetFactory::classNameOf( w ), w ) != -1 ) {
+	    if ( iface->currentIndex( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) != -1 ) {
 		ids << ( id = rmbWidgets->insertItem( i18n("Rename Current Page..."), -1, 0 ) );
 		commands.insert( "rename", id );
 	    }
 	}
 	if ( iface )
 	    iface->release();
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     }
 
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
-			  idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) {
+			  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
 	ids << ( id = rmbWidgets->insertItem( i18n("Edit..."), -1, 0 ) );
@@ -1687,7 +1687,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 {
     int id;
 
-    if ( ::qt_cast<TQWizard*>(fw->mainContainer()) ) {
+    if ( ::tqqt_cast<TQWizard*>(fw->mainContainer()) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbFormWindow->insertSeparator( 0 );
 
@@ -1705,7 +1705,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 	ids << ( id = rmbFormWindow->insertItem( i18n("Edit Pages..."), -1, 0 ) );
 	commands.insert( "edit", id );
 
-    } else if ( ::qt_cast<TQMainWindow*>(fw->mainContainer()) ) {
+    } else if ( ::tqqt_cast<TQMainWindow*>(fw->mainContainer()) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbFormWindow->insertSeparator( 0 );
 	ids << ( id = rmbFormWindow->insertItem( i18n( "Add Menu Item" ), -1, 0 ) );
@@ -1720,108 +1720,108 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
     if ( id == props[ "text" ] ) {
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
-	if ( ::qt_cast<TQLabel*>(w) ) {
-	    int align = w->property( "alignment" ).toInt();
+	if ( ::tqqt_cast<TQLabel*>(w) ) {
+	    int align = w->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		oldDoWrap = TRUE;
 	}
 	bool doWrap = oldDoWrap;
 
 	TQString text;
-	if ( ::qt_cast<TQTextView*>(w) || ::qt_cast<TQLabel*>(w) || ::qt_cast<TQButton*>(w) ) {
-	    text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::qt_cast<TQButton*>(w), &doWrap );
+	if ( ::tqqt_cast<TQTextView*>(w) || ::tqqt_cast<TQLabel*>(w) || ::tqqt_cast<TQButton*>(w) ) {
+	    text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::tqqt_cast<TQButton*>(w), &doWrap );
 	    ok = !text.isNull();
 	} else {
-	    text = QInputDialog::getText( i18n("Text"), i18n( "New text" ),
+	    text = TQInputDialog::getText( i18n("Text"), i18n( "New text" ),
 				  TQLineEdit::Normal, w->property("text").toString(), &ok, this );
 	}
 	if ( ok ) {
 	    if ( oldDoWrap != doWrap ) {
-		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
-		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) );
+		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 								  "wordwrap", TQVariant( oldDoWrap, 0 ),
-								  TQVariant( doWrap, 0 ), TQString::null, TQString::null );
+								  TQVariant( doWrap, 0 ), TQString(), TQString() );
 		cmd->execute();
 		formWindow()->commandHistory()->addCommand( cmd );
-		MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE );
+		MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
 	    }
 
-	    TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "text", w->property( "text" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "text", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE );
 	}
     } else if ( id == props[ "title" ] ) {
 	bool ok = FALSE;
-	TQString title = QInputDialog::getText( i18n("Title"), i18n( "New title" ),
+	TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ),
 			       TQLineEdit::Normal, w->property("title").toString(), &ok, this );
 	if ( ok ) {
-	    TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "title", w->property( "title" ),
-							      title, TQString::null, TQString::null );
+							      title, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "title", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE );
 	}
     } else if ( id == props[ "pagetitle" ] ) {
 	bool ok = FALSE;
-	TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
+	TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
 			      TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this );
 	if ( ok ) {
-	    TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "pageTitle",
 							      w->property( "pageTitle" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "pageTitle", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pageTitle", TRUE );
 	}
     } else if ( id == props[ "pixmap" ] ) {
-	TQPixmap oldPix = w->property( "pixmap" ).toPixmap();
+	TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap();
 	TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix );
 	if ( !pix.isNull() ) {
-	    TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'pixmap' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "pixmap", w->property( "pixmap" ),
-							      pix, TQString::null, TQString::null );
+							      pix, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "pixmap", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pixmap", TRUE );
 	}
     }
 }
 
 void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &commands, TQWidget *w )
 {
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	TQTabWidget *tw = (TQTabWidget*)w;
 	if ( id == commands[ "add" ] ) {
 	    AddTabPageCommand *cmd =
-		new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(),
+		new AddTabPageCommand( i18n( "Add Page to %1" ).tqarg( tw->name() ), formWindow(),
 				       tw, "Tab" );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "remove" ] ) {
 	    if ( tw->currentPage() ) {
-		QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
+		TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw;
 		DeleteTabPageCommand *cmd =
 		    new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ).
-					      arg( dtw->pageTitle() ).arg( tw->name() ),
+					      tqarg( dtw->pageTitle() ).tqarg( tw->name() ),
 					      formWindow(), tw, tw->currentPage() );
 		formWindow()->commandHistory()->addCommand( cmd );
 		cmd->execute();
 	    }
 	}
-    } else if ( ::qt_cast<TQToolBox*>(w) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(w) ) {
 	TQToolBox *tb = (TQToolBox*)w;
 	if ( id == commands[ "add" ] ) {
 	    AddToolBoxPageCommand *cmd =
-		new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ),
+		new AddToolBoxPageCommand( i18n( "Add Page to %1" ).tqarg( tb->name() ),
 					   formWindow(),
 					   tb, "Page" );
 	    formWindow()->commandHistory()->addCommand( cmd );
@@ -1837,11 +1837,11 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		cmd->execute();
 	    }
 	}
-    } else if ( ::qt_cast<TQWidgetStack*>(w) ) {
-	QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w;
+    } else if ( ::tqqt_cast<TQWidgetStack*>(w) ) {
+	TQDesignerWidgetStack *ws = (TQDesignerWidgetStack*)w;
 	if ( id == commands[ "add" ] ) {
 	    AddWidgetStackPageCommand *cmd =
-		new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).arg( ws->name() ),
+		new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ),
 					       formWindow(), ws );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -1849,50 +1849,50 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	    if ( ws->visibleWidget() ) {
 		DeleteWidgetStackPageCommand *cmd =
 		    new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ).
-						      arg( ws->currentPage() ).arg( ws->name() ),
+						      tqarg( ws->currentPage() ).tqarg( ws->name() ),
 						      formWindow(), ws, ws->visibleWidget() );
 		formWindow()->commandHistory()->addCommand( cmd );
 		cmd->execute();
 	    }
 	} else if ( id == commands[ "nextpage" ] ) {
 	    int currentPage = w->property( "currentPage" ).toInt();
-	    TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) );
+	    TQString pn( i18n( "Raise next page of '%2'" ).tqarg( w->name() ) );
 	    SetPropertyCommand *cmd =
-		new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 					"currentPage", currentPage,
-					currentPage + 1, TQString::null, TQString::null );
+					currentPage + 1, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "currentPage", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE );
 	} else if ( id == commands[ "prevpage" ] ) {
 	    int currentPage = w->property( "currentPage" ).toInt();
-	    TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) );
+	    TQString pn( i18n( "Raise previous page of '%2'" ).tqarg( w->name() ) );
 	    SetPropertyCommand *cmd =
-		new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 					"currentPage", currentPage,
-					currentPage -1, TQString::null, TQString::null );
+					currentPage -1, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "currentPage", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE );
 	}
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     } else if ( WidgetDatabase::
 		isCustomPluginWidget( WidgetDatabase::
-				      idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
+				      idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
 	if ( id == commands[ "add" ] ) {
 	    AddContainerPageCommand *cmd =
-		new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ),
+		new AddContainerPageCommand( i18n( "Add Page to %1" ).tqarg( w->name() ),
 					     formWindow(), w, "Page" );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "remove" ] ) {
-	    QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
+	    TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
 	    if ( iface ) {
-		TQString wClassName = WidgetFactory::classNameOf( w );
+		TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 		int index = iface->currentIndex( wClassName, w );
 		DeleteContainerPageCommand *cmd =
 		    new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ).
-						    arg( iface->pageLabel( wClassName,
+						    tqarg( iface->pageLabel( wClassName,
 									   w, index ) ).
 						    arg( w->name() ),
 						    formWindow(), w, index );
@@ -1901,12 +1901,12 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		iface->release();
 	    }
 	} else if ( id == commands[ "rename" ] ) {
-	    QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
+	    TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
 	    if ( iface ) {
 		bool ok = FALSE;
-		TQString wClassName = WidgetFactory::classNameOf( w );
+		TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 		int index = iface->currentIndex( wClassName, w );
-		TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
+		TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
 						      TQLineEdit::Normal,
 						      iface->pageLabel( wClassName, w,
 								       index ),
@@ -1925,33 +1925,33 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		iface->release();
 	    }
 	}
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     }
 
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
-				  idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) {
+				  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
 	if ( id == commands[ "edit" ] )
 	    WidgetFactory::editWidget( WidgetDatabase::
-		       idFromClassName( WidgetFactory::classNameOf( w ) ), this, w, formWindow() );
+		       idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), this, w, formWindow() );
     }
 }
 
 void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &commands, FormWindow *fw )
 {
-    if ( ::qt_cast<TQWizard*>(fw->mainContainer()) ) {
+    if ( ::tqqt_cast<TQWizard*>(fw->mainContainer()) ) {
 	TQWizard *wiz = (TQWizard*)fw->mainContainer();
 	if ( id == commands[ "add" ] ) {
 	    AddWizardPageCommand *cmd =
-		new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ),
+		new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wiz->name() ),
 					  formWindow(), wiz, "WizardPage" );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "remove" ] ) {
 	    if ( wiz->currentPage() ) {
-		QDesignerWizard *dw = (QDesignerWizard*)wiz;
+		TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
 		DeleteWizardPageCommand *cmd =
 		    new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ).
-						 arg( dw->pageTitle() ).arg( wiz->name() ),
+						 tqarg( dw->pageTitle() ).tqarg( wiz->name() ),
 						 formWindow(), wiz,
 						 wiz->indexOf( wiz->currentPage() ) );
 		formWindow()->commandHistory()->addCommand( cmd );
@@ -1964,11 +1964,11 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	} else if ( id == commands[ "rename" ] ) {
 
 	    bool ok = FALSE;
-	    QDesignerWizard *dw = (QDesignerWizard*)wiz;
-	    TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
+	    TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
+	    TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
 					  TQLineEdit::Normal, dw->pageTitle(), &ok, this );
 	    if ( ok ) {
-		TQString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) );
+		TQString pn( i18n( "Rename page %1 of %2" ).tqarg( dw->pageTitle() ).tqarg( wiz->name() ) );
 		RenameWizardPageCommand *cmd =
 		    new RenameWizardPageCommand( pn, formWindow()
 						 , wiz, wiz->indexOf( wiz->currentPage() ), text );
@@ -1976,17 +1976,17 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		cmd->execute();
 	    }
 	}
-    } else if ( ::qt_cast<TQMainWindow*>(fw->mainContainer()) ) {
+    } else if ( ::tqqt_cast<TQMainWindow*>(fw->mainContainer()) ) {
 	TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
 	if ( id == commands[ "add_toolbar" ] ) {
 	    AddToolBarCommand *cmd =
-		new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ),
+		new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).tqarg( formWindow()->name() ),
 				       formWindow(), mw );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "add_menu_item" ] ) {
 	    AddMenuCommand *cmd =
-		new AddMenuCommand( i18n( "Add Menu to '%1'" ).arg( formWindow()->name() ),
+		new AddMenuCommand( i18n( "Add Menu to '%1'" ).tqarg( formWindow()->name() ),
 				    formWindow(), mw );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -1996,15 +1996,15 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 
 void MainWindow::clipboardChanged()
 {
-    TQString text( qApp->clipboard()->text() );
+    TQString text( tqApp->clipboard()->text() );
     TQString start( "<!DOCTYPE UI-SELECTION>" );
     actionEditPaste->setEnabled( text.left( start.length() ) == start );
 }
 
 void MainWindow::selectionChanged()
 {
-    layoutChilds = FALSE;
-    layoutSelected = FALSE;
+    tqlayoutChilds = FALSE;
+    tqlayoutSelected = FALSE;
     breakLayout = FALSE;
     if ( !formWindow() ) {
 	actionEditCut->setEnabled( FALSE );
@@ -2041,7 +2041,7 @@ void MainWindow::selectionChanged()
 	int unlaidout = 0;
 	int laidout = 0;
 	for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	    if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
+	    if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
 		unlaidout++;
 	    else
 		laidout++;
@@ -2053,27 +2053,27 @@ void MainWindow::selectionChanged()
 	actionEditGridLayout->setEnabled( unlaidout > 1 );
 	actionEditBreakLayout->setEnabled( laidout > 0 );
 	actionEditAdjustSize->setEnabled( laidout > 0 );
-	layoutSelected = unlaidout > 1;
+	tqlayoutSelected = unlaidout > 1;
 	breakLayout = laidout > 0;
     } else if ( selectedWidgets == 1 ) {
 	TQWidget *w = widgets.first();
-	bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ||
+	bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
 			   w == formWindow()->mainContainer();
-	actionEditAdjustSize->setEnabled( !w->parentWidget() ||
-					  WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout );
+	actionEditAdjustSize->setEnabled( !w->tqparentWidget() ||
+					  WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout );
 
 	if ( !isContainer ) {
 	    actionEditHLayout->setEnabled( FALSE );
 	    actionEditVLayout->setEnabled( FALSE );
 	    actionEditGridLayout->setEnabled( FALSE );
-	    if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
-		actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) );
+	    if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
+		actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
 		breakLayout = TRUE;
 	    } else {
 		actionEditBreakLayout->setEnabled( FALSE );
 	    }
 	} else {
-	    if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
+	    if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
 		if ( !formWindow()->hasInsertedChildren( w ) ) {
 		    actionEditHLayout->setEnabled( FALSE );
 		    actionEditVLayout->setEnabled( FALSE );
@@ -2084,24 +2084,24 @@ void MainWindow::selectionChanged()
 		    actionEditVLayout->setEnabled( TRUE );
 		    actionEditGridLayout->setEnabled( TRUE );
 		    actionEditBreakLayout->setEnabled( FALSE );
-		    layoutChilds = TRUE;
+		    tqlayoutChilds = TRUE;
 		}
-		if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
-		    actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) );
+		if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
+		    actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
 		    breakLayout = TRUE;
 		}
 	    } else {
 		actionEditHLayout->setEnabled( FALSE );
 		actionEditVLayout->setEnabled( FALSE );
 		actionEditGridLayout->setEnabled( FALSE );
-		actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) );
+		actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
 		breakLayout = TRUE;
 	    }
 	}
     } else if ( selectedWidgets == 0 ) {
 	actionEditAdjustSize->setEnabled( TRUE );
 	TQWidget *w = formWindow()->mainContainer();
-	if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
+	if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
 	    if ( !formWindow()->hasInsertedChildren( w ) ) {
 		actionEditHLayout->setEnabled( FALSE );
 		actionEditVLayout->setEnabled( FALSE );
@@ -2112,7 +2112,7 @@ void MainWindow::selectionChanged()
 		actionEditVLayout->setEnabled( TRUE );
 		actionEditGridLayout->setEnabled( TRUE );
 		actionEditBreakLayout->setEnabled( FALSE );
-		layoutChilds = TRUE;
+		tqlayoutChilds = TRUE;
 	    }
 	} else {
 	    actionEditHLayout->setEnabled( FALSE );
@@ -2132,7 +2132,7 @@ void MainWindow::selectionChanged()
 static TQString fixArgs( const TQString &s2 )
 {
     TQString s = s2;
-    return s.replace( ',', ';' );
+    return s.tqreplace( ',', ';' );
 }
 
 void MainWindow::writeConfig()
@@ -2177,18 +2177,18 @@ void MainWindow::writeConfig()
     config.writeEntry( keybase + "Geometries/MainwindowWidth", width() );
     config.writeEntry( keybase + "Geometries/MainwindowHeight", height() );
     config.writeEntry( keybase + "Geometries/MainwindowMaximized", isMaximized() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorX", propertyEditor->parentWidget()->x() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorY", propertyEditor->parentWidget()->y() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorWidth", propertyEditor->parentWidget()->width() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorHeight", propertyEditor->parentWidget()->height() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewX", hierarchyView->parentWidget()->x() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewY", hierarchyView->parentWidget()->y() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewWidth", hierarchyView->parentWidget()->width() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewHeight", hierarchyView->parentWidget()->height() );
-    config.writeEntry( keybase + "Geometries/WorkspaceX", wspace->parentWidget()->x() );
-    config.writeEntry( keybase + "Geometries/WorkspaceY", wspace->parentWidget()->y() );
-    config.writeEntry( keybase + "Geometries/WorkspaceWidth", wspace->parentWidget()->width() );
-    config.writeEntry( keybase + "Geometries/WorkspaceHeight", wspace->parentWidget()->height() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorX", propertyEditor->tqparentWidget()->x() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorY", propertyEditor->tqparentWidget()->y() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorWidth", propertyEditor->tqparentWidget()->width() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorHeight", propertyEditor->tqparentWidget()->height() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewX", hierarchyView->tqparentWidget()->x() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewY", hierarchyView->tqparentWidget()->y() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewWidth", hierarchyView->tqparentWidget()->width() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewHeight", hierarchyView->tqparentWidget()->height() );
+    config.writeEntry( keybase + "Geometries/WorkspaceX", wspace->tqparentWidget()->x() );
+    config.writeEntry( keybase + "Geometries/WorkspaceY", wspace->tqparentWidget()->y() );
+    config.writeEntry( keybase + "Geometries/WorkspaceWidth", wspace->tqparentWidget()->width() );
+    config.writeEntry( keybase + "Geometries/WorkspaceHeight", wspace->tqparentWidget()->height() );
 
     config.writeEntry( keybase + "View/TextLabels", usesTextLabel() );
     config.writeEntry( keybase + "View/BigIcons", usesBigPixmaps() );
@@ -2211,8 +2211,8 @@ void MainWindow::writeConfig()
 	l << w->className;
 	l << w->includeFile;
 	l << TQString::number( (int)w->includePolicy );
-	l << TQString::number( w->sizeHint.width() );
-	l << TQString::number( w->sizeHint.height() );
+	l << TQString::number( w->tqsizeHint.width() );
+	l << TQString::number( w->tqsizeHint.height() );
 	l << TQString::number( w->lstSignals.count() );
 	for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
 	    l << TQString( fixArgs( *it ) );
@@ -2242,7 +2242,7 @@ void MainWindow::writeConfig()
 static TQString fixArgs2( const TQString &s2 )
 {
     TQString s = s2;
-    return s.replace( ';', ',' );
+    return s.tqreplace( ';', ',' );
 }
 
 void MainWindow::readConfig()
@@ -2261,7 +2261,7 @@ void MainWindow::readConfig()
 	if ( !ok ) {
 	    if ( oWindow ) {
 		oWindow->shuttingDown();
-		( (TQDockWindow*)oWindow->parent() )->hide();
+		( (TQDockWindow*)oWindow->tqparent() )->hide();
 	    }
 	    TQPixmap pix;
 	    pix.load( backPixName );
@@ -2273,7 +2273,7 @@ void MainWindow::readConfig()
     }
     if ( !readPreviousConfig ) {
 	fileFilter = config.readEntry( keybase + "FileFilter", fileFilter );
-	templPath = config.readEntry( keybase + "TemplatePath", TQString::null );
+	templPath = config.readEntry( keybase + "TemplatePath", TQString() );
 	databaseAutoEdit = config.readBoolEntry( keybase + "DatabaseAutoEdit", databaseAutoEdit );
 	shStartDialog = config.readBoolEntry( keybase + "ShowStartDialog", shStartDialog );
 	autoSaveEnabled = config.readBoolEntry( keybase + "AutoSave/Enabled", autoSaveEnabled );
@@ -2290,14 +2290,14 @@ void MainWindow::readConfig()
 	}
 	// We know that the oldSettingsKey() will return 3.1
 	if ( keybase == DesignerApplication::oldSettingsKey() ) {
-	    if (keybase.contains("3.1"))
+	    if (keybase.tqcontains("3.1"))
 		recentlyFiles = config.readListEntry( keybase + "RecentlyOpenedFiles", ',' );
 	    else
 		recentlyFiles = config.readListEntry(keybase + "RecentlyOpenedFiles");
 
 	    if ( recentlyFiles.count() == 1 && recentlyFiles[0].isNull() )
 		recentlyFiles.clear();
-	    if (keybase.contains("3.1"))
+	    if (keybase.tqcontains("3.1"))
 		recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects", ',' );
 	    else
 		recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects");
@@ -2315,7 +2315,7 @@ void MainWindow::readConfig()
 	    if ( !pix.isNull() )
 		qworkspace->setBackgroundPixmap( pix );
 	} else {
-	    qworkspace->setBackgroundColor( TQColor( (QRgb)config.readNumEntry( keybase + "Background/Color" ) ) );
+	    qworkspace->setBackgroundColor( TQColor( (TQRgb)config.readNumEntry( keybase + "Background/Color" ) ) );
 	}
 
 	if ( !readPreviousConfig ) {
@@ -2333,7 +2333,7 @@ void MainWindow::readConfig()
 		r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) );
 		r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) );
 
-		TQRect desk = TQApplication::desktop()->geometry();
+		TQRect desk = TQApplication::desktop()->tqgeometry();
 		TQRect inter = desk.intersect( r );
 		resize( r.size() );
 		if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) {
@@ -2351,8 +2351,8 @@ void MainWindow::readConfig()
 	w->className = l[ 0 ];
 	w->includeFile = l[ 1 ];
 	w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
-	w->sizeHint.setWidth( l[ 3 ].toInt() );
-	w->sizeHint.setHeight( l[ 4 ].toInt() );
+	w->tqsizeHint.setWidth( l[ 3 ].toInt() );
+	w->tqsizeHint.setHeight( l[ 4 ].toInt() );
 	uint c = 5;
 	if ( l.count() > c ) {
 	    int numSignals = l[ c ].toInt();
@@ -2401,7 +2401,7 @@ void MainWindow::readConfig()
     if ( !restoreConfig )
 	return;
 
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     /* I'm sorry to make this not happen on the Mac, but it seems to hang somewhere deep
        in TQLayout, it gets into a very large loop - and seems it has to do with clever
        things the designer does ###Sam */
@@ -2418,7 +2418,7 @@ void MainWindow::readConfig()
     }
     if ( readPreviousConfig && oWindow ) {
 	oWindow->shuttingDown();
-	( (TQDockWindow*)oWindow->parent() )->hide();
+	( (TQDockWindow*)oWindow->tqparent() )->hide();
     }
 
     rebuildCustomWidgetGUI();
@@ -2449,9 +2449,9 @@ HierarchyView *MainWindow::objectHierarchy() const
     return hierarchyView;
 }
 
-TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent )
+TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent )
 {
-    TQPopupMenu *menu = new TQPopupMenu( parent );
+    TQPopupMenu *menu = new TQPopupMenu( tqparent );
 
     actionEditCut->addTo( menu );
     actionEditCopy->addTo( menu );
@@ -2461,12 +2461,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent )
     return menu;
 }
 
-TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot )
+TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot )
 {
-    TQPopupMenu *menu = new TQPopupMenu( parent );
+    TQPopupMenu *menu = new TQPopupMenu( tqparent );
 
-    menu->insertItem( i18n( "Add Page" ), parent, addSlot );
-    menu->insertItem( i18n( "Delete Page" ), parent, removeSlot );
+    menu->insertItem( i18n( "Add Page" ), tqparent, addSlot );
+    menu->insertItem( i18n( "Delete Page" ), tqparent, removeSlot );
     menu->insertSeparator();
     actionEditCut->addTo( menu );
     actionEditCopy->addTo( menu );
@@ -2489,7 +2489,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
     while ( wit.current() ) {
 	TQWidget *w = wit.current();
 	++wit;
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    if ( ( (FormWindow*)w )->formFile()->editor() )
 		windows.removeRef( ( (FormWindow*)w )->formFile()->editor() );
 	    if ( ( (FormWindow*)w )->formFile()->formWindow() )
@@ -2498,7 +2498,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
 		e->ignore();
 		return;
 	    }
-	} else if ( ::qt_cast<SourceEditor*>(w) ) {
+	} else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    if ( !( (SourceEditor*)w )->close() ) {
 		e->ignore();
 		return;
@@ -2513,7 +2513,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
 	++it;
 	if ( pro->isModified() ) {
 	    switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
-					   i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
+					   i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
 					   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
 	    case 0: // save
 		pro->save();
@@ -2562,19 +2562,19 @@ ActionEditor *MainWindow::actioneditor() const
 
 bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 {
-    if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( w ) ) {
-	TQString defSignal = WidgetFactory::defaultSignal( w );
+    if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) ) {
+	TQString defSignal = WidgetFactory::defaultSignal( TQT_TQOBJECT(w) );
 	if ( defSignal.isEmpty() ) {
 	    editSource();
 	} else {
 	    TQString s = TQString( w->name() ) + "_" + defSignal;
 	    LanguageInterface *iface = MetaDataBase::languageInterface( f->project()->language() );
 	    if ( iface ) {
-		TQStrList sigs = iface->signalNames( w );
+		TQStrList sigs = iface->signalNames( TQT_TQOBJECT(w) );
 		TQString fullSignal;
 		for ( int i = 0; i < (int)sigs.count(); ++i ) {
 		    TQString sig = sigs.at( i );
-		    if ( sig.left( sig.find( '(' ) ) == defSignal ) {
+		    if ( sig.left( sig.tqfind( '(' ) ) == defSignal ) {
 			fullSignal = sig;
 			break;
 		    }
@@ -2582,18 +2582,18 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 
 		if ( !fullSignal.isEmpty() ) {
 		    TQString signl = fullSignal;
-		    fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 );
+		    fullSignal = fullSignal.mid( fullSignal.tqfind( '(' ) + 1 );
 		    fullSignal.remove( (int)fullSignal.length() - 1, 1 );
 		    fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() );
 		    s += "(" + fullSignal + ")";
-		    if ( !MetaDataBase::hasFunction( f, s.latin1() ) )
-			MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot",
+		    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(f), s.latin1() ) )
+			MetaDataBase::addFunction( TQT_TQOBJECT(f), s.latin1(), "", "public", "slot",
 						   f->project()->language(), "void" );
-		    s = s.left( s.find( '(' ) ).latin1();
-		    if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) {
+		    s = s.left( s.tqfind( '(' ) ).latin1();
+		    if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(f), TQT_TQOBJECT(w), defSignal.latin1(), TQT_TQOBJECT(f->mainContainer()), s.latin1() ) ) {
 			MetaDataBase::Connection conn;
-			conn.sender = w;
-			conn.receiver = f->mainContainer();
+			conn.sender = TQT_TQOBJECT(w);
+			conn.receiver = TQT_TQOBJECT(f->mainContainer());
 			conn.signal = signl;
 			conn.slot = s;
 			AddConnectionCommand *cmd =
@@ -2609,73 +2609,73 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 	return TRUE;
     }
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
-					  idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) {
-	statusMessage( i18n( "Edit %1..." ).arg( w->className() ) );
-	WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ),
+					  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
+	statusMessage( i18n( "Edit %1..." ).tqarg( w->className() ) );
+	WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ),
 				   this, w, formWindow() );
 	statusBar()->clear();
 	return TRUE;
     }
 
-    const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
-    const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+    const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE );
     if ( text && text->designable(w) ) {
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
-	if ( ::qt_cast<TQLabel*>(w) ) {
-	    int align = w->property( "alignment" ).toInt();
+	if ( ::tqqt_cast<TQLabel*>(w) ) {
+	    int align = w->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		oldDoWrap = TRUE;
 	}
 	bool doWrap = oldDoWrap;
 
 	TQString text;
-	if ( ::qt_cast<TQTextEdit*>(w) || ::qt_cast<TQLabel*>(w) || ::qt_cast<TQButton*>(w) ) {
+	if ( ::tqqt_cast<TQTextEdit*>(w) || ::tqqt_cast<TQLabel*>(w) || ::tqqt_cast<TQButton*>(w) ) {
 	    text = MultiLineEditor::getText( this, w->property( "text" ).toString(),
-					     !::qt_cast<TQButton*>(w), &doWrap );
+					     !::tqqt_cast<TQButton*>(w), &doWrap );
 	    ok = !text.isNull();
 	} else {
-	    text = QInputDialog::getText( i18n("Text"), i18n( "New text" ),
+	    text = TQInputDialog::getText( i18n("Text"), i18n( "New text" ),
 				  TQLineEdit::Normal, w->property("text").toString(), &ok, this );
 	}
 	if ( ok ) {
 	    if ( oldDoWrap != doWrap ) {
-		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
-		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) );
+		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 								  "wordwrap", TQVariant( oldDoWrap, 0 ),
-								  TQVariant( doWrap, 0 ), TQString::null, TQString::null );
+								  TQVariant( doWrap, 0 ), TQString(), TQString() );
 		cmd->execute();
 		formWindow()->commandHistory()->addCommand( cmd );
-		MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE );
+		MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
 	    }
 
-	    TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "text", w->property( "text" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "text", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE );
 	}
 	return TRUE;
     }
     if ( title && title->designable(w) ) {
 	bool ok = FALSE;
 	TQString text;
-	text = QInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this );
+	text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this );
 	if ( ok ) {
-	    TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "title", w->property( "title" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "title", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE );
 	}
 	return TRUE;
     }
 
-    if ( !WidgetFactory::isPassiveInteractor( w ) )
+    if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) )
 	editSource();
 
     return TRUE;
@@ -2706,12 +2706,12 @@ void MainWindow::rebuildCustomWidgetGUI()
 	a->setToggleAction( TRUE );
 	a->setText( w->className );
 	a->setIconSet( *w->pixmap );
-	a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) );
+	a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).tqarg( w->className ) );
 	a->setWhatsThis( i18n("<b>%1 (custom widget)</b>"
 			    "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> menu to "
 			    "add and change custom widgets. You can add properties as well as "
-			    "signals and slots to integrate them into Qt Designer, "
-			    "and provide a pixmap which will be used to represent the widget on the form.</p>").arg( w->className ) );
+			    "signals and slots to integrate them into TQt Designer, "
+			    "and provide a pixmap which will be used to represent the widget on the form.</p>").tqarg( w->className ) );
 
 	a->addTo( customWidgetToolBar );
 	a->addTo( customWidgetToolBar2 );
@@ -2746,7 +2746,7 @@ bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid )
 {
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    if ( ( (FormWindow*)w )->isCustomWidgetUsed( wid ) )
 		return TRUE;
 	}
@@ -2761,7 +2761,7 @@ void MainWindow::setGrid( const TQPoint &p )
     grd = p;
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( !::qt_cast<FormWindow*>(w) )
+	if ( !::tqqt_cast<FormWindow*>(w) )
 	    continue;
 	( (FormWindow*)w )->mainContainer()->update();
     }
@@ -2774,7 +2774,7 @@ void MainWindow::setShowGrid( bool b )
     sGrid = b;
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( !::qt_cast<FormWindow*>(w) )
+	if ( !::tqqt_cast<FormWindow*>(w) )
 	    continue;
 	( (FormWindow*)w )->mainContainer()->update();
     }
@@ -2804,7 +2804,7 @@ void MainWindow::projectSelected( TQAction *a )
     a->setOn( TRUE );
     if ( currentProject )
 	currentProject->setActive( FALSE );
-    Project *p = *projects.find( a );
+    Project *p = *projects.tqfind( a );
     p->setActive( TRUE );
     if ( currentProject == p )
 	return;
@@ -2842,8 +2842,8 @@ void MainWindow::checkTempFiles()
     TQStringList lst = d.entryList();
     TQApplication::restoreOverrideCursor();
     bool load = TQMessageBox::information( this, i18n( "Restoring Last Session" ),
-					  i18n( "Qt Designer found some temporary saved files, which were\n"
-					      "written when Qt Designer crashed last time. Do you want to\n"
+					  i18n( "TQt Designer found some temporary saved files, which were\n"
+					      "written when TQt Designer crashed last time. Do you want to\n"
 					      "load these files?" ), i18n( "&Yes" ), i18n( "&No" ) ) == 0;
     TQApplication::setOverrideCursor( waitCursor );
     for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
@@ -2856,52 +2856,52 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->topLevelWidget();
+    w = w->tqtopLevelWidget();
 
     TQString link = documentationPath() + "/designer-manual-13.html#";
 
-    if ( ::qt_cast<NewFormBase*>(w) || ::qt_cast<StartDialogBase*>(w) ) // own doc for startdialog?
+    if ( ::tqqt_cast<NewFormBase*>(w) || ::tqqt_cast<StartDialogBase*>(w) ) // own doc for startdialog?
 	link += "dialog-file-new";
-    else if ( ::qt_cast<CreateTemplate*>(w) )
+    else if ( ::tqqt_cast<CreateTemplate*>(w) )
 	link += "dialog-file-create-template";
-    else if ( ::qt_cast<EditFunctionsBase*>(w) )
+    else if ( ::tqqt_cast<EditFunctionsBase*>(w) )
 	link += "dialog-edit-functions";
-//     else if ( ::qt_cast<ConnectionViewerBase*>(w) )
+//     else if ( ::tqqt_cast<ConnectionViewerBase*>(w) )
     else if ( w->inherits("ConnectionViewerBase") )
  	link += "dialog-view-connections";
-    else if ( ::qt_cast<FormSettingsBase*>(w) )
+    else if ( ::tqqt_cast<FormSettingsBase*>(w) )
 	link += "dialog-edit-form-settings";
-    else if ( ::qt_cast<Preferences*>(w) )
+    else if ( ::tqqt_cast<Preferences*>(w) )
 	link += "dialog-edit-preferences";
-    else if ( ::qt_cast<PixmapCollectionEditor*>(w) )
+    else if ( ::tqqt_cast<PixmapCollectionEditor*>(w) )
 	link += "dialog-image-collection";
-//    else if ( ::qt_cast<DatabaseConnectionBase*>(w) )
+//    else if ( ::tqqt_cast<DatabaseConnectionBase*>(w) )
     else if ( w->inherits( "DatabaseConnectionBase" ) )
 	link += "dialog-edit-database-connections";
-    else if ( ::qt_cast<ProjectSettingsBase*>(w) )
+    else if ( ::tqqt_cast<ProjectSettingsBase*>(w) )
 	link += "dialog-project-settings";
-    else if ( ::qt_cast<FindDialog*>(w) )
-	link += "dialog-find-text";
-    else if ( ::qt_cast<ReplaceDialog*>(w) )
-	link += "dialog-replace-text";
-    else if ( ::qt_cast<GotoLineDialog*>(w) )
+    else if ( ::tqqt_cast<FindDialog*>(w) )
+	link += "dialog-tqfind-text";
+    else if ( ::tqqt_cast<ReplaceDialog*>(w) )
+	link += "dialog-tqreplace-text";
+    else if ( ::tqqt_cast<GotoLineDialog*>(w) )
 	link += "dialog-go-to-line";
-//    else if ( ::qt_cast<ConnectionEditorBase*>(w) )
+//    else if ( ::tqqt_cast<ConnectionEditorBase*>(w) )
     else if ( w->inherits("ConnectionEditorBase") )
 	link += "dialog-edit-connections";
-    else if ( ::qt_cast<CustomWidgetEditorBase*>(w) )
+    else if ( ::tqqt_cast<CustomWidgetEditorBase*>(w) )
 	link += "dialog-edit-custom-widgets";
-    else if ( ::qt_cast<PaletteEditorBase*>(w) )
+    else if ( ::tqqt_cast<PaletteEditorBase*>(w) )
 	link += "dialog-edit-palette";
-    else if ( ::qt_cast<ListBoxEditorBase*>(w) )
+    else if ( ::tqqt_cast<ListBoxEditorBase*>(w) )
 	link += "dialog-edit-listbox";
-    else if ( ::qt_cast<ListViewEditorBase*>(w) )
+    else if ( ::tqqt_cast<ListViewEditorBase*>(w) )
 	link += "dialog-edit-listview";
-    else if ( ::qt_cast<IconViewEditorBase*>(w) )
+    else if ( ::tqqt_cast<IconViewEditorBase*>(w) )
 	link += "dialog-edit-iconview";
-    else if ( ::qt_cast<TableEditorBase*>(w) )
+    else if ( ::tqqt_cast<TableEditorBase*>(w) )
 	link += "dialog-edit-table";
-    else if ( ::qt_cast<MultiLineEditor*>(w) )
+    else if ( ::tqqt_cast<MultiLineEditor*>(w) )
 	link += "dialog-text";
 
     else {
@@ -2915,7 +2915,7 @@ void MainWindow::showDialogHelp()
 
 void MainWindow::setupActionManager()
 {
-    actionPluginManager = new QPluginManager<ActionInterface>( IID_Action, TQApplication::libraryPaths(), pluginDirectory() );
+    actionPluginManager = new TQPluginManager<ActionInterface>( IID_Action, TQApplication::libraryPaths(), pluginDirectory() );
 
     TQStringList lst = actionPluginManager->featureList();
     for ( TQStringList::ConstIterator ait = lst.begin(); ait != lst.end(); ++ait ) {
@@ -2925,7 +2925,7 @@ void MainWindow::setupActionManager()
 	    continue;
 
 	iface->connectTo( desInterface );
-	TQAction *a = iface->create( *ait, this );
+	TQAction *a = iface->create( *ait, TQT_TQOBJECT(this) );
 	if ( !a )
 	    continue;
 
@@ -2967,7 +2967,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource )
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static Qt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return;
     }
 
@@ -2979,7 +2979,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource )
 	}
     }
 
-    createSourceEditor( formWindow(), formWindow()->project(), lang, func, rereadSource );
+    createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang, func, rereadSource );
 }
 
 void MainWindow::setupRecentlyFilesMenu()
@@ -3099,7 +3099,7 @@ void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst )
     TQFileInfo fi( fn );
     fi.convertToAbs();
     TQString f = fi.filePath();
-    if ( lst.find( f ) != lst.end() )
+    if ( lst.tqfind( f ) != lst.end() )
 	lst.remove( f );
     if ( lst.count() >= 10 )
 	lst.pop_back();
@@ -3115,19 +3115,19 @@ TemplateWizardInterface * MainWindow::templateWizardInterface( const TQString& c
 
 void MainWindow::setupPluginManagers()
 {
-    editorPluginManager = new QPluginManager<EditorInterface>( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" );
+    editorPluginManager = new TQPluginManager<EditorInterface>( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" );
     MetaDataBase::setEditor( editorPluginManager->featureList() );
 
     templateWizardPluginManager =
-	new QPluginManager<TemplateWizardInterface>( IID_TemplateWizard, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<TemplateWizardInterface>( IID_TemplateWizard, TQApplication::libraryPaths(), pluginDirectory() );
 
     MetaDataBase::setupInterfaceManagers( "/designer" );
     preferencePluginManager =
-	new QPluginManager<PreferenceInterface>( IID_Preference, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<PreferenceInterface>( IID_Preference, TQApplication::libraryPaths(), pluginDirectory() );
     projectSettingsPluginManager =
-	new QPluginManager<ProjectSettingsInterface>( IID_ProjectSettings, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<ProjectSettingsInterface>( IID_ProjectSettings, TQApplication::libraryPaths(), pluginDirectory() );
     sourceTemplatePluginManager =
-	new QPluginManager<SourceTemplateInterface>( IID_SourceTemplate, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<SourceTemplateInterface>( IID_SourceTemplate, TQApplication::libraryPaths(), pluginDirectory() );
 
     if ( preferencePluginManager ) {
 	TQStringList lst = preferencePluginManager->featureList();
@@ -3189,10 +3189,10 @@ void MainWindow::setModified( bool b, TQWidget *window )
 {
     TQWidget *w = window;
     while ( w ) {
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    ( (FormWindow*)w )->modificationChanged( b );
 	    return;
-	} else if ( ::qt_cast<SourceEditor*>(w) ) {
+	} else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    FormWindow *fw = ( (SourceEditor*)w )->formWindow();
 	    if ( fw && !fw->isFake() ) {
 		//fw->commandHistory()->setModified( b );
@@ -3204,13 +3204,13 @@ void MainWindow::setModified( bool b, TQWidget *window )
 	    }
 	    return;
 	}
-	w = w->parentWidget( TRUE );
+	w = w->tqparentWidget( TRUE );
     }
 }
 
 void MainWindow::editorClosed( SourceEditor *e )
 {
-    sourceEditors.take( sourceEditors.findRef( e ) );
+    sourceEditors.take( sourceEditors.tqfindRef( e ) );
 }
 
 void MainWindow::functionsChanged()
@@ -3227,7 +3227,7 @@ void MainWindow::doFunctionsChanged()
 
 void MainWindow::updateFunctionList()
 {
-    if ( !qWorkspace()->activeWindow() || !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+    if ( !qWorkspace()->activeWindow() || !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	return;
     SourceEditor *se = (SourceEditor*)qWorkspace()->activeWindow();
     se->save();
@@ -3238,7 +3238,7 @@ void MainWindow::updateFunctionList()
 	    return;
 	TQValueList<LanguageInterface::Connection> conns;
 	iface->connections( se->text(), &conns );
-	MetaDataBase::setupConnections( se->formWindow(), conns );
+	MetaDataBase::setupConnections( TQT_TQOBJECT(se->formWindow()), conns );
 	propertyEditor->eventList()->setup();
     }
 }
@@ -3300,9 +3300,9 @@ void MainWindow::enableAll( bool enable )
     menuBar()->setEnabled( enable );
     TQObjectList *l = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
-	if ( o == wspace->parentWidget() ||
-	     o == oWindow->parentWidget() ||
-	     o == hierarchyView->parentWidget() )
+	if ( TQT_BASE_OBJECT(o) == wspace->tqparentWidget() ||
+	     TQT_BASE_OBJECT(o) == oWindow->tqparentWidget() ||
+	     TQT_BASE_OBJECT(o) == hierarchyView->tqparentWidget() )
 	    continue;
 	( (TQWidget*)o )->setEnabled( enable );
     }
@@ -3316,9 +3316,9 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 	FormWindow *fw = 0;
 	SourceEditor *se = 0;
 	SourceFile *sf = 0;
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    fw = (FormWindow*)w;
-	} else if ( ::qt_cast<SourceEditor*>(w) ) {
+	} else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    se = (SourceEditor*)w;
 	    if ( !se->object() )
 		continue;
@@ -3350,7 +3350,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 		    fw->showNormal();
 		    fw->setFocus();
 		    lastActiveFormWindow = fw;
-		    qApp->processEvents();
+		    tqApp->processEvents();
 		    se = editSource();
 		    if ( se ) {
 			switch ( lm ) {
@@ -3386,7 +3386,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 	}
     }
 
-    if ( ::qt_cast<SourceFile*>(o) ) {
+    if ( ::tqqt_cast<SourceFile*>(o) ) {
 	for ( TQPtrListIterator<SourceFile> sources = currentProject->sourceFiles();
 	      sources.current(); ++sources ) {
 	    SourceFile* f = sources.current();
@@ -3422,10 +3422,10 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 
     mblockNewForms = TRUE;
     if ( !fw )
-	openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) );
+	openFormWindow( currentProject->makeAbsolute( *qwf_forms->tqfind( (TQWidget*)o ) ) );
     else
 	fw->formFile()->showEditor( FALSE );
-    qApp->processEvents(); // give all views the chance to get the formwindow
+    tqApp->processEvents(); // give all views the chance to get the formwindow
     SourceEditor *se = editSource();
     if ( se ) {
 	switch ( lm ) {
@@ -3448,12 +3448,12 @@ TQObject *MainWindow::findRealObject( TQObject *o )
 {
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( ::qt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) )
-	    return w;
-	else if ( ::qt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() &&
+	if ( ::tqqt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) )
+	    return TQT_TQOBJECT(w);
+	else if ( ::tqqt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() &&
 		  TQString( ( (SourceEditor*)w )->formWindow()->name() ) == TQString( o->name() ) )
-	    return w;
-	else if ( ::qt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() &&
+	    return TQT_TQOBJECT(w);
+	else if ( ::tqqt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() &&
 		  ( (SourceEditor*)w )->sourceFile() == o )
 	    return o;
     }
@@ -3463,7 +3463,7 @@ TQObject *MainWindow::findRealObject( TQObject *o )
 void MainWindow::formNameChanged( FormWindow *fw )
 {
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
-	if ( e->object() == fw )
+	if ( TQT_BASE_OBJECT(e->object()) == TQT_BASE_OBJECT(fw) )
 	    e->refresh( TRUE );
 	if ( e->project() == fw->project() )
 	    e->resetContext();
@@ -3474,7 +3474,7 @@ void MainWindow::breakPointsChanged()
 {
     if ( !inDebugMode )
 	return;
-    if ( !qWorkspace()->activeWindow() || !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+    if ( !qWorkspace()->activeWindow() || !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	return;
     SourceEditor *e = (SourceEditor*)qWorkspace()->activeWindow();
     if ( !e->object() || !e->project() )
@@ -3484,7 +3484,7 @@ void MainWindow::breakPointsChanged()
 
     if ( !interpreterPluginManager ) {
 	interpreterPluginManager =
-	    new QPluginManager<InterpreterInterface>( IID_Interpreter,
+	    new TQPluginManager<InterpreterInterface>( IID_Interpreter,
 						      TQApplication::libraryPaths(),
 						      "/qsa" );
     }
@@ -3520,14 +3520,14 @@ void MainWindow::breakPointsChanged()
 int MainWindow::currentLayoutDefaultSpacing() const
 {
     if ( ( (MainWindow*)this )->formWindow() )
-	return ( (MainWindow*)this )->formWindow()->layoutDefaultSpacing();
+	return ( (MainWindow*)this )->formWindow()->tqlayoutDefaultSpacing();
     return BOXLAYOUT_DEFAULT_SPACING;
 }
 
 int MainWindow::currentLayoutDefaultMargin() const
 {
     if ( ( (MainWindow*)this )->formWindow() )
-	return ( (MainWindow*)this )->formWindow()->layoutDefaultMargin();
+	return ( (MainWindow*)this )->formWindow()->tqlayoutDefaultMargin();
     return BOXLAYOUT_DEFAULT_MARGIN;
 }
 
@@ -3568,10 +3568,10 @@ bool MainWindow::openProjectSettings( Project *pro )
 	dia.tabWidget->addTab( t.w, t.title );
 	if ( t.receiver ) {
 	    connect( dia.buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) );
-	    connect( senderObject, TQT_SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot );
-	    connect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot );
+	    connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	    senderObject->emitInitSignal();
-	    disconnect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	}
     }
 
@@ -3620,13 +3620,13 @@ TQString MainWindow::whatsThisFrom( const TQString &key )
 	}
     }
 
-    int i = menuHelpFile.find( key );
+    int i = menuHelpFile.tqfind( key );
     if ( i == -1 )
-	return TQString::null;
+	return TQString();
     int start = i;
     int end = i;
-    start = menuHelpFile.findRev( "<li>", i ) + 4;
-    end = menuHelpFile.find( '\n', i ) - 1;
+    start = menuHelpFile.tqfindRev( "<li>", i ) + 4;
+    end = menuHelpFile.tqfind( '\n', i ) - 1;
     return menuHelpFile.mid( start, end - start + 1 );
 }
 
@@ -3641,13 +3641,13 @@ void MainWindow::setSingleProject( Project *pro )
 	while ( wit.current() ) {
 	    TQWidget *w = wit.current();
 	    ++wit;
-	    if ( ::qt_cast<FormWindow*>(w) ) {
+	    if ( ::tqqt_cast<FormWindow*>(w) ) {
 		if ( ( (FormWindow*)w )->project() == pro ) {
 		    if ( ( (FormWindow*)w )->formFile()->editor() )
 			windows.removeRef( ( (FormWindow*)w )->formFile()->editor() );
 		    ( (FormWindow*)w )->formFile()->close();
 		}
-	    } else if ( ::qt_cast<SourceEditor*>(w) ) {
+	    } else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 		( (SourceEditor*)w )->close();
 	    }
 	}
@@ -3655,7 +3655,7 @@ void MainWindow::setSingleProject( Project *pro )
 	windows = qWorkspace()->windowList();
 	qWorkspace()->blockSignals( FALSE );
 	currentProject = 0;
-	updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null );
+	updateUndoRedo( FALSE, FALSE, TQString(), TQString() );
     }
 
     singleProject = TRUE;
@@ -3682,15 +3682,15 @@ void MainWindow::showGUIStuff( bool b )
 	return;
     guiStuffVisible = b;
     if ( !b ) {
-	setAppropriate( (TQDockWindow*)toolBox->parentWidget(), FALSE );
-	toolBox->parentWidget()->hide();
+	setAppropriate( (TQDockWindow*)toolBox->tqparentWidget(), FALSE );
+	toolBox->tqparentWidget()->hide();
 	for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) {
 	    tb->hide();
 	    setAppropriate( tb, FALSE );
 	}
 	propertyEditor->setPropertyEditorEnabled( FALSE );
-	setAppropriate( layoutToolBar, FALSE );
-	layoutToolBar->hide();
+	setAppropriate( tqlayoutToolBar, FALSE );
+	tqlayoutToolBar->hide();
 	setAppropriate( toolsToolBar, FALSE );
 	toolsToolBar->hide();
 	menubar->removeItem( toolsMenuId );
@@ -3706,7 +3706,7 @@ void MainWindow::showGUIStuff( bool b )
 	actionEditConnections->setEnabled( FALSE );
 	actionEditFunctions->setEnabled( FALSE );
 	actionEditAccels->setEnabled( FALSE );
-	( (TQDockWindow*)propertyEditor->parentWidget() )->
+	( (TQDockWindow*)propertyEditor->tqparentWidget() )->
 	    setCaption( i18n( "Signal Handlers" ) );
 	actionGroupNew->removeFrom( fileMenu );
 	actionGroupNew->removeFrom( projectToolBar );
@@ -3719,19 +3719,19 @@ void MainWindow::showGUIStuff( bool b )
 	actionFileSave->addTo( projectToolBar );
 	actionFileExit->addTo( fileMenu );
     } else {
-	setAppropriate( (TQDockWindow*)toolBox->parentWidget(), TRUE );
-	toolBox->parentWidget()->show();
+	setAppropriate( (TQDockWindow*)toolBox->tqparentWidget(), TRUE );
+	toolBox->tqparentWidget()->show();
 	for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) {
 	    setAppropriate( tb, TRUE );
 	    tb->hide();
 	}
 	propertyEditor->setPropertyEditorEnabled( TRUE );
-	setAppropriate( layoutToolBar, TRUE );
-	layoutToolBar->show();
+	setAppropriate( tqlayoutToolBar, TRUE );
+	tqlayoutToolBar->show();
 	setAppropriate( toolsToolBar, TRUE );
 	toolsToolBar->show();
 	menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex );
-	menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 );
+	menubar->insertItem( i18n( "&Layout" ), tqlayoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 );
 	menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) );
@@ -3743,7 +3743,7 @@ void MainWindow::showGUIStuff( bool b )
 	actionEditConnections->setEnabled( TRUE );
 	actionEditFunctions->setEnabled( TRUE );
 	actionEditAccels->setEnabled( TRUE );
-	( (TQDockWindow*)propertyEditor->parentWidget() )->
+	( (TQDockWindow*)propertyEditor->tqparentWidget() )->
 	    setCaption( i18n( "Property Editor/Signal Handlers" ) );
 	actionFileSave->removeFrom( fileMenu );
 	actionFileSave->removeFrom( projectToolBar );
diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h
index a5db52df..a33c5e25 100644
--- a/kdevdesigner/designer/mainwindow.h
+++ b/kdevdesigner/designer/mainwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,7 +43,7 @@
 #include <tqmainwindow.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqobjectlist.h>
 
 class TQToolBox;
@@ -65,10 +65,10 @@ class ReplaceDialog;
 class GotoLineDialog;
 class SourceFile;
 class FormFile;
-class QAssistantClient;
+class TQAssistantClient;
 class DesignerAction;
 
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include <tqtoolbar.h>
 #else
 class TQToolBar;
@@ -77,9 +77,10 @@ class Preferences;
 
 class KDevDesignerPart;
 
-class MainWindow : public QMainWindow
+class MainWindow : public TQMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum LineMode { Error, Step, StackFrame };
@@ -108,8 +109,8 @@ public:
     void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw );
     void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w );
 
-    TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent );
-    TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot );
+    TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent );
+    TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot );
 
     FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 );
     bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
@@ -138,7 +139,7 @@ public:
     TemplateWizardInterface* templateWizardInterface( const TQString& className );
     TQStringList sourceTemplates() const;
     SourceTemplateInterface* sourceTemplateInterface( const TQString& templ );
-    QUnknownInterface* designerInterface() const { return desInterface; }
+    TQUnknownInterface* designerInterface() const { return desInterface; }
     TQPtrList<DesignerProject> projectList() const;
     TQStringList projectNames() const;
     TQStringList projectFileNames() const;
@@ -186,7 +187,7 @@ public:
     void setPluginDirectory( const TQString &pd );
     TQString pluginDirectory() const { return pluginDir; }
 
-    QAssistantClient* assistantClient() const { return assistant; }
+    TQAssistantClient* assistantClient() const { return assistant; }
 
     void addRecentlyOpenedFile( const TQString &fn ) { addRecentlyOpened( fn, recentlyFiles ); }
 
@@ -264,8 +265,8 @@ public slots:
     SourceEditor *editSource( SourceFile *f );
     SourceEditor *openSourceEditor();
     SourceEditor *createSourceEditor( TQObject *object, Project *project,
-				      const TQString &lang = TQString::null,
-				      const TQString &func = TQString::null,
+				      const TQString &lang = TQString(),
+				      const TQString &func = TQString(),
 				      bool rereadSource = FALSE );
     void editFormSettings();
     void editProjectSettings();
@@ -291,7 +292,7 @@ public slots:
     void helpContents();
     void helpManual();
     void helpAbout();
-    void helpAboutQt();
+    void helpAboutTQt();
     void helpRegister();
 
 private slots:
@@ -374,7 +375,7 @@ private:
 	TQString title;
 	TQObject *receiver;
 	const char *init_slot, *accept_slot;
-	Q_DUMMY_COMPARISON_OPERATOR( Tab )
+	TQ_DUMMY_COMPARISON_OPERATOR( Tab )
     };
 
 private:
@@ -385,7 +386,7 @@ private:
     TQWorkspace *qworkspace;
     TQMenuBar *menubar;
     TQGuardedPtr<FormWindow> lastActiveFormWindow;
-    bool breakLayout, layoutChilds, layoutSelected;
+    bool breakLayout, tqlayoutChilds, tqlayoutSelected;
     TQPoint grd;
     bool sGrid, snGrid;
     bool restoreConfig;
@@ -405,9 +406,9 @@ private:
     TQActionGroup *actionGroupTools, *actionGroupProjects;
     TQAction* actionPointerTool, *actionConnectTool, *actionOrderTool, *actionBuddyTool;
     TQAction* actionCurrentTool;
-    DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutQt, *actionHelpWhatsThis;
+    DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutTQt, *actionHelpWhatsThis;
     DesignerAction *actionHelpManual;
-#if defined(QT_NON_COMMERCIAL)
+#if defined(TQT_NON_COMMERCIAL)
     DesignerAction *actionHelpRegister;
 #endif
     DesignerAction *actionToolsCustomWidget, *actionEditPreferences;
@@ -424,8 +425,8 @@ private:
     TQPopupMenu *rmbWidgets;
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *customWidgetMenu, *windowMenu, *fileMenu, *recentlyFilesMenu, *recentlyProjectsMenu;
-    TQPopupMenu *toolsMenu, *layoutMenu, *previewMenu;
-    TQToolBar *customWidgetToolBar, *layoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
+    TQPopupMenu *toolsMenu, *tqlayoutMenu, *previewMenu;
+    TQToolBar *customWidgetToolBar, *tqlayoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
     TQToolBar *commonWidgetsToolBar;
     TQPtrList<TQToolBar> widgetToolBars;
 
@@ -435,16 +436,16 @@ private:
     TQString templPath;
     ActionEditor *actionEditor;
     Project *currentProject;
-    QPluginManager<ActionInterface> *actionPluginManager;
-    QPluginManager<EditorInterface> *editorPluginManager;
-    QPluginManager<TemplateWizardInterface> *templateWizardPluginManager;
-    QPluginManager<InterpreterInterface> *interpreterPluginManager;
-    QPluginManager<PreferenceInterface> *preferencePluginManager;
-    QPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
-    QPluginManager<SourceTemplateInterface> *sourceTemplatePluginManager;
+    TQPluginManager<ActionInterface> *actionPluginManager;
+    TQPluginManager<EditorInterface> *editorPluginManager;
+    TQPluginManager<TemplateWizardInterface> *templateWizardPluginManager;
+    TQPluginManager<InterpreterInterface> *interpreterPluginManager;
+    TQPluginManager<PreferenceInterface> *preferencePluginManager;
+    TQPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
+    TQPluginManager<SourceTemplateInterface> *sourceTemplatePluginManager;
     TQPtrList<SourceEditor> sourceEditors;
     bool previewing;
-    QUnknownInterface *desInterface;
+    TQUnknownInterface *desInterface;
     TQStringList recentlyFiles;
     TQStringList recentlyProjects;
     OutputWindow *oWindow;
@@ -472,7 +473,7 @@ private:
     uint guiStuffVisible : 1;
     uint editorsReadOnly : 1;
     uint savePluginPaths : 1;
-    QAssistantClient *assistant;
+    TQAssistantClient *assistant;
     bool shStartDialog;
     TQString pluginDir;
     bool sSignalHandlers;
@@ -487,12 +488,13 @@ public:
 friend class KDevDesignerPart;
 };
 
-class SenderObject : public QObject
+class SenderObject : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SenderObject( QUnknownInterface *i ) : iface( i ) { iface->addRef(); }
+    SenderObject( TQUnknownInterface *i ) : iface( i ) { iface->addRef(); }
     ~SenderObject() { iface->release(); }
 
 public slots:
@@ -500,11 +502,11 @@ public slots:
     void emitAcceptSignal() { emit acceptSignal( iface ); }
 
 signals:
-    void initSignal( QUnknownInterface * );
-    void acceptSignal( QUnknownInterface * );
+    void initSignal( TQUnknownInterface * );
+    void acceptSignal( TQUnknownInterface * );
 
 private:
-    QUnknownInterface *iface;
+    TQUnknownInterface *iface;
 
 };
 
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index ebbccdad..ed4ed2bf 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -71,7 +71,7 @@
 #include "pixmapcollectioneditor.h"
 #include "styledbutton.h"
 #include "customwidgeteditorimpl.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionsimpl.h"
 #include "dbconnectionimpl.h"
 #endif
@@ -124,108 +124,108 @@ static TQIconSet createIconSet( const TQString &name )
 
 void MainWindow::setupEditActions()
 {
-    actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, this, 0 );
+    actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, TQT_TQOBJECT(this), 0 );
     actionEditUndo->setStatusTip( i18n( "Undoes the last action" ) );
     actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) );
-    connect( actionEditUndo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editUndo() ) );
+    connect( actionEditUndo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editUndo() ) );
     actionEditUndo->setEnabled( FALSE );
 
-    actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 );
+    actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, TQT_TQOBJECT(this), 0 );
     actionEditRedo->setStatusTip( i18n( "Redoes the last undone operation") );
     actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) );
-    connect( actionEditRedo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRedo() ) );
+    connect( actionEditRedo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRedo() ) );
     actionEditRedo->setEnabled( FALSE );
 
-    actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, this, 0 );
+    actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, TQT_TQOBJECT(this), 0 );
     actionEditCut->setStatusTip( i18n( "Cuts the selected widgets and puts them on the clipboard" ) );
     actionEditCut->setWhatsThis(  whatsThisFrom( "Edit|Cut" ) );
-    connect( actionEditCut, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCut() ) );
+    connect( actionEditCut, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCut() ) );
     actionEditCut->setEnabled( FALSE );
 
-    actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, this, 0 );
+    actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, TQT_TQOBJECT(this), 0 );
     actionEditCopy->setStatusTip( i18n( "Copies the selected widgets to the clipboard" ) );
     actionEditCopy->setWhatsThis(  whatsThisFrom( "Edit|Copy" ) );
-    connect( actionEditCopy, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCopy() ) );
+    connect( actionEditCopy, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCopy() ) );
     actionEditCopy->setEnabled( FALSE );
 
-    actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, this, 0 );
+    actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, TQT_TQOBJECT(this), 0 );
     actionEditPaste->setStatusTip( i18n( "Pastes the clipboard's contents" ) );
     actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) );
-    connect( actionEditPaste, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPaste() ) );
+    connect( actionEditPaste, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPaste() ) );
     actionEditPaste->setEnabled( FALSE );
 
-    actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 );
+    actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, TQT_TQOBJECT(this), 0 );
     actionEditDelete->setStatusTip( i18n( "Deletes the selected widgets" ) );
     actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) );
-    connect( actionEditDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) );
+    connect( actionEditDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) );
     actionEditDelete->setEnabled( FALSE );
-#ifdef Q_WS_MAC
-    TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 );
-    connect( macDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) );
+#ifdef TQ_WS_MAC
+    TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, TQT_TQOBJECT(this), 0 );
+    connect( macDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) );
 #endif
 
-    actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 );
+    actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, TQT_TQOBJECT(this), 0 );
     actionEditSelectAll->setStatusTip( i18n( "Selects all widgets" ) );
     actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) );
-    connect( actionEditSelectAll, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSelectAll() ) );
+    connect( actionEditSelectAll, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ) );
     actionEditSelectAll->setEnabled( TRUE );
 
-    actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, this, 0 );
+    actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditRaise->setStatusTip( i18n( "Raises the selected widgets" ) );
     actionEditRaise->setWhatsThis( i18n( "Raises the selected widgets" ) );
-    connect( actionEditRaise, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRaise() ) );
+    connect( actionEditRaise, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRaise() ) );
     actionEditRaise->setEnabled( FALSE );
 
-    actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, this, 0 );
+    actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditLower->setStatusTip( i18n( "Lowers the selected widgets" ) );
     actionEditLower->setWhatsThis( i18n( "Lowers the selected widgets" ) );
-    connect( actionEditLower, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLower() ) );
+    connect( actionEditLower, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLower() ) );
     actionEditLower->setEnabled( FALSE );
 
     actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), TQPixmap(),
-				    i18n( "Chec&k Accelerators" ), ALT + Key_R, this, 0 );
+				    i18n( "Chec&k Accelerators" ), ALT + Key_R, TQT_TQOBJECT(this), 0 );
     actionEditAccels->setStatusTip( i18n("Checks if the accelerators used in the form are unique") );
     actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) );
-    connect( actionEditAccels, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAccels() ) );
+    connect( actionEditAccels, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAccels() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditFunctions = new DesignerAction( i18n( "Slots" ), createIconSet("designer_editslots.png"),
-				   i18n( "S&lots..." ), 0, this, 0 );
+				   i18n( "S&lots..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditFunctions->setStatusTip( i18n("Opens a dialog for editing slots") );
     actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) );
-    connect( actionEditFunctions, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFunctions() ) );
+    connect( actionEditFunctions, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFunctions() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditConnections = new DesignerAction( i18n( "Connections" ), createIconSet("designer_connecttool.png"),
-					 i18n( "Co&nnections..." ), 0, this, 0 );
+					 i18n( "Co&nnections..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditConnections->setStatusTip( i18n("Opens a dialog for editing connections") );
     actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) );
-    connect( actionEditConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editConnections() ) );
+    connect( actionEditConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editConnections() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditSource = new DesignerAction( i18n( "Source" ), TQIconSet(),
-					 i18n( "&Source..." ), CTRL + Key_E, this, 0 );
+					 i18n( "&Source..." ), CTRL + Key_E, TQT_TQOBJECT(this), 0 );
     actionEditSource->setStatusTip( i18n("Opens an editor to edit the form's source code") );
     actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) );
-    connect( actionEditSource, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSource() ) );
+    connect( actionEditSource, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSource() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), TQPixmap(),
-					  i18n( "&Form Settings..." ), 0, this, 0 );
+					  i18n( "&Form Settings..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditFormSettings->setStatusTip( i18n("Opens a dialog to change the form's settings") );
     actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) );
-    connect( actionEditFormSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFormSettings() ) );
+    connect( actionEditFormSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFormSettings() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditPreferences = new DesignerAction( i18n( "Preferences" ), TQPixmap(),
-					 i18n( "Preferences..." ), 0, this, 0 );
+					 i18n( "Preferences..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditPreferences->setStatusTip( i18n("Opens a dialog to change preferences") );
     actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) );
-    connect( actionEditPreferences, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPreferences() ) );
+    connect( actionEditPreferences, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPreferences() ) );
 
 /*    TQToolBar *tb = new TQToolBar( this, "Edit" );
     tb->setCloseMode( TQDockWindow::Undocked );
-    TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").arg(i18n(toolbarHelp).arg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").tqarg(i18n(toolbarHelp).tqarg("")) );
     addToolBar( tb, i18n( "Edit" ) );
     actionEditUndo->addTo( tb );
     actionEditRedo->addTo( tb );
@@ -240,7 +240,7 @@ void MainWindow::setupEditActions()
 #endif
 
     TQPopupMenu *menu = new TQPopupMenu( this, "Edit" );
-    connect( menu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( updateEditorUndoRedo() ) );
+    connect( menu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( updateEditorUndoRedo() ) );
     menubar->insertItem( i18n( "&Edit" ), menu );
     actionEditUndo->addTo( menu );
     actionEditRedo->addTo( menu );
@@ -269,26 +269,26 @@ void MainWindow::setupEditActions()
 void MainWindow::setupSearchActions()
 {
     actionSearchFind = new DesignerAction( i18n( "Find" ), createIconSet( "designer_searchfind.png" ),
-				    i18n( "&Find..." ), CTRL + Key_F, this, 0 );
-    connect( actionSearchFind, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchFind() ) );
+				    i18n( "&Find..." ), CTRL + Key_F, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchFind, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchFind() ) );
     actionSearchFind->setEnabled( FALSE );
     actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) );
 
     actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), TQIconSet(),
-					  i18n( "Find &Incremental" ), ALT + Key_I, this, 0 );
-    connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchIncremetalFindMenu() ) );
+					  i18n( "Find &Incremental" ), ALT + Key_I, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchIncremetalFindMenu() ) );
     actionSearchIncremetal->setEnabled( FALSE );
     actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) );
 
     actionSearchReplace = new DesignerAction( i18n( "Replace" ), TQIconSet(),
-				    i18n( "&Replace..." ), CTRL + Key_R, this, 0 );
-    connect( actionSearchReplace, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchReplace() ) );
+				    i18n( "&Replace..." ), CTRL + Key_R, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchReplace, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchReplace() ) );
     actionSearchReplace->setEnabled( FALSE );
     actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) );
 
     actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), TQIconSet(),
-				    i18n( "&Goto Line..." ), ALT + Key_G, this, 0 );
-    connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchGotoLine() ) );
+				    i18n( "&Goto Line..." ), ALT + Key_G, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchGotoLine() ) );
     actionSearchGotoLine->setEnabled( FALSE );
     actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) );
 
@@ -320,92 +320,92 @@ void MainWindow::setupLayoutActions()
     if ( !actionGroupTools ) {
 	actionGroupTools = new TQActionGroup( this );
 	actionGroupTools->setExclusive( TRUE );
-	connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), this, TQT_SLOT( toolSelected(TQAction*) ) );
+	connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), TQT_TQOBJECT(this), TQT_SLOT( toolSelected(TQAction*) ) );
     }
 
     actionEditAdjustSize = new DesignerAction( i18n( "Adjust Size" ), createIconSet("designer_adjustsize.png"),
-					i18n( "Adjust &Size" ), CTRL + Key_J, this, 0 );
+					i18n( "Adjust &Size" ), CTRL + Key_J, TQT_TQOBJECT(this), 0 );
     actionEditAdjustSize->setStatusTip(i18n("Adjusts the size of the selected widget") );
     actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) );
-    connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAdjustSize() ) );
+    connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
     actionEditAdjustSize->setEnabled( FALSE );
 
-    actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"),
-				     i18n( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 );
+    actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithtqlayout.png"),
+				     i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 );
     actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") );
-    actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) );
-    connect( actionEditHLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontal() ) );
+    actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) );
+    connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
     actionEditHLayout->setEnabled( FALSE );
 
-    actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"),
-				     i18n( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 );
+    actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvtqlayout.png"),
+				     i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 );
     actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") );
-    actionEditVLayout->setWhatsThis(  whatsThisFrom( "Layout|Lay Out Vertically" ) );
-    connect( actionEditVLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVertical() ) );
+    actionEditVLayout->setWhatsThis(  whatsThisFrom( "Layout|Lay OutQt::Vertically" ) );
+    connect( actionEditVLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVertical() ) );
     actionEditVLayout->setEnabled( FALSE );
 
     actionEditGridLayout = new DesignerAction( i18n( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"),
-					i18n( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 );
+					i18n( "Lay Out in a &Grid" ), CTRL + Key_G, TQT_TQOBJECT(this), 0 );
     actionEditGridLayout->setStatusTip(i18n("Lays out the selected widgets in a grid") );
     actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) );
-    connect( actionEditGridLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutGrid() ) );
+    connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) );
     actionEditGridLayout->setEnabled( FALSE );
 
-    actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"),
-					     i18n( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 );
+    actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvtqlayoutsplit.png"),
+					     i18n( "Lay OutQt::Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") );
-    actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) );
-    connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontalSplit() ) );
+    actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally (in Splitter)" ) );
+    connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) );
     actionEditSplitHorizontal->setEnabled( FALSE );
 
-    actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"),
-					     i18n( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 );
+    actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithtqlayoutsplit.png"),
+					     i18n( "Lay OutQt::Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") );
-    actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) );
-    connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVerticalSplit() ) );
+    actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically (in Splitter)" ) );
+    connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVerticalSplit() ) );
     actionEditSplitVertical->setEnabled( FALSE );
 
     actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"),
-					 i18n( "&Break Layout" ), CTRL + Key_B, this, 0 );
-    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") );
+					 i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 );
+    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") );
     actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) );
-    connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editBreakLayout() ) );
+    connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) );
     actionEditBreakLayout->setEnabled( FALSE );
 
     int id = WidgetDatabase::idFromClassName( "Spacer" );
     actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() );
     actionInsertSpacer->setToggleAction( TRUE );
     actionInsertSpacer->setText( WidgetDatabase::className( id ) );
-    actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) );
+    actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) );
     actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) );
     actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) );
-    actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) );
+    actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) );
     actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>"
 			     "<p>Click to insert a single %3,"
 			     "or double click to keep the tool selected.")
-	.arg(WidgetDatabase::toolTip( id ))
-	.arg(WidgetDatabase::whatsThis( id ))
-	.arg(WidgetDatabase::toolTip( id ) ));
+	.tqarg(WidgetDatabase::toolTip( id ))
+	.tqarg(WidgetDatabase::whatsThis( id ))
+	.tqarg(WidgetDatabase::toolTip( id ) ));
 
     actionInsertSpacer->addTo( commonWidgetsToolBar );
     commonWidgetsPage.append( actionInsertSpacer );
     TQWidget *w;
     commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
     w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
-    TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
-    actionEditAdjustSize->addTo( layoutToolBar );
-    layoutToolBar->addSeparator();
-    actionEditHLayout->addTo( layoutToolBar );
-    actionEditVLayout->addTo( layoutToolBar );
-    actionEditGridLayout->addTo( layoutToolBar );
-    actionEditSplitHorizontal->addTo( layoutToolBar );
-    actionEditSplitVertical->addTo( layoutToolBar );
-    actionEditBreakLayout->addTo( layoutToolBar );
-    layoutToolBar->addSeparator();
-    actionInsertSpacer->addTo( layoutToolBar );
+    TQWhatsThis::add( tqlayoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+    actionEditAdjustSize->addTo( tqlayoutToolBar );
+    tqlayoutToolBar->addSeparator();
+    actionEditHLayout->addTo( tqlayoutToolBar );
+    actionEditVLayout->addTo( tqlayoutToolBar );
+    actionEditGridLayout->addTo( tqlayoutToolBar );
+    actionEditSplitHorizontal->addTo( tqlayoutToolBar );
+    actionEditSplitVertical->addTo( tqlayoutToolBar );
+    actionEditBreakLayout->addTo( tqlayoutToolBar );
+    tqlayoutToolBar->addSeparator();
+    actionInsertSpacer->addTo( tqlayoutToolBar );
 
     TQPopupMenu *menu = new TQPopupMenu( this, "Layout" );
-    layoutMenu = menu;
+    tqlayoutMenu = menu;
     menubar->insertItem( i18n( "&Layout" ), menu, toolsMenuId + 1 );
     actionEditAdjustSize->addTo( menu );
     menu->insertSeparator();
@@ -461,7 +461,7 @@ void MainWindow::setupToolActions()
     TQToolBar *tb = new TQToolBar( this, "Tools" );
     tb->setCloseMode( TQDockWindow::Undocked );
     toolsToolBar = tb;
-    TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
 
     addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE );
     actionPointerTool->addTo( tb );
@@ -487,7 +487,7 @@ void MainWindow::setupToolActions()
 
     actionToolsCustomWidget = new DesignerAction( i18n("Custom Widgets"),
 					   createIconSet( "designer_customwidget.png" ),
-					   i18n("Edit &Custom Widgets..."), 0, this, 0 );
+					   i18n("Edit &Custom Widgets..."), 0, TQT_TQOBJECT(this), 0 );
     actionToolsCustomWidget->setStatusTip( i18n("Opens a dialog to add and change "
 					      "custom widgets") );
     actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom"
@@ -505,13 +505,13 @@ void MainWindow::setupToolActions()
 	widgetToolBars.append( tb );
 	bool plural = grp[(int)grp.length()-1] == 's';
 	if ( plural ) {
-	    TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
-				arg( i18n(" Click on a button to insert a single widget, "
-				"or double click to insert multiple %1.") ).arg(grp)) );
+	    TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp).
+				tqarg( i18n(" Click on a button to insert a single widget, "
+				"or double click to insert multiple %1.") ).tqarg(grp)) );
 	} else {
-	    TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
-				arg( i18n(" Click on a button to insert a single %1 widget, "
-				"or double click to insert multiple widgets.") ).arg(grp)) );
+	    TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp).
+				tqarg( i18n(" Click on a button to insert a single %1 widget, "
+				"or double click to insert multiple widgets.") ).tqarg(grp)) );
 	}
 	addToolBar( tb, grp );
 	tb->hide();
@@ -552,11 +552,11 @@ void MainWindow::setupToolActions()
 	    a->setToolTip( ttip );
 	    if ( !WidgetDatabase::isWhatsThisLoaded() )
 		WidgetDatabase::loadWhatsThis( documentationPath() );
-	    a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) );
+	    a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) );
 
-	    TQString whats = i18n("<b>A %1</b>").arg( WidgetDatabase::className( i ) );
+	    TQString whats = i18n("<b>A %1</b>").tqarg( WidgetDatabase::className( i ) );
 	    if ( !WidgetDatabase::whatsThis( i ).isEmpty() )
-	    whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis( i ));
+	    whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis( i ));
 	    a->setWhatsThis( whats+ i18n("<p>Double click on this tool to keep it selected.</p>") );
 
 	    if ( grp != "KDE" )
@@ -602,10 +602,10 @@ void MainWindow::setupToolActions()
 	customWidgetToolBar2 = tb2;
     }
 
-    TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this );
+    TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, TQT_TQOBJECT(this) );
     a->setStatusTip( i18n( "Opens a dialog to configure the common "
 					       "widgets page of the toolbox") );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( toolsConfigure() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( toolsConfigure() ) );
     mmenu->insertSeparator();
     a->addTo( mmenu );
     resetTool();
@@ -617,7 +617,7 @@ void MainWindow::setupFileActions()
     tb->setCloseMode( TQDockWindow::Undocked );
     projectToolBar = tb;
 
-    TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
     addToolBar( tb, i18n( "File" ) );
     fileMenu = new TQPopupMenu( this, "File" );
     menubar->insertItem( i18n( "&File" ), fileMenu );
@@ -625,7 +625,7 @@ void MainWindow::setupFileActions()
     DesignerAction *a = 0;
 
     if ( !singleProject ) {
-	DesignerAction *a = new DesignerAction( this, 0 );
+	DesignerAction *a = new DesignerAction( TQT_TQOBJECT(this), 0 );
 	a->setText( i18n( "New" ) );
 	a->setToolTip( i18n( "New dialog or file" ) );
 	a->setMenuText( i18n( "&New..." ) );
@@ -633,7 +633,7 @@ void MainWindow::setupFileActions()
 	a->setAccel( CTRL + Key_N );
 	a->setStatusTip( i18n( "Creates a new project, form or source file." ) );
 	a->setWhatsThis( whatsThisFrom( "File|New" ) );
-	connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNew() ) );
+	connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNew() ) );
 	a->addTo( tb );
 	a->addTo( fileMenu );
 	actionNewFile = a;
@@ -653,15 +653,15 @@ void MainWindow::setupFileActions()
 	newForm->setIconSet( createIconSet("designer_form.png") );
 	newForm->setAccel( CTRL + Key_N );
 	newForm->setStatusTip( i18n( "Creates a new dialog." ) );
-	connect( newForm, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewDialog() ) );
+	connect( newForm, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewDialog() ) );
 
-	DesignerAction *newFile = new DesignerAction( a, 0 );
+	DesignerAction *newFile = new DesignerAction( TQT_TQOBJECT(a), 0 );
 	newFile->setText( i18n( "New File" ) );
 	newFile->setMenuText( i18n( "&File..." ) );
 	newFile->setIconSet( createIconSet("designer_filenew.png") );
 	newFile->setAccel( ALT + Key_N );
 	newFile->setStatusTip( i18n( "Creates a new file." ) );
-	connect( newFile, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewFile() ) );
+	connect( newFile, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewFile() ) );
 	actionNewFile = newFile;
 
 	a->addTo( tb );
@@ -670,14 +670,14 @@ void MainWindow::setupFileActions()
 	fileMenu->insertSeparator();
     }
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     a->setText( i18n( "Open" ) );
     a->setMenuText( i18n( "&Open..." ) );
     a->setIconSet( createIconSet("designer_fileopen.png") );
     a->setAccel( CTRL + Key_O );
     a->setStatusTip( i18n( "Opens an existing project, form or source file ") );
     a->setWhatsThis( whatsThisFrom( "File|Open" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileOpen() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileOpen() ) );
     if ( !singleProject ) {
 	a->addTo( tb );
 	a->addTo( fileMenu );
@@ -685,20 +685,20 @@ void MainWindow::setupFileActions()
     }
 
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileClose = a;
     a->setText( i18n( "Close" ) );
     a->setMenuText( i18n( "&Close" ) );
     a->setStatusTip( i18n( "Closes the current project or document" ) );
     a->setWhatsThis(whatsThisFrom( "File|Close" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileClose() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileClose() ) );
     connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject ) {
 	a->addTo( fileMenu );
 	fileMenu->insertSeparator();
     }
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileSave = a;
     a->setText( i18n( "Save" ) );
     a->setMenuText( i18n( "&Save" ) );
@@ -706,41 +706,41 @@ void MainWindow::setupFileActions()
     a->setAccel( CTRL + Key_S );
     a->setStatusTip( i18n( "Saves the current project or document" ) );
     a->setWhatsThis(whatsThisFrom( "File|Save" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSave() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSave() ) );
     connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     a->addTo( tb );
     a->addTo( fileMenu );
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileSaveAs = a;
     a->setText( i18n( "Save As" ) );
     a->setMenuText( i18n( "Save &As..." ) );
     a->setStatusTip( i18n( "Saves the current form with a new filename" ) );
     a->setWhatsThis( whatsThisFrom( "File|Save As" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAs() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAs() ) );
     connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject )
 	a->addTo( fileMenu );
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileSaveAll = a;
     a->setText( i18n( "Save All" ) );
     a->setMenuText( i18n( "Sa&ve All" ) );
     a->setStatusTip( i18n( "Saves all open documents" ) );
     a->setWhatsThis( whatsThisFrom( "File|Save All" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAll() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAll() ) );
     connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject ) {
 	a->addTo( fileMenu );
 	fileMenu->insertSeparator();
     }
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     a->setText( i18n( "Create Template" ) );
     a->setMenuText( i18n( "Create &Template..." ) );
     a->setStatusTip( i18n( "Creates a new template" ) );
     a->setWhatsThis( whatsThisFrom( "File|Create Template" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileCreateTemplate() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileCreateTemplate() ) );
     if ( !singleProject )
 	a->addTo( fileMenu );
 
@@ -767,7 +767,7 @@ void MainWindow::setupFileActions()
     if ( !singleProject )
 	fileMenu->insertSeparator();
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileExit = a;
     if  ( !singleProjectMode() ) {
 	a->setText( i18n( "Exit" ) );
@@ -778,7 +778,7 @@ void MainWindow::setupFileActions()
 	a->setText( i18n( "Close" ) );
 	a->setMenuText( i18n( "&Close" ) );
     }
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileQuit() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileQuit() ) );
     a->addTo( fileMenu );
 }
 
@@ -792,8 +792,8 @@ void MainWindow::setupProjectActions()
     ag->setMenuText( i18n( "Active Project" ) );
     ag->setExclusive( TRUE );
     ag->setUsesDropDown( TRUE );
-    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SLOT( projectSelected( TQAction * ) ) );
-    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SIGNAL( projectChanged() ) );
+    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SLOT( projectSelected( TQAction * ) ) );
+    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SIGNAL( projectChanged() ) );
     DesignerAction *a = new DesignerAction( i18n( "<No Project>" ), i18n( "<No Project>" ), 0, ag, 0, TRUE );
     eProject = new Project( "", i18n( "<No Project>" ), projectSettingsPluginManager, TRUE );
     projects.insert( a, eProject );
@@ -805,31 +805,31 @@ void MainWindow::setupProjectActions()
     if ( !singleProject )
 	projectMenu->insertSeparator();
 
-    a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, this, 0 );
+    a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, TQT_TQOBJECT(this), 0 );
     actionProjectAddFile = a;
     a->setStatusTip( i18n("Adds a file to the current project") );
     a->setWhatsThis( whatsThisFrom( "Project|Add File" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( projectInsertFile() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( projectInsertFile() ) );
     a->setEnabled( FALSE );
     connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject )
 	a->addTo( projectMenu );
 
     actionEditPixmapCollection = new DesignerAction( i18n( "Image Collection..." ), TQPixmap(),
-					  i18n( "&Image Collection..." ), 0, this, 0 );
+					  i18n( "&Image Collection..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditPixmapCollection->setStatusTip( i18n("Opens a dialog for editing the current project's image collection") );
     actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) );
-    connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPixmapCollection() ) );
+    connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPixmapCollection() ) );
     actionEditPixmapCollection->setEnabled( FALSE );
     connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQT_SLOT( setEnabled(bool) ) );
     actionEditPixmapCollection->addTo( projectMenu );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     actionEditDatabaseConnections = new DesignerAction( i18n( "Database Connections..." ), TQPixmap(),
-						 i18n( "&Database Connections..." ), 0, this, 0 );
+						 i18n( "&Database Connections..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditDatabaseConnections->setStatusTip( i18n("Opens a dialog for editing the current project's database connections") );
     actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) );
-    connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDatabaseConnections() ) );
+    connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDatabaseConnections() ) );
     //actionEditDatabaseConnections->setEnabled( FALSE );
     //connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject )
@@ -837,10 +837,10 @@ void MainWindow::setupProjectActions()
 #endif
 
     actionEditProjectSettings = new DesignerAction( i18n( "Project Settings..." ), TQPixmap(),
-					  i18n( "&Project Settings..." ), 0, this, 0 );
+					  i18n( "&Project Settings..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditProjectSettings->setStatusTip( i18n("Opens a dialog to change the project's settings") );
     actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) );
-    connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editProjectSettings() ) );
+    connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editProjectSettings() ) );
     actionEditProjectSettings->setEnabled( FALSE );
     connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQT_SLOT( setEnabled(bool) ) );
     actionEditProjectSettings->addTo( projectMenu );
@@ -851,22 +851,22 @@ void MainWindow::setupPreviewActions()
 {
     DesignerAction* a = 0;
     TQPopupMenu *menu = new TQPopupMenu( this, "Preview" );
-    layoutMenu = menu;
+    tqlayoutMenu = menu;
     menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 );
 
-    a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, this, 0 );
+    a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, TQT_TQOBJECT(this), 0 );
     actionPreview = a;
     a->setAccel( CTRL + Key_T );
     a->setStatusTip( i18n("Opens a preview") );
     a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( previewForm() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( previewForm() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     a->addTo( menu );
 
     menu->insertSeparator();
 
-    TQSignalMapper *mapper = new TQSignalMapper( this );
-    connect( mapper, TQT_SIGNAL(mapped(const TQString&)), this, TQT_SLOT(previewForm(const TQString&)) );
+    TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+    connect( mapper, TQT_SIGNAL(mapped(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(previewForm(const TQString&)) );
     TQStringList styles = TQStyleFactory::keys();
     for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
 	TQString info;
@@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions()
 	else if ( *it == "MotifPlus" )
 	    info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." );
 
-	a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(),
-					 i18n( "... in %1 Style" ).arg( *it ), 0, this, 0 );
-	a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) );
+	a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(),
+					 i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 );
+	a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) );
 	a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>"
 			"<p>Use the preview to test the design and "
-			"signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) );
+			"signal-slot connections of the current form. %2</p>").tqarg( *it ).tqarg( info ) );
 	mapper->setMapping( a, *it );
 	connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
@@ -902,31 +902,31 @@ void MainWindow::setupWindowActions()
     if ( !windowActionsSetup ) {
 	windowActionsSetup = TRUE;
 */
-	actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, this );
+	actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, TQT_TQOBJECT(this) );
 	actionWindowTile->setStatusTip( i18n("Tiles the windows so that they are all visible") );
 	actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) );
 	connect( actionWindowTile, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( tile() ) );
-	actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, this );
+	actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, TQT_TQOBJECT(this) );
 	actionWindowCascade->setStatusTip( i18n("Cascades the windows so that all their title bars are visible") );
 	actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) );
 	connect( actionWindowCascade, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( cascade() ) );
 
-	actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, this );
+	actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, TQT_TQOBJECT(this) );
 	actionWindowClose->setStatusTip( i18n( "Closes the active window") );
 	actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) );
 	connect( actionWindowClose, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeActiveWindow() ) );
 
-	actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, this );
+	actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, TQT_TQOBJECT(this) );
 	actionWindowCloseAll->setStatusTip( i18n( "Closes all form windows") );
 	actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) );
 	connect( actionWindowCloseAll, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeAllWindows() ) );
 
-	actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, this );
+	actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, TQT_TQOBJECT(this) );
 	actionWindowNext->setStatusTip( i18n( "Activates the next window" ) );
 	actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) );
 	connect( actionWindowNext, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activateNextWindow() ) );
 
-	actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, this );
+	actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(this) );
 	actionWindowPrevious->setStatusTip( i18n( "Activates the previous window" ) );
 	actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) );
 	connect( actionWindowPrevious, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activatePreviousWindow() ) );
@@ -958,20 +958,20 @@ void MainWindow::setupWindowActions()
     int j = 0;
     for ( int i = 0; i < int( windows.count() ); ++i ) {
 	TQWidget *w = windows.at( i );
-	if ( !::qt_cast<FormWindow*>(w) && !::qt_cast<SourceEditor*>(w) )
+	if ( !::tqqt_cast<FormWindow*>(w) && !::tqqt_cast<SourceEditor*>(w) )
 	    continue;
-	if ( ::qt_cast<FormWindow*>(w) && ( ( (FormWindow*)w )->isFake() ) )
+	if ( ::tqqt_cast<FormWindow*>(w) && ( ( (FormWindow*)w )->isFake() ) )
 	    continue;
 	j++;
 	TQString itemText;
 	if ( j < 10 )
-	    itemText = TQString("&%1 ").arg( j );
-	if ( ::qt_cast<FormWindow*>(w) )
+	    itemText = TQString("&%1 ").tqarg( j );
+	if ( ::tqqt_cast<FormWindow*>(w) )
 	    itemText += w->name();
 	else
 	    itemText += w->caption();
 
-	int id = windowMenu->insertItem( itemText, this, TQT_SLOT( windowsMenuActivated( int ) ) );
+	int id = windowMenu->insertItem( itemText, TQT_TQOBJECT(this), TQT_SLOT( windowsMenuActivated( int ) ) );
 	windowMenu->setItemParameter( id, i );
 	windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) );
     }
@@ -979,43 +979,43 @@ void MainWindow::setupWindowActions()
 
 void MainWindow::setupHelpActions()
 {
-    actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, this, 0 );
+    actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, TQT_TQOBJECT(this), 0 );
     actionHelpContents->setStatusTip( i18n("Opens the online help") );
     actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) );
-    connect( actionHelpContents, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpContents() ) );
+    connect( actionHelpContents, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpContents() ) );
 
-    actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, this, 0 );
-    actionHelpManual->setStatusTip( i18n("Opens the Qt Designer manual") );
+    actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, TQT_TQOBJECT(this), 0 );
+    actionHelpManual->setStatusTip( i18n("Opens the TQt Designer manual") );
     actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) );
-    connect( actionHelpManual, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpManual() ) );
+    connect( actionHelpManual, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpManual() ) );
 
-    actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, this, 0 );
-    actionHelpAbout->setStatusTip( i18n("Displays information about Qt Designer") );
+    actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, TQT_TQOBJECT(this), 0 );
+    actionHelpAbout->setStatusTip( i18n("Displays information about TQt Designer") );
     actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) );
-    connect( actionHelpAbout, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAbout() ) );
+    connect( actionHelpAbout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAbout() ) );
 
-    actionHelpAboutQt = new DesignerAction( i18n("About Qt"), TQPixmap(), i18n("About &Qt"), 0, this, 0 );
-    actionHelpAboutQt->setStatusTip( i18n("Displays information about the Qt Toolkit") );
-    actionHelpAboutQt->setWhatsThis( whatsThisFrom( "Help|About Qt" ) );
-    connect( actionHelpAboutQt, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAboutQt() ) );
+    actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, TQT_TQOBJECT(this), 0 );
+    actionHelpAboutTQt->setStatusTip( i18n("Displays information about the TQt Toolkit") );
+    actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) );
+    connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAboutTQt() ) );
 
-#if 0 //defined(QT_NON_COMMERCIAL)
+#if 0 //defined(TQT_NON_COMMERCIAL)
     // ### not used anymore -- should be deleted?
-    actionHelpRegister = new DesignerAction( i18n("Register Qt"), TQPixmap(), i18n("&Register Qt..."), 0, this, 0 );
+    actionHelpRegister = new DesignerAction( i18n("Register TQt"), TQPixmap(), i18n("&Register TQt..."), 0, TQT_TQOBJECT(this), 0 );
     actionHelpRegister->setStatusTip( i18n("Opens a web browser at the evaluation form on www.trolltech.com") );
     actionHelpRegister->setWhatsThis( i18n("Register with Trolltech") );
-    connect( actionHelpRegister, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpRegister() ) );
+    connect( actionHelpRegister, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpRegister() ) );
 #endif
 
     actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ),
-				       i18n("What's This?"), SHIFT + Key_F1, this, 0 );
+				       i18n("What's This?"), SHIFT + Key_F1, TQT_TQOBJECT(this), 0 );
     actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") );
     actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) );
-    connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), this, TQT_SLOT( whatsThis() ) );
+    connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( whatsThis() ) );
 
 /*    TQToolBar *tb = new TQToolBar( this, "Help" );
     tb->setCloseMode( TQDockWindow::Undocked );
-    TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("") ));
+    TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("") ));
     addToolBar( tb, i18n( "Help" ) );
     actionHelpWhatsThis->addTo( tb );*/
 
@@ -1026,8 +1026,8 @@ void MainWindow::setupHelpActions()
     actionHelpManual->addTo( menu );
     menu->insertSeparator();
     actionHelpAbout->addTo( menu );
-    actionHelpAboutQt->addTo( menu );
-#if 0 //defined(QT_NON_COMMERCIAL)
+    actionHelpAboutTQt->addTo( menu );
+#if 0 //defined(TQT_NON_COMMERCIAL)
     // ### not used anymore -- should be deleted?
     actionHelpRegister->addTo( menu );
 #endif
@@ -1057,13 +1057,13 @@ void MainWindow::fileNewDialog()
     currentProject->setModified( TRUE );
     workspace()->update();
     fw->setProject( currentProject );
-    MetaDataBase::addEntry( fw );
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() );
+    MetaDataBase::addEntry( TQT_TQOBJECT(fw) );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() );
     fw->setMainContainer( w );
     fw->setCaption( n );
     fw->resize( 600, 480 );
     insertFormWindow( fw );
-    fw->killAccels( fw );
+    fw->killAccels( TQT_TQOBJECT(fw) );
     fw->project()->setModified( TRUE );
     fw->setFocus();
     fw->setSavePixmapInProject( TRUE );
@@ -1072,7 +1072,7 @@ void MainWindow::fileNewDialog()
 
 void MainWindow::fileNewFile()
 {
-    TQString name = QInputDialog::getText( i18n( "Name of File" ), i18n( "Enter the name of the new source file:" ) );
+    TQString name = TQInputDialog::getText( i18n( "Name of File" ), i18n( "Enter the name of the new source file:" ) );
     if ( name.isEmpty() )
 	return;
     if ( name.right( 3 ) != ".qs" )
@@ -1088,7 +1088,7 @@ void MainWindow::fileQuit()
 {
     close();
     if ( !singleProjectMode() )
-	qApp->closeAllWindows();
+	tqApp->closeAllWindows();
 }
 
 void MainWindow::fileClose()
@@ -1098,9 +1098,9 @@ void MainWindow::fileClose()
     } else {
 	TQWidget *w = qworkspace->activeWindow();
 	if ( w ) {
-	    if ( ::qt_cast<FormWindow*>(w) )
+	    if ( ::tqqt_cast<FormWindow*>(w) )
 		( (FormWindow*)w )->formFile()->close();
-	    else if ( ::qt_cast<SourceEditor*>(w) )
+	    else if ( ::tqqt_cast<SourceEditor*>(w) )
 		( (SourceEditor*)w )->close();
 	}
     }
@@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject()
     if ( a ) {
 	if ( pro->isModified() ) {
 	    switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
-					   i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
+					   i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
 					   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
 	    case 0: // save
 		pro->save();
@@ -1145,14 +1145,14 @@ void MainWindow::fileCloseProject()
 	while ( wit.current() ) {
 	    TQWidget *w = wit.current();
 	    ++wit;
-	    if ( ::qt_cast<FormWindow*>(w) ) {
+	    if ( ::tqqt_cast<FormWindow*>(w) ) {
 		if ( ( (FormWindow*)w )->project() == pro ) {
 		    if ( ( (FormWindow*)w )->formFile()->editor() )
 			windows.removeRef( ( (FormWindow*)w )->formFile()->editor() );
 		    if ( !( (FormWindow*)w )->formFile()->close() )
 			return;
 		}
-	    } else if ( ::qt_cast<SourceEditor*>(w) ) {
+	    } else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 		if ( !( (SourceEditor*)w )->close() )
 		    return;
 	    }
@@ -1166,11 +1166,11 @@ void MainWindow::fileCloseProject()
 	currentProject = 0;
 	if ( lastValid ) {
 	    projectSelected( lastValid );
-	    statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) );
+	    statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) );
 	}
 	if ( !windows.isEmpty() ) {
 	    for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-		if ( !::qt_cast<FormWindow*>(w) )
+		if ( !::tqqt_cast<FormWindow*>(w) )
 		    continue;
 		w->setFocus();
 		activeWindowChanged( w );
@@ -1179,7 +1179,7 @@ void MainWindow::fileCloseProject()
 	} else {
 	    emit hasActiveWindow( FALSE );
 	    emit hasActiveForm( FALSE );
-	    updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null );
+	    updateUndoRedo( FALSE, FALSE, TQString(), TQString() );
 	}
     }
 }
@@ -1198,7 +1198,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 {
     statusMessage( i18n( "Open a file...") );
 
-    QPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(), pluginDirectory() );
+    TQPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(), pluginDirectory() );
 
     Project* project = inProject ? currentProject : eProject;
 
@@ -1209,9 +1209,9 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 	if ( filter.isEmpty() ) {
 	    if ( !inProject )
 		filterlist << i18n( "*.ui *.pro|Designer Files" );
-	    filterlist << i18n( "*.ui|Qt User-Interface Files" );
+	    filterlist << i18n( "*.ui|TQt User-Interface Files" );
 	    if ( !inProject )
-		filterlist << i18n( "*.pro|QMAKE Project Files" );
+		filterlist << i18n( "*.pro|TQMAKE Project Files" );
 	    TQStringList list = manager.featureList();
 	    for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
 		filterlist << *it;
@@ -1230,11 +1230,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 	TQStringList filenames;
 	if ( fn.isEmpty() ) {
 	    if ( !inProject ) {
-		TQString f = KFileDialog::getOpenFileName( TQString::null, filters, this, /*0,*/
+		TQString f = KFileDialog::getOpenFileName( TQString(), filters, this, /*0,*/
 							  i18n("Open" )/*, &lastOpenFilter */);
 		filenames << f;
 	    } else {
-		filenames = KFileDialog::getOpenFileNames( TQString::null, filters, this, /*0,*/
+		filenames = KFileDialog::getOpenFileNames( TQString(), filters, this, /*0,*/
 							   i18n("Add")/*, &lastOpenFilter */);
 	    }
 	} else {
@@ -1246,16 +1246,16 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 	    if ( !filename.isEmpty() ) {
 		TQFileInfo fi( filename );
 
-		if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) {
+		if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.tqfind( ";pro" ) != -1 ) ) {
 		    addRecentlyOpened( filename, recentlyProjects );
 		    openProject( filename );
-		} else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) {
+		} else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.tqfind( ";ui" ) != -1 ) ) {
 		    if ( !inProject )
 			setCurrentProject( eProject );
 		    openFormWindow( filename );
 		    addRecentlyOpened( filename, recentlyFiles );
-		} else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 ||
-			    additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) {
+		} else if ( !extension.isEmpty() && extension.tqfind( ";" + fi.extension( FALSE ) ) != -1 ||
+			    additionalSources.tqfind( fi.extension( FALSE ) ) != additionalSources.end() ) {
 		    SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) );
 		    if ( !sf )
 			sf = new SourceFile( project->makeRelative( filename ), FALSE, project );
@@ -1263,7 +1263,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 		} else if ( extension.isEmpty() ) {
 		    TQString filter;
 		    for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) {
-			if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) {
+			if ( (*it2).tqcontains( "." + fi.extension( FALSE ), FALSE ) ) {
 			    filter = *it2;
 			    break;
 			}
@@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 					      arg( filename )/*, 3000*/ );
 			return;
 		    }
-		    statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) );
+		    statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) );
 		    TQStringList list = iface->import( filter, filename );
 		    iface->release();
 		    if ( list.isEmpty() ) {
-			statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ );
+			statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ );
 			return;
 		    }
 		    if ( !inProject )
@@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
 	return formWindow();
     }
 
-    statusMessage( i18n( "Reading file '%1'...").arg( filename ) );
+    statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) );
     FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) );
     if ( ff2 && ff2->formWindow() ) {
 	ff2->formWindow()->setFocus();
@@ -1334,14 +1334,14 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
 	ff = new FormFile( currentProject->makeRelative( filename ), FALSE, currentProject );
     bool b = resource.load( ff ) && (FormWindow*)resource.widget();
     if ( !validFileName && resource.widget() )
-	( (FormWindow*)resource.widget() )->setFileName( TQString::null );
+	( (FormWindow*)resource.widget() )->setFileName( TQString() );
     TQApplication::restoreOverrideCursor();
     if ( b ) {
 	rebuildCustomWidgetGUI();
-	statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */);
+	statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */);
     } else {
-	statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */);
-	TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) );
+	statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */);
+	TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) );
 	delete ff;
     }
     return (FormWindow*)resource.widget();
@@ -1358,7 +1358,7 @@ bool MainWindow::fileSave()
 bool MainWindow::fileSaveForm()
 {
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
-	if ( e->object() == formWindow() || e == qWorkspace()->activeWindow() ) {
+	if ( TQT_BASE_OBJECT(e->object()) == formWindow() || e == qWorkspace()->activeWindow() ) {
 	    e->save();
 	}
     }
@@ -1367,7 +1367,7 @@ bool MainWindow::fileSaveForm()
 
     TQWidget *w = qWorkspace()->activeWindow();
     if ( w ) {
-	if ( ::qt_cast<SourceEditor*>(w) ) {
+	if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    SourceEditor *se = (SourceEditor*)w;
 	    if ( se->formWindow() )
 		fw = se->formWindow();
@@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm()
 bool MainWindow::fileSaveProject()
 {
     currentProject->save();
-    statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */);
+    statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */);
     return TRUE;
 }
 
@@ -1400,9 +1400,9 @@ bool MainWindow::fileSaveAs()
     TQWidget *w = qworkspace->activeWindow();
     if ( !w )
 	return TRUE;
-    if ( ::qt_cast<FormWindow*>(w) )
+    if ( ::tqqt_cast<FormWindow*>(w) )
 	return ( (FormWindow*)w )->formFile()->saveAs();
-    else if ( ::qt_cast<SourceEditor*>(w) )
+    else if ( ::tqqt_cast<SourceEditor*>(w) )
 	return ( (SourceEditor*)w )->saveAs();
     return FALSE;
 }
@@ -1425,7 +1425,7 @@ void MainWindow::fileCreateTemplate()
     }
     for ( i = 0; i < WidgetDatabase::count(); ++i ) {
 	if ( WidgetDatabase::isContainer( i ) && !WidgetDatabase::isForm(i) &&
-	     WidgetDatabase::className( i ) != "TQTabWidget" && WidgetDatabase::group( i ) != "Temp" ) {
+	     WidgetDatabase::className( i ) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::group( i ) != "Temp" ) {
 	    dia.listClass->insertItem( WidgetDatabase::className( i ) );
 	}
     }
@@ -1444,7 +1444,7 @@ void MainWindow::fileCreateTemplate()
 
 void MainWindow::createNewTemplate()
 {
-    CreateTemplate *dia = (CreateTemplate*)sender()->parent();
+    CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent();
     TQString fn = dia->editName->text();
     TQString cn = dia->listClass->currentText();
     if ( fn.isEmpty() || cn.isEmpty() ) {
@@ -1453,7 +1453,7 @@ void MainWindow::createNewTemplate()
     }
 
     TQStringList templRoots;
-    const char *qtdir = getenv( "QTDIR" );
+    const char *qtdir = getenv( "TQTDIR" );
     if(qtdir)
 	templRoots << qtdir;
     templRoots << qInstallPathData();
@@ -1482,7 +1482,7 @@ void MainWindow::createNewTemplate()
     ts << "    <cstring>" << cn << "Form</cstring>" << endl;
     ts << "</property>" << endl;
     ts << "<property stdset=\"1\">" << endl;
-    ts << "    <name>geometry</name>" << endl;
+    ts << "    <name>tqgeometry</name>" << endl;
     ts << "    <rect>" << endl;
     ts << "        <width>300</width>" << endl;
     ts << "        <height>400</height>" << endl;
@@ -1499,7 +1499,7 @@ void MainWindow::createNewTemplate()
 void MainWindow::editUndo()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editUndo();
 	return;
     }
@@ -1510,7 +1510,7 @@ void MainWindow::editUndo()
 void MainWindow::editRedo()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editRedo();
 	return;
     }
@@ -1521,7 +1521,7 @@ void MainWindow::editRedo()
 void MainWindow::editCut()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editCut();
 	return;
     }
@@ -1532,18 +1532,18 @@ void MainWindow::editCut()
 void MainWindow::editCopy()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editCopy();
 	return;
     }
     if ( formWindow() )
-	qApp->clipboard()->setText( formWindow()->copy() );
+	tqApp->clipboard()->setText( formWindow()->copy() );
 }
 
 void MainWindow::editPaste()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editPaste();
 	return;
     }
@@ -1554,20 +1554,20 @@ void MainWindow::editPaste()
     TQWidgetList l( formWindow()->selectedWidgets() );
     if ( l.count() == 1 ) {
 	w = l.first();
-	if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	     ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) &&
+	if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	     ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) &&
 	       w != formWindow()->mainContainer() ) )
 	    w = formWindow()->mainContainer();
     }
 
-    if ( w && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
-	formWindow()->paste( qApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) );
+    if ( w && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
+	formWindow()->paste( tqApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) );
 	hierarchyView->widgetInserted( 0 );
 	formWindow()->commandHistory()->setModified( TRUE );
     } else {
 	TQMessageBox::information( this, i18n( "Paste Error" ),
 				  i18n( "Cannot paste widgets. Designer could not find a container\n"
-				      "to paste into which does not contain a layout. Break the layout\n"
+				      "to paste into which does not contain a tqlayout. Break the tqlayout\n"
 				      "of the container you want to paste into and select this container\n"
 				      "and then paste again." ) );
     }
@@ -1582,7 +1582,7 @@ void MainWindow::editDelete()
 void MainWindow::editSelectAll()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editSelectAll();
 	return;
     }
@@ -1611,42 +1611,42 @@ void MainWindow::editAdjustSize()
 
 void MainWindow::editLayoutHorizontal()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	editLayoutContainerHorizontal();
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutHorizontal();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutHorizontal();
 }
 
 void MainWindow::editLayoutVertical()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	editLayoutContainerVertical();
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutVertical();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutVertical();
 }
 
 void MainWindow::editLayoutHorizontalSplit()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	; // no way to do that
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutHorizontalSplit();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutHorizontalSplit();
 }
 
 void MainWindow::editLayoutVerticalSplit()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	; // no way to do that
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutVerticalSplit();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutVerticalSplit();
 }
 
 void MainWindow::editLayoutGrid()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	editLayoutContainerGrid();
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutGrid();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutGrid();
 }
 
 void MainWindow::editLayoutContainerVertical()
@@ -1658,7 +1658,7 @@ void MainWindow::editLayoutContainerVertical()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->layoutVerticalContainer( w  );
+	formWindow()->tqlayoutVerticalContainer( w  );
 }
 
 void MainWindow::editLayoutContainerHorizontal()
@@ -1670,7 +1670,7 @@ void MainWindow::editLayoutContainerHorizontal()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->layoutHorizontalContainer( w );
+	formWindow()->tqlayoutHorizontalContainer( w );
 }
 
 void MainWindow::editLayoutContainerGrid()
@@ -1682,7 +1682,7 @@ void MainWindow::editLayoutContainerGrid()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->layoutGridContainer( w  );
+	formWindow()->tqlayoutGridContainer( w  );
 }
 
 void MainWindow::editBreakLayout()
@@ -1692,15 +1692,15 @@ void MainWindow::editBreakLayout()
     TQWidget *w = formWindow()->mainContainer();
     if ( formWindow()->currentWidget() )
 	w = formWindow()->currentWidget();
-    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
+    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
 	formWindow()->breakLayout( w );
 	return;
     } else {
 	TQWidgetList widgets = formWindow()->selectedWidgets();
 	for ( w = widgets.first(); w; w = widgets.next() ) {
-	    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-		 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+		 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 		break;
 	}
 	if ( w ) {
@@ -1710,8 +1710,8 @@ void MainWindow::editBreakLayout()
     }
 
     w = formWindow()->mainContainer();
-    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	formWindow()->breakLayout( w );
 }
 
@@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor()
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static Qt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return 0;
     }
 
@@ -1774,7 +1774,7 @@ SourceEditor *MainWindow::openSourceEditor()
     }
 
     if ( !editor )
-	editor = createSourceEditor( formWindow(), formWindow()->project(), lang );
+editor = createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang );
     return editor;
 }
 
@@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f )
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static Qt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return 0;
     }
 
@@ -1859,7 +1859,7 @@ void MainWindow::editPixmapCollection()
 
 void MainWindow::editDatabaseConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnectionsEditor dia( currentProject, this, 0, TRUE );
     dia.exec();
 #endif
@@ -1905,10 +1905,10 @@ void MainWindow::editPreferences()
 	dia->tabWidget->addTab( t.w, t.title );
 	if ( t.receiver ) {
 	    connect( dia->buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) );
-	    connect( senderObject, TQT_SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot );
-	    connect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot );
+	    connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	    senderObject->emitInitSignal();
-	    disconnect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	}
     }
 
@@ -1921,7 +1921,7 @@ void MainWindow::editPreferences()
 	setUsesTextLabel( dia->checkBoxTextLabels->isChecked() );
 	if (dia->textEditPluginPaths->isModified()) {
 	    pluginPaths = dia->textEditPluginPaths->text();
-	    TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths));
+	    TQApplication::tqsetLibraryPaths(TQStringList::split("\n", pluginPaths));
 	    savePluginPaths = TRUE;
 	}
 
@@ -1961,7 +1961,7 @@ void MainWindow::editPreferences()
 void MainWindow::searchFind()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
     if ( !findDialog )
@@ -1983,27 +1983,27 @@ void MainWindow::searchIncremetalFindMenu()
 void MainWindow::searchIncremetalFind()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
-    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(),
+    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(),
 									     FALSE, FALSE, TRUE, FALSE );
 }
 
 void MainWindow::searchIncremetalFindNext()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
-    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(),
+    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(),
 									     FALSE, FALSE, TRUE, TRUE );
 }
 
 void MainWindow::searchReplace()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
     if ( !replaceDialog )
@@ -2019,7 +2019,7 @@ void MainWindow::searchReplace()
 void MainWindow::searchGotoLine()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
     if ( !gotoLineDialog )
@@ -2054,8 +2054,8 @@ void MainWindow::showStartDialog()
 {
     if ( singleProjectMode() )
 	return;
-    for ( int i = 1; i < qApp->argc(); ++i ) {
-	TQString arg = qApp->argv()[i];
+    for ( int i = 1; i < tqApp->argc(); ++i ) {
+	TQString arg = tqApp->argv()[i];
 	if ( arg[0] != '-' )
 	    return;
     }
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 0c123886..c6fa7fb4 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,11 +43,11 @@ extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accel
 
 // Drag Object Declaration -------------------------------------------
 
-class MenuBarEditorItemPtrDrag : public QStoredDrag
+class MenuBarEditorItemPtrDrag : public TQStoredDrag
 {
 public:
     MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
-			      TQWidget * parent = 0,
+			      TQWidget * tqparent = 0,
 			      const char * name = 0 );
     ~MenuBarEditorItemPtrDrag() {};
     static bool canDecode( TQDragMoveEvent * e );
@@ -57,13 +57,13 @@ public:
 // Drag Object Implementation ---------------------------------------
 
 MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
-						    TQWidget * parent,
+						    TQWidget * tqparent,
 						    const char * name )
-    : TQStoredDrag( "qt/menubareditoritemptr", parent, name )
+    : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name )
 {
-    TQByteArray data( sizeof( Q_LONG ) );
+    TQByteArray data( sizeof( TQ_LONG ) );
     TQDataStream stream( data, IO_WriteOnly );
-    stream << ( Q_LONG ) item;
+    stream << ( TQ_LONG ) item;
     setEncodedData( data );
 }
 
@@ -74,13 +74,13 @@ bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
 
 bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
 {
-    TQByteArray data = e->encodedData( "qt/menubareditoritemptr" );
+    TQByteArray data = e->tqencodedData( "qt/menubareditoritemptr" );
     TQDataStream stream( data, IO_ReadOnly );
 
     if ( !data.size() )
 	return FALSE;
 
-    Q_LONG p = 0;
+    TQ_LONG p = 0;
     stream >> p;
     *i = ( MenuBarEditorItem *) p;
 
@@ -89,8 +89,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
 
 // MenuBarEditorItem ---------------------------------------------------
 
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( bar ),
       popupMenu( 0 ),
       visible( TRUE ),
@@ -99,8 +99,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, co
 { }
 
 MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
-				      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+				      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( bar ),
       popupMenu( menu ),
       visible( TRUE ),
@@ -111,8 +111,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba
 }
 
 MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
-				      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+				      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( bar ),
       popupMenu( 0 ),
       visible( TRUE ),
@@ -124,8 +124,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor
     popupMenu->insert( actionGroup );
 }
 
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( item->menuBar ),
       popupMenu( 0 ),
       text( item->text ),
@@ -141,8 +141,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * paren
 int MenuBarEditor::clipboardOperation = 0;
 MenuBarEditorItem * MenuBarEditor::clipboardItem = 0;
 
-MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name )
-    : TQMenuBar( parent, name ),
+MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
+    : TQMenuBar( tqparent, name ),
       formWnd( fw ),
       draggedItem( 0 ),
       currentIndex( 0 ),
@@ -152,7 +152,7 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n
       hasSeparator( FALSE )
 {
     setAcceptDrops( TRUE );
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 
     addItem.setMenuText( i18n("new menu") );
     addSeparator.setMenuText( i18n("new separator") );
@@ -165,8 +165,8 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n
     lineEdit->setBackgroundOrigin(ParentOrigin);
     lineEdit->installEventFilter( this );
 
-    dropLine = new TQWidget( this, "menubar dropline", Qt::WStyle_NoBorder | WStyle_StaysOnTop );
-    dropLine->setBackgroundColor( Qt::red );
+    dropLine = new TQWidget( this, "menubar dropline", TQt::WStyle_NoBorder | WStyle_StaysOnTop );
+    dropLine->setBackgroundColor( TQt::red );
     dropLine->hide();
 
     setMinimumHeight( fontMetrics().height() + 2 * borderSize() );
@@ -185,7 +185,7 @@ FormWindow * MenuBarEditor::formWindow()
 MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
 {
     MenuBarEditorItem * i =
-	new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this );
+	new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this );
     if ( addToCmdStack ) {
 	AddMenuCommand * cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, index );
 	formWnd->commandHistory()->addCommand( cmd );
@@ -199,7 +199,7 @@ MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
 
 void MenuBarEditor::insertItem( MenuBarEditorItem * item, int index )
 {
-    item->menu()->parentMenu = this;
+    item->menu()->tqparentMenu = this;
 
     if ( index != -1 )
 	itemList.insert( index, item );
@@ -273,7 +273,7 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item )
 
 int MenuBarEditor::findItem( MenuBarEditorItem * item )
 {
-    return itemList.findRef( item );
+    return itemList.tqfindRef( item );
 }
 
 int MenuBarEditor::findItem( PopupMenuEditor * menu )
@@ -314,7 +314,7 @@ int MenuBarEditor::findItem( TQPoint & pos )
 
 	    r = TQRect( x, y, s.width(), s.height() );
 
-	    if ( r.contains( pos ) )
+	    if ( r.tqcontains( pos ) )
 		return itemList.at();
 
 	    addItemSizeToCoords( i, x, y, w );
@@ -334,7 +334,7 @@ int MenuBarEditor::findItem( TQPoint & pos )
 
     r = TQRect( x, y, s.width(), s.height() );
 
-    if ( r.contains( pos ) )
+    if ( r.tqcontains( pos ) )
 	return itemList.count();
 
     return itemList.count() + 1;
@@ -415,8 +415,8 @@ void MenuBarEditor::exchange( int a, int b )
 	 ia == &addItem || ia == &addSeparator ||
 	 ib == &addItem || ib == &addSeparator )
 	return; // do nothing
-    itemList.replace( b, ia );
-    itemList.replace( a, ib );
+    itemList.tqreplace( b, ia );
+    itemList.tqreplace( a, ib );
 }
 
 void MenuBarEditor::showLineEdit( int index )
@@ -502,9 +502,9 @@ void MenuBarEditor::deleteItem( int index )
     }
 }
 
-TQSize MenuBarEditor::sizeHint() const
+TQSize MenuBarEditor::tqsizeHint() const
 {
-    return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
+    return TQSize( tqparentWidget()->width(), heightForWidth( tqparentWidget()->width() ) );
 }
 
 int MenuBarEditor::heightForWidth( int max_width ) const
@@ -534,8 +534,8 @@ void MenuBarEditor::show()
     TQWidget::show();
     resizeInternals();
 
-    TQResizeEvent e( parentWidget()->size(), parentWidget()->size() );
-    TQApplication::sendEvent( parentWidget(), &e );
+    TQResizeEvent e( tqparentWidget()->size(), tqparentWidget()->size() );
+    TQApplication::sendEvent( tqparentWidget(), &e );
 }
 
 void MenuBarEditor::checkAccels( TQMap<TQChar, TQWidgetList > &accels )
@@ -571,12 +571,12 @@ void MenuBarEditor::paste()
 
 bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
 {
-    if ( o == lineEdit && e->type() == TQEvent::FocusOut ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit) && e->type() == TQEvent::FocusOut ) {
 	leaveEditMode();
 	lineEdit->hide();
 	update();
     } else if ( e->type() == TQEvent::LayoutHint ) {
-	resize( sizeHint() );
+	resize( tqsizeHint() );
      }
     return TQMenuBar::eventFilter( o, e );
 }
@@ -585,8 +585,8 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQRect r = rect();
-    style().drawPrimitive( TQStyle::PE_PanelMenuBar, &p,
-			   r, colorGroup() );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
+			   r, tqcolorGroup() );
     drawItems( p );
 }
 
@@ -646,7 +646,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e )
 	    // If the item is dropped in the same list,
 	    //  we will have two instances of the same pointer
 	    // in the list.
-	    itemList.find( draggedItem );
+	    itemList.tqfind( draggedItem );
 	    TQLNode * node = itemList.currentNode();
 	    dropConfirmed = FALSE;
 	    d->dragCopy(); // dragevents and stuff happens
@@ -719,67 +719,67 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
     if ( lineEdit->isHidden() ) { // In navigation mode
 	switch ( e->key() ) {
 
-	case Qt::Key_Delete:
+	case TQt::Key_Delete:
 	    hideItem();
 	    deleteItem();
 	    showItem();
 	    break;
 
-	case Qt::Key_Left:
+	case TQt::Key_Left:
 	    e->accept();
-	    navigateLeft( e->state() & Qt::ControlButton );
+	    navigateLeft( e->state() & TQt::ControlButton );
 	    return;
 
-	case Qt::Key_Right:
+	case TQt::Key_Right:
 	    e->accept();
-	    navigateRight( e->state() & Qt::ControlButton );
+	    navigateRight( e->state() & TQt::ControlButton );
 	    return; // no update
 
-	case Qt::Key_Down:
+	case TQt::Key_Down:
 	    e->accept();
 	    focusItem();
 	    return; // no update
 
-	case Qt::Key_PageUp:
+	case TQt::Key_PageUp:
 	    currentIndex = 0;
 	    break;
 
-	case Qt::Key_PageDown:
+	case TQt::Key_PageDown:
 	    currentIndex = itemList.count();
 	    break;
 
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
-	case Qt::Key_F2:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
+	case TQt::Key_F2:
 	    e->accept();
 	    enterEditMode();
 	    return; // no update
 
-	case Qt::Key_Up:
-	case Qt::Key_Alt:
-	case Qt::Key_Shift:
-	case Qt::Key_Control:
-	case Qt::Key_Escape:
+	case TQt::Key_Up:
+	case TQt::Key_Alt:
+	case TQt::Key_Shift:
+	case TQt::Key_Control:
+	case TQt::Key_Escape:
 	    e->ignore();
 	    setFocus(); // FIXME: this is because some other widget get the focus when CTRL is pressed
 	    return; // no update
 
-	case Qt::Key_C:
-	    if ( e->state() & Qt::ControlButton && currentIndex < (int)itemList.count() ) {
+	case TQt::Key_C:
+	    if ( e->state() & TQt::ControlButton && currentIndex < (int)itemList.count() ) {
 		copy( currentIndex );
 		break;
 	    }
 
-	case Qt::Key_X:
-	    if ( e->state() & Qt::ControlButton && currentIndex < (int)itemList.count() ) {
+	case TQt::Key_X:
+	    if ( e->state() & TQt::ControlButton && currentIndex < (int)itemList.count() ) {
 		hideItem();
 		cut( currentIndex );
 		showItem();
 		break;
 	    }
 
-	case Qt::Key_V:
-	    if ( e->state() & Qt::ControlButton ) {
+	case TQt::Key_V:
+	    if ( e->state() & TQt::ControlButton ) {
 		hideItem();
 		paste( currentIndex < (int)itemList.count() ? currentIndex + 1: itemList.count() );
 		showItem();
@@ -799,13 +799,13 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
     } else { // In edit mode
 
 	switch ( e->key() ) {
-	case Qt::Key_Control:
+	case TQt::Key_Control:
 	    e->ignore();
 	    return;
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
 	    leaveEditMode();
-	case Qt::Key_Escape:
+	case TQt::Key_Escape:
 	    lineEdit->hide();
 	    setFocus();
 	    break;
@@ -817,8 +817,8 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
 
 void MenuBarEditor::focusOutEvent( TQFocusEvent * e )
 {
-    TQWidget * fw = qApp->focusWidget();
-    if ( e->lostFocus() && !::qt_cast<PopupMenuEditor*>(fw) )
+    TQWidget * fw = tqApp->tqfocusWidget();
+    if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) )
 	hideItem();
     update();
 }
@@ -834,7 +834,7 @@ void MenuBarEditor::drawItems( TQPainter & p )
     TQPoint pos( borderSize(), 0 );
     uint c = 0;
 
-    p.setPen( colorGroup().buttonText() );
+    p.setPen( tqcolorGroup().buttonText() );
 
     MenuBarEditorItem * i = itemList.first();
     while ( i ) {
@@ -866,7 +866,7 @@ void MenuBarEditor::drawItem( TQPainter & p,
 	drawSeparator( p, pos );
     } else {
 	int flags = TQPainter::AlignLeft | TQPainter::AlignVCenter |
-	    Qt::ShowPrefix | Qt::SingleLine;
+	    TQt::ShowPrefix | TQt::SingleLine;
 	p.drawText( pos.x() + borderSize(), pos.y(), w - borderSize(), itemHeight,
 		    flags, i->menuText() );
     }
@@ -892,7 +892,7 @@ void MenuBarEditor::drawSeparator( TQPainter & p, TQPoint & pos )
 
     p.fillRect( left, pos.y() + borderSize() * 2,
 		separatorWidth - 1, itemHeight - borderSize() * 4,
-		TQBrush( darkBlue, Qt::Dense5Pattern ) );
+		TQBrush( darkBlue, TQt::Dense5Pattern ) );
 
     p.restore();
 }
@@ -1004,7 +1004,7 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos )
 
     hideItem();
     Command * cmd = 0;
-    int iidx = itemList.findRef( i );
+    int iidx = itemList.tqfindRef( i );
     if ( iidx != -1 ) { // internal dnd
 	cmd = new MoveMenuCommand( i18n( "Item Dragged" ), formWnd, this, iidx, idx );
 	item( iidx )->setVisible( TRUE );
diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index 6dbf86f2..6932fe44 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,21 +34,22 @@ class PopupMenuEditor;
 class MenuBarEditor;
 class TQActionGroup;
 
-class MenuBarEditorItem : public QObject
+class MenuBarEditorItem : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class MenuBarEditor;
 
-    MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 );
+    MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 );
     
 public:
     MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
-		       TQObject * parent = 0, const char * name = 0);
+		       TQObject * tqparent = 0, const char * name = 0);
     MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
-		       TQObject * parent = 0, const char * name = 0);
+		       TQObject * tqparent = 0, const char * name = 0);
     MenuBarEditorItem( MenuBarEditorItem * item,
-		       TQObject * parent = 0, const char * name = 0);
+		       TQObject * tqparent = 0, const char * name = 0);
     ~MenuBarEditorItem() { };
 
     PopupMenuEditor * menu() { return popupMenu; }
@@ -78,12 +79,13 @@ private:
 class TQLineEdit;
 class FormWindow;
 
-class MenuBarEditor : public QMenuBar
+class MenuBarEditor : public TQMenuBar
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
+    MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 );
     ~MenuBarEditor();
 
     FormWindow * formWindow();
@@ -118,9 +120,9 @@ public:
     void focusItem( int index = -1 );
     void deleteItem( int index = -1 );
 
-    TQSize sizeHint() const;
-    TQSize minimumSize() const { return sizeHint(); }
-    TQSize minimumSizeHint() const { return sizeHint(); }
+    TQSize tqsizeHint() const;
+    TQSize tqminimumSize() const { return tqsizeHint(); }
+    TQSize tqminimumSizeHint() const { return tqsizeHint(); }
     int heightForWidth( int max_width ) const;
 
     void show();
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index 5fc1960f..1a609f8f 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -50,7 +50,7 @@
 #include <tqwidgetlist.h>
 #include <tqmainwindow.h>
 #include <tqregexp.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -88,7 +88,7 @@ static TQPtrList<MetaDataBase::CustomWidget> *cWidgets = 0;
 static bool doUpdate = TRUE;
 static TQStringList langList;
 static TQStringList editorLangList;
-static QPluginManager<LanguageInterface> *languageInterfaceManager = 0;
+static TQPluginManager<LanguageInterface> *languageInterfaceManager = 0;
 
 /*!
   \class MetaDataBase metadatabase.h
@@ -126,7 +126,7 @@ void MetaDataBase::addEntry( TQObject *o )
     if ( !o )
 	return;
     setupDataBase();
-    if ( db->find( o ) )
+    if ( db->tqfind( o ) )
 	return;
     MetaDataBaseRecord *r = new MetaDataBaseRecord;
     r->object = o;
@@ -149,7 +149,7 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
 	( (PropertyObject*)o )->mdPropertyChanged( property, changed );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -157,24 +157,24 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
     }
 
     if ( changed ) {
-	if ( r->changedProperties.findIndex( property ) == -1 )
+	if ( r->changedProperties.tqfindIndex( property ) == -1 )
 	    r->changedProperties.append( property );
     } else {
-	if ( r->changedProperties.findIndex( property ) != -1 )
+	if ( r->changedProperties.tqfindIndex( property ) != -1 )
 	    r->changedProperties.remove( property );
     }
 
     if ( doUpdate &&
 	 ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
 	doUpdate = FALSE;
-	setPropertyChanged( o, "alignment", changed ||
+	setPropertyChanged( o, "tqalignment", changed ||
 			    isPropertyChanged( o, "hAlign" ) ||
 			    isPropertyChanged( o, "vAlign" ) ||
 			    isPropertyChanged( o, "wordwrap" ) );
 	doUpdate = TRUE;
     }
 
-    if ( doUpdate && property == "alignment" ) {
+    if ( doUpdate && property == "tqalignment" ) {
 	doUpdate = FALSE;
 	setPropertyChanged( o, "hAlign", changed );
 	setPropertyChanged( o, "vAlign", changed );
@@ -188,20 +188,20 @@ bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property )
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdIsPropertyChanged( property );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
 
-    return r->changedProperties.findIndex( property ) != -1;
+    return r->changedProperties.tqfindIndex( property ) != -1;
 }
 
 TQStringList MetaDataBase::changedProperties( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -219,7 +219,7 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co
 	( (PropertyObject*)o )->mdSetPropertyComment( property, comment );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -234,14 +234,14 @@ TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property )
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdPropertyComment( property );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
-    return *r->propertyComments.find( property );
+    return *r->propertyComments.tqfind( property );
 }
 
 void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value )
@@ -251,7 +251,7 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const
 	( (PropertyObject*)o )->mdSetFakeProperty( property, value );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -265,13 +265,13 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdFakeProperty( property );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return TQVariant();
     }
-    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property );
+    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property );
     if ( it != r->fakeProperties.end() )
 	return r->fakeProperties[property];
     return WidgetFactory::defaultValue( o, property );
@@ -281,7 +281,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
 TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -295,7 +295,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -303,16 +303,16 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     }
 
     r->spacing = spacing;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
-    if ( layout ) {
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
+    if ( tqlayout ) {
 	int spadef = 6;
 	if ( MainWindow::self->formWindow() )
-	    spadef = MainWindow::self->formWindow()->layoutDefaultSpacing();
+	    spadef = MainWindow::self->formWindow()->tqlayoutDefaultSpacing();
 	if ( spacing == -1 )
-	    layout->setSpacing( spadef );
+	    tqlayout->setSpacing( spadef );
 	else
-	    layout->setSpacing( spacing );
+	    tqlayout->setSpacing( spacing );
     }
 }
 
@@ -321,9 +321,9 @@ int MetaDataBase::spacing( TQObject *o )
     if ( !o )
 	return -1;
     setupDataBase();
-    if ( ::qt_cast<TQMainWindow*>(o) )
-	o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    if ( ::tqqt_cast<TQMainWindow*>(o) )
+	o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -338,7 +338,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -346,30 +346,30 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     }
 
     r->margin = margin;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
 
     bool isInnerLayout = TRUE;
 
     TQWidget *widget = (TQWidget*)o;
-    if ( widget && !::qt_cast<QLayoutWidget*>(widget) &&
-	( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	widget && widget->parentWidget() && ::qt_cast<FormWindow*>(widget->parentWidget()) ) )
+    if ( widget && !::tqqt_cast<TQLayoutWidget*>(widget) &&
+	( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
+	widget && widget->tqparentWidget() && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) )
 	isInnerLayout = FALSE;
 
 
-    if ( layout ) {
+    if ( tqlayout ) {
 	int mardef = 11;
 	if ( MainWindow::self->formWindow() )
-	    mardef = MainWindow::self->formWindow()->layoutDefaultMargin();
+	    mardef = MainWindow::self->formWindow()->tqlayoutDefaultMargin();
 	if ( margin == -1 ) {
 	    if ( isInnerLayout )
-		layout->setMargin( 1 );
+		tqlayout->setMargin( 1 );
 	    else
-		layout->setMargin( QMAX( 1, mardef ) );
+		tqlayout->setMargin( TQMAX( 1, mardef ) );
 	}
 	else
-	    layout->setMargin( QMAX( 1, margin ) );
+	    tqlayout->setMargin( TQMAX( 1, margin ) );
     }
 }
 
@@ -378,9 +378,9 @@ int MetaDataBase::margin( TQObject *o )
     if ( !o )
 	return -1;
     setupDataBase();
-    if ( ::qt_cast<TQMainWindow*>(o) )
-	o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    if ( ::tqqt_cast<TQMainWindow*>(o) )
+	o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -394,7 +394,7 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -407,15 +407,15 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode )
 TQString MetaDataBase::resizeMode( TQObject *o )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
-    if ( ::qt_cast<TQMainWindow*>(o) )
-	o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    if ( ::tqqt_cast<TQMainWindow*>(o) )
+	o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
     return r->resizeMode;
 }
@@ -424,7 +424,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString
 				  TQObject *receiver, const TQCString &slot, bool addCode )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -440,15 +440,15 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString
     r->connections.append( conn );
     if ( addCode ) {
 	TQString rec = receiver->name();
-	if ( ::qt_cast<FormWindow*>(o) && receiver == ( (FormWindow*)o )->mainContainer() )
+	if ( ::tqqt_cast<FormWindow*>(o) && TQT_BASE_OBJECT(receiver) ==( (FormWindow*)o )->mainContainer() )
 	    rec = "this";
 	TQString sen = sender->name();
-	if ( ::qt_cast<FormWindow*>(o) && sender == ( (FormWindow*)o )->mainContainer() )
+	if ( ::tqqt_cast<FormWindow*>(o) && TQT_BASE_OBJECT(sender) ==( (FormWindow*)o )->mainContainer() )
 	    sen = "this";
 	FormFile *ff = 0;
-	if ( ::qt_cast<FormFile*>(o) )
+	if ( ::tqqt_cast<FormFile*>(o) )
 	    ff = (FormFile*)o;
-	else if ( ::qt_cast<FormWindow*>(o) )
+	else if ( ::tqqt_cast<FormWindow*>(o) )
 	    ff = ( (FormWindow*)o )->formFile();
 	ff->addConnection( sen, signal, rec, slot );
     }
@@ -458,7 +458,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 				     TQObject *receiver, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -468,17 +468,17 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 	return;
     for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) {
 	Connection conn = *it;
-	if ( conn.sender == sender &&
+	if ( TQT_BASE_OBJECT(conn.sender) ==sender &&
 	     conn.signal == signal &&
-	     conn.receiver == receiver &&
+	     TQT_BASE_OBJECT(conn.receiver) ==receiver &&
 	     conn.slot == slot ) {
 	    r->connections.remove( it );
 	    break;
 	}
     }
-    if ( ::qt_cast<FormWindow*>(o) ) {
+    if ( ::tqqt_cast<FormWindow*>(o) ) {
 	TQString rec = receiver->name();
-	if ( receiver == ( (FormWindow*)o )->mainContainer() )
+	if ( TQT_BASE_OBJECT(receiver) ==( (FormWindow*)o )->mainContainer() )
 	    rec = "this";
 	( (FormWindow*)o )->formFile()->removeConnection( sender->name(), signal, rec, slot );
     }
@@ -487,14 +487,14 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInterface::Connection> &conns )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
 
-    if ( !::qt_cast<FormFile*>(o) )
+    if ( !::tqqt_cast<FormFile*>(o) )
 	return;
 
     FormFile *formfile = (FormFile*)o;
@@ -505,8 +505,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte
 	  cit != conns.end(); ++cit ) {
 	// #### get the correct sender object out of Bla.Blub.sender
 	TQString senderName = (*cit).sender;
-	if ( senderName.find( '.' ) != -1 )
-	    senderName = senderName.mid( senderName.findRev( '.' ) + 1 );
+	if ( senderName.tqfind( '.' ) != -1 )
+	    senderName = senderName.mid( senderName.tqfindRev( '.' ) + 1 );
 	TQObject *sender = 0;
 	if ( formfile->formWindow() )
 	    sender = formfile->formWindow()->child( senderName );
@@ -514,8 +514,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte
 	    sender = formfile->project()->objectForFakeFormFile( formfile );
 	if ( !sender && senderName == "this" )
 	    sender = formfile->formWindow() ?
-		     formfile->formWindow()->mainContainer() :
-		     formfile->project()->objectForFakeFormFile( formfile );
+		     TQT_TQOBJECT(formfile->formWindow()->mainContainer()) :
+		     TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile ));
 	if ( !sender )
 	    continue;
 	MetaDataBase::addConnection( formfile->formWindow() ?
@@ -524,8 +524,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte
 				     sender,
 				     (*cit).signal.latin1(),
 				     formfile->formWindow() ?
-				     formfile->formWindow()->mainContainer() :
-				     formfile->project()->objectForFakeFormFile( formfile ),
+				     TQT_TQOBJECT(formfile->formWindow()->mainContainer()) :
+				     TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile )),
 				     (*cit).slot.latin1(),
 				     FALSE );
     }
@@ -535,7 +535,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString
 				  TQObject *receiver, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -544,9 +544,9 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString
 
     for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) {
 	Connection conn = *it;
-	if ( conn.sender == sender &&
+	if ( TQT_BASE_OBJECT(conn.sender) ==sender &&
 	     conn.signal == signal &&
-	     conn.receiver == receiver &&
+	     TQT_BASE_OBJECT(conn.receiver) ==receiver &&
 	     conn.slot == slot )
 	    return TRUE;
     }
@@ -557,7 +557,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString
 TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -570,7 +570,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 								TQObject *receiver )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -581,8 +581,8 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
     TQValueList<Connection>::Iterator conn;
     while ( ( conn = it ) != r->connections.end() ) {
 	++it;
-	if ( (*conn).sender == sender &&
-	     (*conn).receiver == receiver )
+	if ( TQT_BASE_OBJECT((*conn).sender) ==sender &&
+	     TQT_BASE_OBJECT((*conn).receiver) ==receiver )
 	    ret << *conn;
     }
 
@@ -592,7 +592,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQObject *object )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -603,8 +603,8 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
     TQValueList<Connection>::Iterator conn;
     while ( ( conn = it ) != r->connections.end() ) {
 	++it;
-	if ( (*conn).sender == object ||
-	     (*conn).receiver == object )
+	if ( TQT_BASE_OBJECT((*conn).sender) ==object ||
+	     TQT_BASE_OBJECT((*conn).receiver) ==object )
 	    ret << *conn;
     }
     return ret;
@@ -613,7 +613,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 void MetaDataBase::doConnections( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -648,16 +648,16 @@ void MetaDataBase::doConnections( TQObject *o )
 	    delete l;
 	}
 	TQString s = "2""%1";
-	s = s.arg( conn.signal );
+	s = s.tqarg( conn.signal.data() );
 	TQString s2 = "1""%1";
-	s2 = s2.arg( conn.slot );
+	s2 = s2.tqarg( conn.slot.data() );
 
-	TQStrList signalList = sender->metaObject()->signalNames( TRUE );
-	TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
+	TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
+	TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
 
 	// avoid warnings
-	if ( signalList.find( conn.signal ) == -1 ||
-	     slotList.find( conn.slot ) == -1 )
+	if ( signalList.tqfind( conn.signal ) == -1 ||
+	     slotList.tqfind( conn.slot ) == -1 )
 	    continue;
 
 	TQObject::connect( sender, s, receiver, s2 );
@@ -667,7 +667,7 @@ void MetaDataBase::doConnections( TQObject *o )
 bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -675,18 +675,18 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
     }
 
     if ( !onlyCustom ) {
-	TQStrList slotList = o->metaObject()->slotNames( TRUE );
-	if ( slotList.find( slot ) != -1 )
+	TQStrList slotList = o->tqmetaObject()->slotNames( TRUE );
+	if ( slotList.tqfind( slot ) != -1 )
 	    return TRUE;
 
-	if ( ::qt_cast<FormWindow*>(o) ) {
-	    o = ( (FormWindow*)o )->mainContainer();
-	    slotList = o->metaObject()->slotNames( TRUE );
-	    if ( slotList.find( slot ) != -1 )
+	if ( ::tqqt_cast<FormWindow*>(o) ) {
+	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
+	    slotList = o->tqmetaObject()->slotNames( TRUE );
+	    if ( slotList.tqfind( slot ) != -1 )
 		return TRUE;
 	}
 
-	//if ( ::qt_cast<CustomWidget*>(o) ) {
+	//if ( ::tqqt_cast<CustomWidget*>(o) ) {
 	if ( o->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget();
 	    for ( TQValueList<Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) {
@@ -711,7 +711,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
 bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 	          o, o->name(), o->className() );
@@ -732,7 +732,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ
 				const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -746,7 +746,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ
     f.type = type;
     f.language = language;
     f.returnType = returnType;
-    TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.find( f );
+    TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.tqfind( f );
     if ( it != r->functionList.end() )
 	r->functionList.remove( it );
     r->functionList.append( f );
@@ -756,7 +756,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ
 void MetaDataBase::setFunctionList( TQObject *o, const TQValueList<Function> &functionList )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -770,7 +770,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const
 				   const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -794,7 +794,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const
 void MetaDataBase::removeFunction( TQObject *o, const TQString &function )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -812,7 +812,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQString &function )
 TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, bool onlyFunctions )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -831,7 +831,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, boo
 TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -849,7 +849,7 @@ void MetaDataBase::changeFunction( TQObject *o, const TQString &function, const
 				   const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -873,7 +873,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam
 					     const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -897,7 +897,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam
 bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onlyCustom )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -905,18 +905,18 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
     }
 
     if ( !onlyCustom ) {
-	TQStrList functionList = o->metaObject()->slotNames( TRUE );
-	if ( functionList.find( function ) != -1 )
+	TQStrList functionList = o->tqmetaObject()->slotNames( TRUE );
+	if ( functionList.tqfind( function ) != -1 )
 	    return TRUE;
 
-	if ( ::qt_cast<FormWindow*>(o) ) {
-	    o = ( (FormWindow*)o )->mainContainer();
-	    functionList = o->metaObject()->slotNames( TRUE );
-	    if ( functionList.find( function ) != -1 )
+	if ( ::tqqt_cast<FormWindow*>(o) ) {
+	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
+	    functionList = o->tqmetaObject()->slotNames( TRUE );
+	    if ( functionList.tqfind( function ) != -1 )
 		return TRUE;
 	}
 
-	//if ( ::qt_cast<CustomWidget*>(o) ) {
+	//if ( ::tqqt_cast<CustomWidget*>(o) ) {
 	if ( o->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget();
 	    for ( TQValueList<Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) {
@@ -941,11 +941,11 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
 TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &function )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
     TQString fu = normalizeFunction( function );
@@ -953,7 +953,7 @@ TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &functio
 	if ( fu == normalizeFunction( (*it).function ) )
 	    return (*it).language;
     }
-    return TQString::null;
+    return TQString();
 }
 
 bool MetaDataBase::addCustomWidget( CustomWidget *wid )
@@ -1034,7 +1034,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className )
 void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*) w );
+    MetaDataBaseRecord *r = db->tqfind( (void*) w );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
@@ -1047,7 +1047,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order )
 TQWidgetList MetaDataBase::tabOrder( TQWidget *w )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*) w );
+    MetaDataBaseRecord *r = db->tqfind( (void*) w );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
@@ -1060,7 +1060,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w )
 void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1073,7 +1073,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs )
 TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1086,7 +1086,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o )
 void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1099,7 +1099,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds )
 TQStringList MetaDataBase::forwards( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1112,7 +1112,7 @@ TQStringList MetaDataBase::forwards( TQObject *o )
 void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1125,7 +1125,7 @@ void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars
 void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQString &access )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1140,7 +1140,7 @@ void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQStrin
 void MetaDataBase::removeVariable( TQObject *o, const TQString &name )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1158,7 +1158,7 @@ void MetaDataBase::removeVariable( TQObject *o, const TQString &name )
 TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1171,7 +1171,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o )
 bool MetaDataBase::hasVariable( TQObject *o, const TQString &name )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1188,7 +1188,7 @@ bool MetaDataBase::hasVariable( TQObject *o, const TQString &name )
 
 TQString MetaDataBase::extractVariableName( const TQString &name )
 {
-    TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 );
+    TQString n = name.right( name.length() - name.tqfindRev( ' ' ) - 1 );
     if ( n[ 0 ] == '*' || n[ 0 ] == '&' )
 	n[ 0 ] = ' ';
     if ( n[ (int)n.length() - 1 ] == ';' )
@@ -1199,7 +1199,7 @@ TQString MetaDataBase::extractVariableName( const TQString &name )
 void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1213,10 +1213,10 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 	bool hasSemicolon = s.endsWith( ";" );
 	if ( hasSemicolon )
 	    s = s.left( s.length() - 1 );
-	int p = s.find( '(' );
+	int p = s.tqfind( '(' );
 	if ( p < 0 )
 	    p = s.length();
-	int sp = s.find( ' ' );
+	int sp = s.tqfind( ' ' );
 	if ( sp >= 0 && sp < p ) {
 	    s = s.mid( sp+1 );
 	    p -= sp + 1;
@@ -1232,7 +1232,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 TQStringList MetaDataBase::signalList( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1245,7 +1245,7 @@ TQStringList MetaDataBase::signalList( TQObject *o )
 void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1258,7 +1258,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi )
 MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     className = "MyCustomWidget";
     includeFile = "mywidget.h";
     includePolicy = Local;
-    sizeHint = TQSize( -1, -1 );
+    tqsizeHint = TQSize( -1, -1 );
     pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) );
     id = -1;
     sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    sizeHint = w.sizeHint;
+    tqsizeHint = w.tqsizeHint;
     if ( w.pixmap )
 	pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1304,7 +1304,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c )
 	( (PropertyObject*)w )->mdSetCursor( c );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
@@ -1319,7 +1319,7 @@ TQCursor MetaDataBase::cursor( TQWidget *w )
     setupDataBase();
     if ( w->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)w )->mdCursor();
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
 	w->unsetCursor();
 	return w->cursor();
@@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    sizeHint = w.sizeHint;
+    tqsizeHint = w.tqsizeHint;
     if ( w.pixmap )
 	pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1354,8 +1354,8 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
 
 bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 {
-    TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE );
-    if ( sigList.find( signal ) != -1 )
+    TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE );
+    if ( sigList.tqfind( signal ) != -1 )
 	return TRUE;
     for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
 	if ( normalizeFunction( *it ) == normalizeFunction( signal ) )
@@ -1366,8 +1366,8 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 
 bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 {
-    TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE );
-    if ( slotList.find( normalizeFunction( slot ) ) != -1 )
+    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE );
+    if ( slotList.tqfind( normalizeFunction( slot ) ) != -1 )
 	return TRUE;
 
     for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) {
@@ -1379,8 +1379,8 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 
 bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
 {
-    TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE );
-    if ( propList.find( prop ) != -1 )
+    TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE );
+    if ( propList.tqfind( prop ) != -1 )
 	return TRUE;
 
     for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) {
@@ -1395,7 +1395,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1409,16 +1409,16 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a
 TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
-    return *r->pixmapArguments.find( pixmap );
+    return *r->pixmapArguments.tqfind( pixmap );
 }
 
 void MetaDataBase::clearPixmapArguments( TQObject *o )
@@ -1426,7 +1426,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *o )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1446,7 +1446,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
 	( (PropertyObject*)o )->mdSetPixmapKey( pixmap, arg );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1460,25 +1460,25 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
 TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdPixmapKey( pixmap );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
-    TQString s = *r->pixmapKeys.find( pixmap );
+    TQString s = *r->pixmapKeys.tqfind( pixmap );
     if ( !s.isNull() )
 	return s;
     if ( !o->isWidgetType() )
 	return s;
     TQWidget *w = (TQWidget*)o;
     if ( w->icon() )
-	return *r->pixmapKeys.find( w->icon()->serialNumber() );
+	return *r->pixmapKeys.tqfind( w->icon()->serialNumber() );
     return s;
 }
 
@@ -1487,7 +1487,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *o )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1504,7 +1504,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString>
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1519,7 +1519,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *o )
     if ( !o )
 	return TQMap<TQString, TQString>();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1536,14 +1536,14 @@ void MetaDataBase::setEditor( const TQStringList &langs )
 
 bool MetaDataBase::hasEditor( const TQString &lang )
 {
-    return editorLangList.find( lang ) != editorLangList.end();
+    return editorLangList.tqfind( lang ) != editorLangList.end();
 }
 
 void MetaDataBase::setupInterfaceManagers( const TQString &plugDir )
 {
     if ( !languageInterfaceManager ) {
 	languageInterfaceManager =
-	    new QPluginManager<LanguageInterface>( IID_Language,
+	    new TQPluginManager<LanguageInterface>( IID_Language,
 						   TQApplication::libraryPaths(),
 //						   kapp->dirs()->resourceDirs("qtplugins"),
 						   plugDir );
@@ -1586,7 +1586,7 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1599,8 +1599,8 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l )
     while ( it != r->breakPointConditions.end() ) {
 	int line = it.key();
 	++it;
-	if ( r->breakPoints.find( line ) == r->breakPoints.end() )
-	    r->breakPointConditions.remove( r->breakPointConditions.find( line ) );
+	if ( r->breakPoints.tqfind( line ) == r->breakPoints.end() )
+	    r->breakPointConditions.remove( r->breakPointConditions.tqfind( line ) );
     }
 }
 
@@ -1609,7 +1609,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQObject *o )
     if ( !o )
 	return TQValueList<uint>();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1624,29 +1624,29 @@ void MetaDataBase::setBreakPointCondition( TQObject *o, int line, const TQString
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
-    r->breakPointConditions.replace( line, condition );
+    r->breakPointConditions.tqreplace( line, condition );
 }
 
 TQString MetaDataBase::breakPointCondition( TQObject *o, int line )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
-    TQMap<int, TQString>::Iterator it = r->breakPointConditions.find( line );
+    TQMap<int, TQString>::Iterator it = r->breakPointConditions.tqfind( line );
     if ( it == r->breakPointConditions.end() )
-	return TQString::null;
+	return TQString();
     return *it;
 }
 
@@ -1659,7 +1659,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString &macro )
 	( (PropertyObject*)o )->mdSetExportMacro( macro );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1676,7 +1676,7 @@ TQString MetaDataBase::exportMacro( TQObject *o )
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdExportMacro();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1688,5 +1688,5 @@ TQString MetaDataBase::exportMacro( TQObject *o )
 
 bool MetaDataBase::hasObject( TQObject *o )
 {
-    return !!db->find( o );
+    return !!db->tqfind( o );
 }
diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h
index 0dbe5dee..9b00deb9 100644
--- a/kdevdesigner/designer/metadatabase.h
+++ b/kdevdesigner/designer/metadatabase.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -102,7 +102,7 @@ public:
 	TQString className;
 	TQString includeFile;
 	IncludePolicy includePolicy;
-	TQSize sizeHint;
+	TQSize tqsizeHint;
 	TQSizePolicy sizePolicy;
 	TQPixmap *pixmap;
 	TQValueList<TQCString> lstSignals;
diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui
index 3a28f795..b7789288 100644
--- a/kdevdesigner/designer/multilineeditor.ui
+++ b/kdevdesigner/designer/multilineeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QMainWindow">
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>MultiLineEditorBase</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout3</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>OkButton</cstring>
                             </property>
@@ -98,7 +98,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>applyButton</cstring>
                             </property>
@@ -106,7 +106,7 @@
                                 <string>&amp;Apply</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>cancelButton</cstring>
                             </property>
@@ -124,14 +124,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>helpButton</cstring>
                             </property>
@@ -172,10 +172,10 @@
         <slot>cancelClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>applyClicked()</slot>
     <slot>okClicked()</slot>
     <slot>cancelClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index 1d859211..5d230e05 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,7 +36,7 @@
 #include "kdevdesigner_part.h"
 
 #include <tqtextedit.h>
-#include <./private/qrichtext_p.h>
+#include <./private/tqrichtext_p.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -46,10 +46,10 @@
 
 #include <klocale.h>
 
-ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar,
+ToolBarItem::ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
 			  const TQString &label, const TQString &tagstr,
 			  const TQIconSet &icon, const TQKeySequence &key )
-    : TQAction( parent )
+    : TQAction( tqparent )
 {
     setIconSet( icon );
     setText( label );
@@ -69,22 +69,22 @@ void ToolBarItem::wasActivated()
     emit clicked( tag );
 }
 
-TextEdit::TextEdit( TQWidget *parent, const char *name )
-    : TQTextEdit( parent, name )
+TextEdit::TextEdit( TQWidget *tqparent, const char *name )
+    : TQTextEdit( tqparent, name )
 {
-    setTextFormat( Qt::PlainText );
+    setTextFormat( TQt::PlainText );
 }
 
-QTextParagraph* TextEdit::paragraph()
+TQTextParagraph* TextEdit::paragraph()
 {
-    QTextCursor *tc = new QTextCursor( TQTextEdit::document() );
+    TQTextCursor *tc = new TQTextCursor( TQTextEdit::document() );
     return tc->paragraph();
 }
 
 
-MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
+MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
 				  FormWindow *fw, const TQString &text )
-    : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE )
+    : MultiLineEditorBase( tqparent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE )
 {
     callStatic = call_static;
 
@@ -126,45 +126,45 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 
 	basicToolBar->addSeparator();
 
-	TQPopupMenu *layoutMenu = new TQPopupMenu( this );
-	menuBar->insertItem( i18n( "&Layout" ), layoutMenu );
+	TQPopupMenu *tqlayoutMenu = new TQPopupMenu( this );
+	menuBar->insertItem( i18n( "&Layout" ), tqlayoutMenu );
 
 	TQAction *brAction = new TQAction( this );
 	brAction->setIconSet( BarIcon( "designer_textlinebreak.png", KDevDesignerPartFactory::instance() ) );
 	brAction->setText( i18n("Break" ) );
 	brAction->addTo( basicToolBar );
-	brAction->addTo( layoutMenu );
+	brAction->addTo( tqlayoutMenu );
 	connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) );
 
 	ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ),
 					  "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) );
-	p->addTo( layoutMenu );
+	p->addTo( tqlayoutMenu );
 	connect( p, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
-	layoutMenu->insertSeparator();
+	tqlayoutMenu->insertSeparator();
 	basicToolBar->addSeparator();
 
 	ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ),
 					   "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) );
-	al->addTo( layoutMenu );
+	al->addTo( tqlayoutMenu );
 	connect( al, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ),
 					   "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) );
-	ac->addTo( layoutMenu );
+	ac->addTo( tqlayoutMenu );
 	connect( ac, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ),
 					   "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) );
-	ar->addTo( layoutMenu );
+	ar->addTo( tqlayoutMenu );
 	connect( ar, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ),
 					      "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) );
-	block->addTo( layoutMenu );
+	block->addTo( tqlayoutMenu );
 	connect( block, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
@@ -223,16 +223,16 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	wrapAction->setOn( doWrap );
 
 	connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-	textEdit->document()->setFormatter( new QTextFormatterBreakInWords );
+	textEdit->document()->setFormatter( new TQTextFormatterBreakInWords );
 	textEdit->document()->setUseFormatCollection( FALSE );
 	textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML );
 
-	if ( !callStatic && ::qt_cast<TQTextEdit*>(editWidget) ) {
+	if ( !callStatic && ::tqqt_cast<TQTextEdit*>(editWidget) ) {
 	    mlined = (TQTextEdit*)editWidget;
 	    mlined->setReadOnly( TRUE );
 
-	    const TQMetaProperty *wordWrap = mlined->metaObject()->property(
-					    mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE );
+	    const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property(
+					    mlined->tqmetaObject()->tqfindProperty( "wordWrap", TRUE ), TRUE );
 	    oldWrapMode = 0;
 	    oldWrapString = "NoWrap";
 	    if ( wordWrap ) {
@@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 		if ( oldWrapString != "NoWrap" )
 		    doWrap = TRUE;
 	    }
-	    textEdit->setAlignment( mlined->alignment() );
+	    textEdit->tqsetAlignment( mlined->tqalignment() );
 	    textEdit->setWordWrap( mlined->wordWrap() );
 	    textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
 	    textEdit->setWrapPolicy( mlined->wrapPolicy() );
@@ -263,7 +263,7 @@ int MultiLineEditor::exec()
 {
     res = 1;
     show();
-    qApp->enter_loop();
+    tqApp->enter_loop();
     return res;
 }
 
@@ -276,23 +276,23 @@ void MultiLineEditor::okClicked()
 void MultiLineEditor::applyClicked()
 {
     if ( !callStatic ) {
-	PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).arg( mlined->name() ),
+	PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).tqarg( mlined->name() ),
 						formwindow, mlined, textEdit->text() );
 	cmd->execute();
 	formwindow->commandHistory()->addCommand( cmd );
 
 	if ( oldDoWrap != doWrap ) {
-	    TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) );
+	    TQString pn( i18n( "Set 'wordWrap' of '%2'" ).tqarg( mlined->name() ) );
 	    SetPropertyCommand *propcmd;
 	    if ( doWrap )
 		propcmd = new SetPropertyCommand( pn, formwindow,
-					mlined, MainWindow::self->propertyeditor(),
-					"wordWrap", WidgetFactory::property( mlined, "wordWrap" ),
+					TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(),
+					"wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ),
 					TQVariant( 1 ), "WidgetWidth", oldWrapString );
 	    else
 		propcmd = new SetPropertyCommand( pn, formwindow,
-					mlined, MainWindow::self->propertyeditor(),
-					"wordWrap", WidgetFactory::property( mlined, "wordWrap" ),
+					TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(),
+					"wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ),
 					TQVariant( 0 ), "NoWrap", oldWrapString );
 
 	    propcmd->execute();
@@ -313,7 +313,7 @@ void MultiLineEditor::cancelClicked()
 
 void MultiLineEditor::closeEvent( TQCloseEvent *e )
 {
-    qApp->exit_loop();
+    tqApp->exit_loop();
     MultiLineEditorBase::closeEvent( e );
 }
 
@@ -321,11 +321,11 @@ void MultiLineEditor::insertTags( const TQString &tag )
 {
     int pfrom, pto, ifrom, ito;
     TQString tagend(  tag.simplifyWhiteSpace() );
-    tagend.remove( tagend.find( ' ', 0 ), tagend.length() );
+    tagend.remove( tagend.tqfind( ' ', 0 ), tagend.length() );
     if ( textEdit->hasSelectedText() ) {
 	textEdit->getSelection( &pfrom, &ifrom, &pto, &ito );
 	TQString buf = textEdit->selectedText();
-	buf = TQString( "<%1>%3</%2>" ).arg( tag ).arg( tagend ).arg( buf );
+	buf = TQString( "<%1>%3</%2>" ).tqarg( tag ).tqarg( tagend ).tqarg( buf );
 	textEdit->removeSelectedText();
 	textEdit->insertAt( buf, pfrom, ifrom );
 	textEdit->setCursorPosition( pto, ito + 2 + tag.length() );
@@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
     else {
 	int para, index;
 	textEdit->getCursorPosition( &para, &index );
-	textEdit->insert( TQString( "<%1></%2>" ).arg( tag ).arg( tagend ) );
+	textEdit->insert( TQString( "<%1></%2>" ).tqarg( tag ).tqarg( tagend ) );
 	index += 2 + tag.length();
 	textEdit->setCursorPosition( para, index  );
     }
@@ -363,7 +363,7 @@ void MultiLineEditor::showFontDialog()
 	if ( fd->getFont() != "default" )
 	    font = "face=\"" + fd->getFont() + "\"";
 	TQString tag( TQString( "font %1 %2 %3" )
-	             .arg( color ).arg( size ).arg( font ) );
+	             .tqarg( color ).tqarg( size ).tqarg( font ) );
 
 	if ( selText )
 	    textEdit->setSelection( pfrom, ifrom, pto, ito );
@@ -378,16 +378,16 @@ TQString MultiLineEditor::getStaticText()
     return staticText.stripWhiteSpace();
 }
 
-TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap )
+TQString MultiLineEditor::getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap )
 {
-    MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text );
+    MultiLineEditor medit( TRUE, richtextMode, tqparent, 0, 0, text );
     if ( richtextMode )
 	medit.setUseWrapping( *useWrap );
     if ( medit.exec() == TQDialog::Accepted ) {
 	*useWrap = medit.useWrapping();
 	return medit.getStaticText();
     }
-    return TQString::null;
+    return TQString();
 }
 
 void MultiLineEditor::changeWrapMode( bool b )
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index 4df9ddbc..b39aea71 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,30 +29,32 @@
 
 #include <tqaction.h>
 #include <tqtextedit.h>
-#include <private/qrichtext_p.h>
+#include <private/tqrichtext_p.h>
 #include "multilineeditor.h"
 
 class FormWindow;
 class TQToolBar;
-class QTextDocument;
+class TQTextDocument;
 
-class TextEdit : public QTextEdit
+class TextEdit : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TextEdit( TQWidget *parent = 0, const char *name = 0 );
-    QTextDocument *document() const { return TQTextEdit::document(); }
-    QTextParagraph *paragraph();
+    TextEdit( TQWidget *tqparent = 0, const char *name = 0 );
+    TQTextDocument *document() const { return TQTextEdit::document(); }
+    TQTextParagraph *paragraph();
 
 };
 
-class ToolBarItem : public QAction
+class ToolBarItem : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ToolBarItem( TQWidget *parent, TQWidget *toolBar,
+    ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
                  const TQString &label, const TQString &tagstr,
 		 const TQIconSet &icon, const TQKeySequence &key = 0 );
     ~ToolBarItem();
@@ -69,13 +71,14 @@ private:
 class MultiLineEditor : public MultiLineEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
-		     FormWindow *fw, const TQString &text = TQString::null );
+    MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
+		     FormWindow *fw, const TQString &text = TQString() );
     bool useWrapping() const;
     void setUseWrapping( bool );
-    static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap );
+    static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap );
     int exec();
 
 protected slots:
diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui
index cdfae7e4..c5f8f202 100644
--- a/kdevdesigner/designer/newform.ui
+++ b/kdevdesigner/designer/newform.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>NewFormBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -91,14 +91,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>Create a new form using the selected template.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -131,7 +131,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QIconView" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>templateView</cstring>
             </property>
@@ -151,7 +151,7 @@
                 <string>Displays a list of the available templates.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>labelProject</cstring>
             </property>
@@ -162,7 +162,7 @@
                 <cstring>projectCombo</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>projectCombo</cstring>
             </property>
@@ -177,7 +177,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -201,25 +201,25 @@
     </connection>
     <connection>
         <sender>projectCombo</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>NewFormBase</receiver>
-        <slot>projectChanged(const QString&amp;)</slot>
+        <slot>projectChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>currentChanged(QIconViewItem*)</signal>
+        <signal>currentChanged(TQIconViewItem*)</signal>
         <receiver>NewFormBase</receiver>
-        <slot>itemChanged(QIconViewItem*)</slot>
+        <slot>itemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>doubleClicked(QIconViewItem*)</signal>
+        <signal>doubleClicked(TQIconViewItem*)</signal>
         <receiver>NewFormBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>returnPressed(QIconViewItem*)</signal>
+        <signal>returnPressed(TQIconViewItem*)</signal>
         <receiver>NewFormBase</receiver>
         <slot>accept()</slot>
     </connection>
@@ -230,9 +230,9 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
-    <slot access="protected">itemChanged( QIconViewItem * )</slot>
-    <slot access="protected">projectChanged( const QString &amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+    <slot access="protected">itemChanged( TQIconViewItem * )</slot>
+    <slot access="protected">projectChanged( const TQString &amp; )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index 80bc6463..6fae9015 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -77,20 +77,20 @@ void FormItem::insert( Project *pro )
     FormFile *ff = new FormFile( FormFile::createUnnamedFileName(), TRUE, pro );
     fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n );
     fw->setProject( pro );
-    MetaDataBase::addEntry( fw );
+    MetaDataBase::addEntry( TQT_TQOBJECT(fw) );
     if ( fType == Widget ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == Dialog ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() );
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == Wizard ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWizard" ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIZARD_OBJECT_NAME_STRING ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == MainWindow ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQMainWindow" ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQMAINWINDOW_OBJECT_NAME_STRING ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     }
@@ -109,10 +109,10 @@ void FormItem::insert( Project *pro )
 
     // the wizard might have changed a lot, lets update everything
     MainWindow::self->actioneditor()->setFormWindow( fw );
-    MainWindow::self->objectHierarchy()->setFormWindow( fw, fw );
+    MainWindow::self->objectHierarchy()->setFormWindow( fw, TQT_TQOBJECT(fw) );
     MainWindow::self->objectHierarchy()->formDefinitionView()->refresh();
     MainWindow::self->objectHierarchy()->rebuild();
-    fw->killAccels( fw );
+    fw->killAccels( TQT_TQOBJECT(fw) );
     fw->project()->setModified( TRUE );
     fw->setFocus();
     if ( !pro->isDummy() ) {
@@ -138,12 +138,12 @@ static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace )
 	lst << w->name();
     }
 
-    if ( lst.findIndex( fw->name() ) == -1 )
+    if ( lst.tqfindIndex( fw->name() ) == -1 )
 	return;
     TQString origName = fw->name();
     TQString n = origName;
     int i = 1;
-    while ( lst.findIndex( n ) != -1 ) {
+    while ( lst.tqfindIndex( n ) != -1 ) {
 	n = origName + TQString::number( i++ );
     }
     fw->setName( n );
@@ -158,13 +158,13 @@ void CustomFormItem::insert( Project *pro )
 	FormFile *ff = new FormFile( filename, TRUE, pro );
 	if ( !resource.load( ff ) ) {
 	    TQMessageBox::information( MainWindow::self, i18n("Load Template"),
-				      i18n("Could not load form description from template '%1'" ).arg( filename ) );
+				      i18n("Could not load form description from template '%1'" ).tqarg( filename ) );
 	    delete ff;
 	    return;
 	}
-	ff->setFileName( TQString::null );
+	ff->setFileName( TQString() );
 	if ( MainWindow::self->formWindow() ) {
-	    MainWindow::self->formWindow()->setFileName( TQString::null );
+	    MainWindow::self->formWindow()->setFileName( TQString() );
 	    unifyFormName( MainWindow::self->formWindow(), MainWindow::self->qWorkspace() );
 	    if ( !pro->isDummy() ) {
 		MainWindow::self->formWindow()->setSavePixmapInProject( TRUE );
@@ -249,7 +249,7 @@ void NewForm::insertTemplates( TQIconView *tView,
     TQStringList languages = MetaDataBase::languages();
     if ( !MainWindow::self->singleProjectMode() ) {
 	for ( it = languages.begin(); it != languages.end(); ++it ) {
-	    ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) );
+	    ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).tqarg( *it ) );
 	    allItems.append( pi );
 	    pi->setLanguage( *it );
 	    pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) );
@@ -282,7 +282,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 
 	TQString templPath = templatePath;
 	TQStringList templRoots;
-	const char *qtdir = getenv( "QTDIR" );
+	const char *qtdir = getenv( "TQTDIR" );
 	if(qtdir)
 	    templRoots << qtdir;
 	templRoots << qInstallPathData();
@@ -297,16 +297,16 @@ void NewForm::insertTemplates( TQIconView *tView,
 	}
 	if ( !templPath.isEmpty() ) {
 	    TQDir dir( templPath  );
-	    const QFileInfoList *filist = dir.entryInfoList( TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name );
+	    const TQFileInfoList *filist = dir.entryInfoList( TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name );
 	    if ( filist ) {
-		QFileInfoListIterator it( *filist );
+		TQFileInfoListIterator it( *filist );
 		TQFileInfo *fi;
 		while ( ( fi = it.current() ) != 0 ) {
 		    ++it;
 		    if ( !fi->isFile() || fi->extension() != "ui" )
 			continue;
 		    TQString name = fi->baseName();
-		    name = name.replace( '_', ' ' );
+		    name = name.tqreplace( '_', ' ' );
 		    CustomFormItem *ci = new CustomFormItem( tView, name );
 		    allItems.append( ci );
 		    ci->setDragEnabled( FALSE );
@@ -364,9 +364,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath )
     projectChanged( i18n( "<No Project>" ) );
 }
 
-NewForm::NewForm( TQWidget *parent, const TQStringList& projects,
+NewForm::NewForm( TQWidget *tqparent, const TQStringList& projects,
 		  const TQString& currentProject, const TQString &templatePath )
-    : NewFormBase( parent, 0, TRUE )
+    : NewFormBase( tqparent, 0, TRUE )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
diff --git a/kdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h
index b85e36c9..1ef5c1db 100644
--- a/kdevdesigner/designer/newformimpl.h
+++ b/kdevdesigner/designer/newformimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,7 +32,7 @@
 
 class Project;
 
-class NewItem : public QIconViewItem
+class NewItem : public TQIconViewItem
 {
 public:
     enum Type {
@@ -143,10 +143,11 @@ private:
 class NewForm : public NewFormBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     NewForm( TQIconView *templateView, const TQString &templatePath );
-    NewForm( TQWidget *parent, const TQStringList& projects,
+    NewForm( TQWidget *tqparent, const TQStringList& projects,
 	     const TQString& currentProject, const TQString &templatePath );
     void insertTemplates( TQIconView*, const TQString& );
     void accept();
diff --git a/kdevdesigner/designer/orderindicator.cpp b/kdevdesigner/designer/orderindicator.cpp
index f3c50feb..115d68f8 100644
--- a/kdevdesigner/designer/orderindicator.cpp
+++ b/kdevdesigner/designer/orderindicator.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -69,7 +69,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
     TQFont f( font() );
     f.setBold( TRUE );
     setFont( f );
-    resize( QMAX( w, h ), h );
+    resize( TQMAX( w, h ), h );
     update(); // in case the size didn't change
     reposition();
     show();
@@ -78,7 +78,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
 
 void OrderIndicator::reposition()
 {
-    TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
+    TQPoint p =tqparentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
     move( p - TQPoint( width()/3, height()/3 ) );
 }
 
diff --git a/kdevdesigner/designer/orderindicator.h b/kdevdesigner/designer/orderindicator.h
index 5dd0185b..f936ac6e 100644
--- a/kdevdesigner/designer/orderindicator.h
+++ b/kdevdesigner/designer/orderindicator.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,9 +31,10 @@
 
 class FormWindow;
 
-class OrderIndicator : public QWidget
+class OrderIndicator : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     OrderIndicator( int i, TQWidget* w, FormWindow* fw );
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index 17477a95..ec7418db 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -42,10 +42,10 @@
 static TQTextEdit *debugoutput = 0;
 bool debugToStderr = FALSE;
 
-QtMsgHandler OutputWindow::oldMsgHandler = 0;
+TQtMsgHandler OutputWindow::oldMsgHandler = 0;
 
-OutputWindow::OutputWindow( TQWidget *parent )
-    : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 )
+OutputWindow::OutputWindow( TQWidget *tqparent )
+    : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 )
 {
     setupDebug();
     setupError();
@@ -57,14 +57,14 @@ OutputWindow::~OutputWindow()
     debugoutput = debugView = 0;
     errorView = 0;
     if ( !debugToStderr )
-	qInstallMsgHandler( oldMsgHandler );
+	tqInstallMsgHandler( oldMsgHandler );
     delete iface;
 }
 
 void OutputWindow::shuttingDown()
 {
     if ( !debugToStderr )
-	qInstallMsgHandler( oldMsgHandler );
+	tqInstallMsgHandler( oldMsgHandler );
 }
 
 void OutputWindow::setupError()
@@ -86,13 +86,13 @@ void OutputWindow::setupError()
     errorView->addColumn( i18n( "Location" ) );
     errorView->setResizeMode( TQListView::LastColumn );
     errorView->setColumnWidth( 0, errorView->fontMetrics().width( "WARNING1234" ) );
-    errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP" ) );
+    errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOP" ) );
     errorView->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) );
-    errorView->setColumnAlignment( 2, Qt::AlignRight );
+    errorView->setColumnAlignment( 2, TQt::AlignRight );
     errorView->setAllColumnsShowFocus( TRUE );
 }
 
-static void debugMessageOutput( QtMsgType type, const char *msg )
+static void debugMessageOutput( TQtMsgType type, const char *msg )
 {
     TQString s( msg );
     s += "\n";
@@ -109,7 +109,7 @@ static void debugMessageOutput( QtMsgType type, const char *msg )
 	abort();
     }
 
-    qApp->flush();
+    tqApp->flush();
 }
 
 void OutputWindow::setupDebug()
@@ -119,7 +119,7 @@ void OutputWindow::setupDebug()
     addTab( debugView, "Debug Output" );
 
     if ( !debugToStderr )
-	oldMsgHandler = qInstallMsgHandler( debugMessageOutput );
+	oldMsgHandler = tqInstallMsgHandler( debugMessageOutput );
 }
 
 void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,
@@ -175,14 +175,14 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i )
 
 
 
-ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line,
+ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line,
 		      const TQString &locationString, TQObject *locationObject )
-    : TQListViewItem( parent, after )
+    : TQListViewItem( tqparent, after )
 {
     setMultiLinesEnabled( TRUE );
     TQString m( message );
     type = m.startsWith( "Warning: " ) ? Warning : Error;
-    m = m.mid( m.find( ':' ) + 1 );
+    m = m.mid( m.tqfind( ':' ) + 1 );
     setText( 0, type == Error ? "Error" : "Warning" );
     setText( 1, m );
     setText( 2, TQString::number( line ) );
@@ -190,20 +190,20 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString
     object = locationObject;
     read = !after;
     if ( !after ) {
-	parent->setSelected( this, TRUE );
-	parent->setCurrentItem( this );
+	tqparent->setSelected( this, TRUE );
+	tqparent->setCurrentItem( this );
     }
 }
 
 void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
-			   int column, int width, int alignment )
+			   int column, int width, int tqalignment )
 {
     TQColorGroup g( cg );
-    g.setColor( TQColorGroup::Text, type == Error ? Qt::red : Qt::darkYellow );
+    g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow );
     if ( !read ) {
 	TQFont f( p->font() );
 	f.setBold( TRUE );
 	p->setFont( f );
     }
-    TQListViewItem::paintCell( p, g, column, width, alignment );
+    TQListViewItem::paintCell( p, g, column, width, tqalignment );
 }
diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h
index 6e9ed4a1..9e1a5aaf 100644
--- a/kdevdesigner/designer/outputwindow.h
+++ b/kdevdesigner/designer/outputwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,18 +36,18 @@ struct DesignerOutputDock;
 class TQTextEdit;
 class TQListView;
 
-class ErrorItem : public QListViewItem
+class ErrorItem : public TQListViewItem
 {
 public:
     enum Type { Error, Warning };
 
-    ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line,
+    ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line,
 	       const TQString &locationString, TQObject *locationObject );
 
     void paintCell( TQPainter *, const TQColorGroup & cg,
-		    int column, int width, int alignment );
+		    int column, int width, int tqalignment );
 
-    void setRead( bool b ) { read = b; repaint(); }
+    void setRead( bool b ) { read = b; tqrepaint(); }
 
     TQObject *location() const { return object; }
     int line() const { return text( 2 ).toInt(); }
@@ -59,12 +59,13 @@ private:
 
 };
 
-class OutputWindow : public QTabWidget
+class OutputWindow : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    OutputWindow( TQWidget *parent );
+    OutputWindow( TQWidget *tqparent );
     ~OutputWindow();
 
     void setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,
@@ -79,7 +80,7 @@ public:
 
     void shuttingDown();
 
-    static QtMsgHandler oldMsgHandler;
+    static TQtMsgHandler oldMsgHandler;
 
 private slots:
     void currentErrorChanged( TQListViewItem *i );
diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui
index 8a87f0ea..79e04792 100644
--- a/kdevdesigner/designer/paletteeditor.ui
+++ b/kdevdesigner/designer/paletteeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PaletteEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupAutoPalette</cstring>
             </property>
@@ -69,7 +69,7 @@
             <property name="title">
                 <string>Build Palette</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <hbox>
@@ -82,7 +82,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelMainColor</cstring>
                     </property>
@@ -92,7 +92,7 @@
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;3-D effects:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignAuto|AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -140,7 +140,7 @@
                         <string>Choose the effect-color for the generated palette.</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelMainColor2</cstring>
                     </property>
@@ -150,7 +150,7 @@
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -168,7 +168,7 @@
                     <property name="text">
                         <string>Back&amp;ground:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignAuto|AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -208,14 +208,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>btnAdvanced</cstring>
                     </property>
@@ -225,7 +225,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox126</cstring>
             </property>
@@ -248,7 +248,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -262,7 +262,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -273,7 +273,7 @@
                                 <cstring>paletteCombo</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Active Palette</string>
@@ -308,7 +308,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -322,7 +322,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -343,14 +343,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -367,7 +367,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kdevdesigner/designer/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui
index faa211c1..13c4615e 100644
--- a/kdevdesigner/designer/paletteeditoradvanced.ui
+++ b/kdevdesigner/designer/paletteeditoradvanced.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PaletteEditorAdvancedBase</cstring>
     </property>
@@ -47,7 +47,7 @@
         <bool>true</bool>
     </property>
     <property name="whatsThis" stdset="0">
-        <string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</string>
+        <string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget tqlayouts in the preview section.&lt;/p&gt;</string>
     </property>
     <vbox>
         <property name="name">
@@ -59,7 +59,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout14</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <cstring>paletteCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Active Palette</string>
@@ -112,7 +112,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -135,7 +135,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBuildInactive</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBuildDisabled</cstring>
                     </property>
@@ -159,7 +159,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupCentral</cstring>
             </property>
@@ -176,7 +176,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Background</string>
@@ -242,7 +242,7 @@
                         <string>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central color roles are: &lt;ul&gt; &lt;li&gt;Background - general background color.&lt;/li&gt; &lt;li&gt;Foreground - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as the background color for example, for text entry widgets; it is usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the forground color used with Base. Usually this is the same as the Foreground, in which case it must provide good contrast both with the Background and with the Base. &lt;/li&gt; &lt;li&gt;Button - general button background color; useful where buttons need a background different from Background, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color used to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from Foreground and contrasts well with, for example, black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout32_2</cstring>
                     </property>
@@ -266,14 +266,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>labelPixmap</cstring>
                             </property>
@@ -313,7 +313,7 @@
                                 <string>Choose a pixmap file for the selected central color role.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>labelCentral</cstring>
                             </property>
@@ -323,7 +323,7 @@
                                     <vsizetype>1</vsizetype>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -363,7 +363,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupEffect</cstring>
             </property>
@@ -380,7 +380,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout32_3</cstring>
                     </property>
@@ -394,7 +394,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>checkBuildEffect</cstring>
                             </property>
@@ -411,7 +411,7 @@
                                 <string>Check to let 3D-effect colors be calculated from the button-color.</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Light</string>
@@ -449,7 +449,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout31_2</cstring>
                     </property>
@@ -473,14 +473,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>labelEffect</cstring>
                             </property>
@@ -490,7 +490,7 @@
                                     <vsizetype>1</vsizetype>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -530,7 +530,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -544,7 +544,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -565,14 +565,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -589,7 +589,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
index 86399bdf..bf05e0e5 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -41,7 +41,7 @@
     Class used by PaletteEditor for bold combobox items
 */
 
-class BoldListBoxText : public QListBoxText
+class BoldListBoxText : public TQListBoxText
 {
 public:
     BoldListBoxText( TQString text, TQListBox* lb = 0 );
@@ -65,9 +65,9 @@ void BoldListBoxText::paint( TQPainter* painter )
     TQListBoxText::paint( painter );
 }
 
-PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent,
+PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent,
 					      const char * name, bool modal, WFlags f )
-    : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0)
+    : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0)
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
@@ -250,15 +250,15 @@ void PaletteEditorAdvanced::onCentral( int item )
     case 0:
     default:
 	c = editPalette.active().color( centralFromItem(item) );
-	p = editPalette.active().brush( centralFromItem(item) ).pixmap();
+	p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap();
 	break;
     case 1:
 	c = editPalette.inactive().color( centralFromItem(item) );
-	p = editPalette.inactive().brush( centralFromItem(item) ).pixmap();
+	p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap();
 	break;
     case 2:
 	c =  editPalette.disabled().color( centralFromItem(item) );
-	p = editPalette.disabled().brush( centralFromItem(item) ).pixmap();
+	p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap();
 	break;
     }
 
@@ -514,17 +514,17 @@ void PaletteEditorAdvanced::updateStyledButtons()
     default:
 	central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     case 1:
 	central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     case 2:
 	central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     }
 
@@ -619,10 +619,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode )
 }
 
 TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init,
-					    BackgroundMode mode, TQWidget* parent,
+					    BackgroundMode mode, TQWidget* tqparent,
 					    const char* name, FormWindow *fw )
 {
-    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE );
+    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, TRUE );
     dlg->setupBackgroundMode( mode );
 
     if ( init != TQPalette() )
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h
index 1794d91f..477a5a79 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.h
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,13 +34,14 @@ class FormWindow;
 class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0,
+    PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent=0, const char * name=0,
 			   bool modal=FALSE, WFlags f=0 );
     ~PaletteEditorAdvanced();
 
     static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground,
-				TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 );
+				TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 );
 
 protected slots:
     void paletteSelected(int);
diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp
index a6489370..edeba05f 100644
--- a/kdevdesigner/designer/paletteeditorimpl.cpp
+++ b/kdevdesigner/designer/paletteeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,8 +36,8 @@
 #include <tqapplication.h>
 #include <tqpushbutton.h>
 
-PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f )
-    : PaletteEditorBase( parent, name, modal, f ), formWindow( fw )
+PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f )
+    : PaletteEditorBase( tqparent, name, modal, f ), formWindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
@@ -281,9 +281,9 @@ TQPalette PaletteEditor::pal() const
 }
 
 TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode,
-				    TQWidget* parent, const char* name, FormWindow *fw )
+				    TQWidget* tqparent, const char* name, FormWindow *fw )
 {
-    PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE );
+    PaletteEditor* dlg = new PaletteEditor( fw, tqparent, name, TRUE );
     dlg->setupBackgroundMode( mode );
 
     if ( init != TQPalette() )
diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h
index ed911faa..ed1756ed 100644
--- a/kdevdesigner/designer/paletteeditorimpl.h
+++ b/kdevdesigner/designer/paletteeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,13 +34,14 @@ class FormWindow;
 class PaletteEditor : public PaletteEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
+    PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
     ~PaletteEditor();
 
     static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground,
-				TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 );
+				TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 );
 
 protected slots:
     void onChooseMainColor();
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 28912c62..4d6ad2ed 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,8 +56,8 @@
 static ImageIconProvider *imageIconProvider = 0;
 #endif
 
-PixmapView::PixmapView( TQWidget *parent )
-    : TQScrollView( parent )
+PixmapView::PixmapView( TQWidget *tqparent )
+    : TQScrollView( tqparent )
 {
     viewport()->setBackgroundMode( PaletteBase );
 }
@@ -66,12 +66,12 @@ void PixmapView::setPixmap( const TQPixmap &pix )
 {
     pixmap = pix;
     resizeContents( pixmap.size().width(), pixmap.size().height() );
-    viewport()->repaint( FALSE );
+    viewport()->tqrepaint( FALSE );
 }
 
 void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
 {
-    p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) );
+    p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) );
     p->drawPixmap( 0, 0, pixmap );
 }
 
@@ -89,7 +89,7 @@ void PixmapView::previewUrl( const TQUrl &u )
 
 static void buildImageFormatList( TQString &filter, TQString &all )
 {
-    all = qApp->translate( "qChoosePixmap", "All Pixmaps (" );
+    all = tqApp->translate( "qChoosePixmap", "All Pixmaps (" );
     for ( uint i = 0; i < TQImageIO::outputFormats().count(); i++ ) {
 	TQString outputFormat = TQImageIO::outputFormats().at( i );
 	TQString outputExtension;
@@ -97,15 +97,15 @@ static void buildImageFormatList( TQString &filter, TQString &all )
 	   outputExtension = outputFormat.lower();
 	else
 	    outputExtension = "jpg;*.jpeg";
-	filter += qApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" ).
-		  arg( outputFormat ).arg( "*." + outputExtension);
+	filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )).
+		  tqarg( outputFormat ).tqarg( "*." + outputExtension);
 	all += "*." + outputExtension + ";";
     }
-    filter.prepend( all + qApp->translate( "qChoosePixmap", ")\n" ) );
-    filter += qApp->translate( "qChoosePixmap", "All Files (*)" );
+    filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) );
+    filter += tqApp->translate( "qChoosePixmap", "All Files (*)" );
 
 }
-TQStringList qChoosePixmaps( TQWidget *parent )
+TQStringList qChoosePixmaps( TQWidget *tqparent )
 {
 /*    if ( !imageIconProvider && !TQFileDialog::iconProvider() )
 	TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) );
@@ -114,21 +114,21 @@ TQStringList qChoosePixmaps( TQWidget *parent )
     TQString all;
     buildImageFormatList( filter, all );
 
-    TQFileDialog fd( TQString::null, filter, parent, 0, TRUE );
+    TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
     fd.setMode( TQFileDialog::ExistingFiles );
     fd.setContentsPreviewEnabled( TRUE );
     PixmapView *pw = new PixmapView( &fd );
     fd.setContentsPreview( pw, pw );
     fd.setViewMode( TQFileDialog::List );
     fd.setPreviewMode( TQFileDialog::Contents );
-    fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) );
+    fd.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) );
     if ( fd.exec() == TQDialog::Accepted )
 	return fd.selectedFiles();
     return TQStringList();*/
     TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
-    KFileDialog dlg(TQString::null, mimetypes.join(" "), parent, "filedialog", true);
+    KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
     dlg.setOperationMode( KFileDialog::Opening );
-    dlg.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) );
+    dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) );
     dlg.setMode( KFile::Files );
     KImageFilePreview *ip = new KImageFilePreview( &dlg );
     dlg.setPreviewWidget( ip );
@@ -137,7 +137,7 @@ TQStringList qChoosePixmaps( TQWidget *parent )
     return TQStringList();
 }
 
-TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn )
+TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn )
 {
 #if defined(DESIGNER)
     if ( !fw || fw->savePixmapInline() ) {
@@ -148,13 +148,13 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	TQString all;
 	buildImageFormatList( filter, all );
 
-	TQFileDialog fd( TQString::null, filter, parent, 0, TRUE );
+	TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
 	fd.setContentsPreviewEnabled( TRUE );
 	PixmapView *pw = new PixmapView( &fd );
 	fd.setContentsPreview( pw, pw );
 	fd.setViewMode( TQFileDialog::List );
 	fd.setPreviewMode( TQFileDialog::Contents );
-	fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
+	fd.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
 	if ( fd.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix( fd.selectedFile() );
 	    if ( fn )
@@ -163,9 +163,9 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	    return pix;
 	}*/
         TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
-        KFileDialog dlg(TQString::null, mimetypes.join(" "), parent, "filedialog", true);
+        KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
         dlg.setOperationMode( KFileDialog::Opening );
-        dlg.setCaption( qApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
+        dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
         dlg.setMode( KFile::File );
         KImageFilePreview *ip = new KImageFilePreview( &dlg );
         dlg.setPreviewWidget( ip );
@@ -174,44 +174,44 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
             TQPixmap pix( dlg.selectedURL().path() );
             if ( fn )
                 *fn = dlg.selectedURL().path();
-            MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dlg.selectedURL().path() );
+            MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dlg.selectedURL().path() );
             return pix;
         }
     } else if ( fw && fw->savePixmapInProject() ) {
-	PixmapCollectionEditor dia( parent, 0, TRUE );
+	PixmapCollectionEditor dia( tqparent, 0, TRUE );
 	dia.setProject( fw->project() );
 	dia.setChooserMode( TRUE );
-	dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) );
+	dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) );
 	if ( dia.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix( fw->project()->pixmapCollection()->pixmap( dia.viewPixmaps->currentItem()->text() ) );
-	    MetaDataBase::setPixmapKey( fw, pix.serialNumber(), dia.viewPixmaps->currentItem()->text() );
+	    MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), pix.serialNumber(), dia.viewPixmaps->currentItem()->text() );
 	    return pix;
 	}
     } else {
-	PixmapFunction dia( parent, 0, TRUE );
+	PixmapFunction dia( tqparent, 0, TRUE );
 	TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 	dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" );
-	dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) );
+	dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) );
 	dia.editArguments->setFocus();
 	if ( dia.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix;
 	    // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
 	    pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() );
 
-	    MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dia.editArguments->text() );
+	    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() );
 	    return pix;
 	}
     }
 #else
-    Q_UNUSED( parent );
+    Q_UNUSED( tqparent );
     Q_UNUSED( fw );
     Q_UNUSED( old );
 #endif
     return TQPixmap();
 }
 
-ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name )
-    : TQFileIconProvider( parent, name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
+ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name )
+    : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
 {
     fmts = TQImage::inputFormats();
 }
@@ -223,7 +223,7 @@ ImageIconProvider::~ImageIconProvider()
 const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi )
 {
     TQString ext = fi.extension().upper();
-    if ( fmts.contains( ext ) ) {
+    if ( fmts.tqcontains( ext ) ) {
 	return &imagepm;
     } else {
 	return TQFileIconProvider::pixmap( fi );
diff --git a/kdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h
index a03c6878..2513a4c9 100644
--- a/kdevdesigner/designer/pixmapchooser.h
+++ b/kdevdesigner/designer/pixmapchooser.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,12 +35,13 @@
 class FormWindow;
 
 class PixmapView : public TQScrollView,
-		   public QFilePreview
+		   public TQFilePreview
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PixmapView( TQWidget *parent );
+    PixmapView( TQWidget *tqparent );
     void setPixmap( const TQPixmap &pix );
     void drawContents( TQPainter *p, int, int, int, int );
     void previewUrl( const TQUrl &u );
@@ -50,12 +51,13 @@ private:
 
 };
 
-class ImageIconProvider : public QFileIconProvider
+class ImageIconProvider : public TQFileIconProvider
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ImageIconProvider( TQWidget *parent = 0, const char *name = 0 );
+    ImageIconProvider( TQWidget *tqparent = 0, const char *name = 0 );
     ~ImageIconProvider();
 
     const TQPixmap *pixmap( const TQFileInfo &fi );
@@ -66,7 +68,7 @@ private:
 
 };
 
-TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(),  TQString *fn = 0 );
-TQStringList qChoosePixmaps( TQWidget *parent );
+TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(),  TQString *fn = 0 );
+TQStringList qChoosePixmaps( TQWidget *tqparent );
 
 #endif
diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp
index d0692de1..880423a3 100644
--- a/kdevdesigner/designer/pixmapcollection.cpp
+++ b/kdevdesigner/designer/pixmapcollection.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/pixmapcollection.h b/kdevdesigner/designer/pixmapcollection.h
index 3fb12a36..10d630fc 100644
--- a/kdevdesigner/designer/pixmapcollection.h
+++ b/kdevdesigner/designer/pixmapcollection.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,7 +43,7 @@ public:
 	TQPixmap pix;
 	TQString name;
 	TQString absname;
-	Q_DUMMY_COMPARISON_OPERATOR( Pixmap )
+	TQ_DUMMY_COMPARISON_OPERATOR( Pixmap )
     };
 
     PixmapCollection( Project *pro );
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui
index c4888193..5d7608fd 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PixmapCollectionEditor</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QIconView">
+        <widget class="TQIconView">
             <property name="name">
                 <cstring>viewPixmaps</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>&amp;Add...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton3</cstring>
                     </property>
@@ -101,14 +101,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <string>&amp;Cancel</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonClose</cstring>
                     </property>
@@ -157,9 +157,9 @@
     </connection>
     <connection>
         <sender>viewPixmaps</sender>
-        <signal>currentChanged(QIconViewItem*)</signal>
+        <signal>currentChanged(TQIconViewItem*)</signal>
         <receiver>PixmapCollectionEditor</receiver>
-        <slot>currentChanged(QIconViewItem*)</slot>
+        <slot>currentChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -190,9 +190,9 @@
     <include location="local" impldecl="in implementation">pixmapcollection.h</include>
     <include location="local" impldecl="in implementation">pixmapchooser.h</include>
     <include location="local" impldecl="in implementation">project.h</include>
-    <include location="global" impldecl="in implementation">qfileinfo.h</include>
-    <include location="global" impldecl="in implementation">qimage.h</include>
-    <include location="global" impldecl="in declaration">qpixmap.h</include>
+    <include location="global" impldecl="in implementation">tqfileinfo.h</include>
+    <include location="global" impldecl="in implementation">tqimage.h</include>
+    <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="local" impldecl="in implementation">pixmapcollectioneditor.ui.h</include>
 </includes>
 <forwards>
@@ -202,17 +202,17 @@
     <variable>Project *project;</variable>
     <variable>bool chooser;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>addPixmap()</slot>
     <slot>removePixmap()</slot>
     <slot>updateView()</slot>
-    <slot>currentChanged(QIconViewItem * i)</slot>
+    <slot>currentChanged(TQIconViewItem * i)</slot>
     <slot>setChooserMode(bool c)</slot>
-    <slot>setCurrentItem(const QString &amp; name)</slot>
+    <slot>setCurrentItem(const TQString &amp; name)</slot>
     <slot>setProject(Project * pro)</slot>
-    <slot returnType="QPixmap">scaledPixmap(const QPixmap &amp; p)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot returnType="TQPixmap">scaledPixmap(const TQPixmap &amp; p)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
index 03cd300c..1865f72f 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
@@ -2,15 +2,15 @@
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -18,7 +18,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -61,7 +61,7 @@ void PixmapCollectionEditor::addPixmap()
     }
 
     updateView();
-    TQIconViewItem *item = viewPixmaps->findItem( lastName );
+    TQIconViewItem *item = viewPixmaps->tqfindItem( lastName );
     if ( item ) {
 	viewPixmaps->setCurrentItem( item );
 	viewPixmaps->ensureItemVisible( item );
@@ -124,7 +124,7 @@ void PixmapCollectionEditor::setChooserMode( bool c )
 
 void PixmapCollectionEditor::setCurrentItem( const TQString & name )
 {
-    TQIconViewItem *i = viewPixmaps->findItem( name );
+    TQIconViewItem *i = viewPixmaps->tqfindItem( name );
     if ( i ) {
 	viewPixmaps->setCurrentItem( i );
 	currentChanged( i );
diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui
index 7eb5fb94..5f34bf37 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/kdevdesigner/designer/pixmapfunction.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PixmapFunction</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <cstring>editArguments</cstring>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>Frame9</cstring>
             </property>
@@ -77,9 +77,9 @@
             <property name="lineWidth">
                 <number>2</number>
             </property>
-            <property name="layoutMargin" stdset="0">
+            <property name="tqlayoutMargin" stdset="0">
             </property>
-            <property name="layoutSpacing" stdset="0">
+            <property name="tqlayoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -91,7 +91,7 @@
                 <property name="spacing">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelFunction</cstring>
                     </property>
@@ -607,7 +607,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -877,14 +877,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -898,7 +898,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -919,14 +919,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -940,7 +940,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -969,7 +969,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 6e208de1..b106c3db 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,10 +51,10 @@
 
 // Drag Object Declaration -------------------------------------------
 
-class PopupMenuEditorItemPtrDrag : public QStoredDrag
+class PopupMenuEditorItemPtrDrag : public TQStoredDrag
 {
 public:
-    PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0,
+    PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * tqparent = 0,
 				const char * name = 0 );
     ~PopupMenuEditorItemPtrDrag() {};
     static bool canDecode( TQDragMoveEvent * e );
@@ -64,12 +64,12 @@ public:
 // Drag Object Implementation ---------------------------------------
 
 PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item,
-							TQWidget * parent, const char * name )
-    : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name )
+							TQWidget * tqparent, const char * name )
+    : TQStoredDrag( "qt/popupmenueditoritemptr", tqparent, name )
 {
-    TQByteArray data( sizeof( Q_LONG ) );
+    TQByteArray data( sizeof( TQ_LONG ) );
     TQDataStream stream( data, IO_WriteOnly );
-    stream << ( Q_LONG ) item;
+    stream << ( TQ_LONG ) item;
     setEncodedData( data );
 }
 
@@ -80,13 +80,13 @@ bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
 
 bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i )
 {
-    TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" );
+    TQByteArray data = e->tqencodedData( "qt/popupmenueditoritemptr" );
     TQDataStream stream( data, IO_ReadOnly );
 
     if ( !data.size() )
 	return FALSE;
 
-    Q_LONG p = 0;
+    TQ_LONG p = 0;
     stream >> p;
     *i = ( PopupMenuEditorItem *) p;
 
@@ -95,8 +95,8 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem **
 
 // PopupMenuEditorItem Implementation -----------------------------------
 
-PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       a( 0 ),
       s( 0 ),
       m( menu ),
@@ -110,8 +110,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par
 
 
 PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu,
-					  TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+					  TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       a( action ),
       s( 0 ),
       m( menu ),
@@ -119,15 +119,15 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m
       removable( TRUE )
 {
     init();
-    if ( /*a->name() == "qt_separator_action" ||*/ ::qt_cast<QSeparatorAction*>(a) )
+    if ( /*a->name() == "qt_separator_action" ||*/ ::tqqt_cast<TQSeparatorAction*>(a) )
 	separator = TRUE;
-    if ( a && a->children() )
+    if ( a && !a->childrenListObject().isEmpty() )
  	a->installEventFilter( this );
 }
 
 PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu,
-					  TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+					  TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       a( item->a ),
       s( 0 ),
       m( menu ),
@@ -135,7 +135,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuE
       removable( item->removable )
 {
     init();
-    if ( ::qt_cast<TQActionGroup*>(a) )
+    if ( ::tqqt_cast<TQActionGroup*>(a) )
  	a->installEventFilter( this );
 }
 
@@ -151,9 +151,9 @@ void PopupMenuEditorItem::init()
 	if ( m && !isSeparator() ) {
 	    s = new PopupMenuEditor( m->formWindow(), m );
 	    TQString n = "PopupMenuEditor";
-	    m->formWindow()->unify( s, n, TRUE );
+	    m->formWindow()->unify( TQT_TQOBJECT(s), n, TRUE );
 	    s->setName( n );
-	    MetaDataBase::addEntry( s );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(s) );
 	}
     }
 }
@@ -170,12 +170,12 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const
 void PopupMenuEditorItem::setVisible( bool enable )
 {
     if ( a )
-	a->setVisible( enable );
+	a->tqsetVisible( enable );
 }
 
 bool PopupMenuEditorItem::isVisible() const
 {
-    TQActionGroup *g = ::qt_cast<TQActionGroup*>(a);
+    TQActionGroup *g = ::tqqt_cast<TQActionGroup*>(a);
     if ( g )
 	return ( g->isVisible() && g->usesDropDown() );
     else if ( a )
@@ -212,25 +212,25 @@ int PopupMenuEditorItem::count() const
 {
     if ( s ) {
 	return s->count();
-    } else if ( ::qt_cast<TQActionGroup*>(a) ) {
-	const TQObjectList * l = a->children();
-	if ( l )
-	    return l->count();
+    } else if ( ::tqqt_cast<TQActionGroup*>(a) ) {
+	const TQObjectList l = a->childrenListObject();
+	if ( !l.isEmpty() )
+	    return l.count();
     }
     return 0;
 }
 
 bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event )
 {
-    if ( ! ::qt_cast<TQActionGroup*>( o ) )
+    if ( ! ::tqqt_cast<TQActionGroup*>( o ) )
 	return FALSE;
     if ( event->type() == TQEvent::ChildInserted ) {
 	TQChildEvent * ce = ( TQChildEvent * ) event;
-	TQObject * c = ce->child();
-	TQAction * action = ::qt_cast<TQAction*>( c );
-	if ( s->find( action ) != -1 ) // avoid duplicates
+	TQObject * c = TQT_TQOBJECT(ce->child());
+	TQAction * action = ::tqqt_cast<TQAction*>( c );
+	if ( s->tqfind( action ) != -1 ) // avoid duplicates
 	    return FALSE;
-	TQActionGroup * actionGroup = ::qt_cast<TQActionGroup*>( c );
+	TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c );
 	if ( actionGroup )
 	    s->insert( actionGroup );
  	else if ( action )
@@ -242,7 +242,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event )
 void PopupMenuEditorItem::selfDestruct()
 {
     hideMenu();
-    int i = m->find( s );
+    int i = m->tqfind( s );
     if ( i != -1 && i < m->count() )
 	m->remove( i ); // remove this item
     a = 0; // the selfDestruct call was caused by the deletion of the action
@@ -255,10 +255,10 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0;
 int PopupMenuEditor::clipboardOperation = 0;
 PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0;
 
-PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name )
+PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
     : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ),
       formWnd( fw ),
-      parentMenu( parent ),
+      tqparentMenu( tqparent ),
       iconWidth( 0 ),
       textWidth( 0 ),
       accelWidth( 0 ),
@@ -271,10 +271,10 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char
 }
 
 PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu,
-				  TQWidget * parent, const char * name )
+				  TQWidget * tqparent, const char * name )
     : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ),
       formWnd( fw ),
-      parentMenu( parent ),
+      tqparentMenu( tqparent ),
       iconWidth( menu->iconWidth ),
       textWidth( menu->textWidth ),
       accelWidth( menu->accelWidth ),
@@ -304,7 +304,7 @@ void PopupMenuEditor::init()
     addSeparator.action()->setMenuText( i18n("new separator") );
 
     setAcceptDrops( TRUE );
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 
     lineEdit = new TQLineEdit( this );
     lineEdit->hide();
@@ -314,8 +314,8 @@ void PopupMenuEditor::init()
     lineEdit->setBackgroundMode(PaletteButton);
     lineEdit->installEventFilter( this );
 
-    dropLine = new TQWidget( this, 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop );
-    dropLine->setBackgroundColor( Qt::red );
+    dropLine = new TQWidget( this, 0, TQt::WStyle_NoBorder | WStyle_StaysOnTop );
+    dropLine->setBackgroundColor( TQt::red );
     dropLine->hide();
 
     hide();
@@ -335,10 +335,10 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index )
 	    currentIndex = index;
     }
     item->m = this;
-    item->s->parentMenu = this;
+    item->s->tqparentMenu = this;
     resizeToContents();
-    if ( isVisible() && parentMenu )
-	parentMenu->update(); // draw arrow in parent menu
+    if ( isVisible() && tqparentMenu )
+	tqparentMenu->update(); // draw arrow in tqparent menu
     emit inserted( item->action() );
 }
 
@@ -361,7 +361,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index )
     TQObjectListIterator it( *l );
     insert( i, index );
     for ( ; it.current(); ++it ) {
-	g = ::qt_cast<TQActionGroup*>(it.current());
+	g = ::tqqt_cast<TQActionGroup*>(it.current());
 	if ( g ) {
 	    if ( dropdown )
 		i->s->insert( g );
@@ -374,7 +374,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index )
     delete l;
 }
 
-int PopupMenuEditor::find( const TQAction * action )
+int PopupMenuEditor::tqfind( const TQAction * action )
 {
     PopupMenuEditorItem * i = itemList.first();
     while ( i ) {
@@ -385,7 +385,7 @@ int PopupMenuEditor::find( const TQAction * action )
     return -1;
 }
 
-int PopupMenuEditor::find( PopupMenuEditor * menu )
+int PopupMenuEditor::tqfind( PopupMenuEditor * menu )
 {
     PopupMenuEditorItem * i = itemList.first();
     while ( i ) {
@@ -414,8 +414,8 @@ void PopupMenuEditor::exchange( int a, int b )
 	 ia == &addItem || ia == &addSeparator ||
 	 ib == &addItem || ib == &addSeparator )
 	return; // do nothing
-    itemList.replace( b, ia );
-    itemList.replace( a, ib );
+    itemList.tqreplace( b, ia );
+    itemList.tqreplace( a, ib );
 }
 
 void PopupMenuEditor::cut( int index )
@@ -532,17 +532,17 @@ void PopupMenuEditor::showLineEdit( int index )
     lineEdit->setFocus();
 }
 
-void PopupMenuEditor::setAccelerator( int key, Qt::ButtonState state, int index )
+void PopupMenuEditor::setAccelerator( int key, TQt::ButtonState state, int index )
 {
     // FIXME: make this a command
 
     int idx = ( index == -1 ? currentIndex : index );
 
-    if ( key == Qt::Key_Shift ||
-	 key == Qt::Key_Control ||
-	 key == Qt::Key_Alt ||
-	 key == Qt::Key_Meta ||
-	 key == Qt::Key_unknown )
+    if ( key == TQt::Key_Shift ||
+	 key == TQt::Key_Control ||
+	 key == TQt::Key_Alt ||
+	 key == TQt::Key_Meta ||
+	 key == TQt::Key_unknown )
 	return; // ignore these keys when they are pressed
 
     PopupMenuEditorItem * i = 0;
@@ -552,10 +552,10 @@ void PopupMenuEditor::setAccelerator( int key, Qt::ButtonState state, int index
     else
 	i = itemList.at( idx );
 
-    int shift = ( state & Qt::ShiftButton ? Qt::SHIFT : 0 );
-    int ctrl = ( state & Qt::ControlButton ? Qt::CTRL : 0 );
-    int alt = ( state & Qt::AltButton ? Qt::ALT : 0 );
-    int meta = ( state & Qt::MetaButton ? Qt::META : 0 );
+    int shift = ( state & TQt::ShiftButton ? TQt::SHIFT : 0 );
+    int ctrl = ( state & TQt::ControlButton ? TQt::CTRL : 0 );
+    int alt = ( state & TQt::AltButton ? TQt::ALT : 0 );
+    int meta = ( state & TQt::MetaButton ? TQt::META : 0 );
 
     TQAction * a = i->action();
     TQKeySequence ks = a->accel();
@@ -644,8 +644,8 @@ void PopupMenuEditor::removeItem( int index )
 									       idx );
 	formWnd->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	if ( itemList.count() == 0 && parentMenu )
-	    parentMenu->update();
+	if ( itemList.count() == 0 && tqparentMenu )
+	    tqparentMenu->update();
 	resizeToContents();
     }
 }
@@ -714,7 +714,7 @@ void PopupMenuEditor::setFocusAt( const TQPoint & pos )
 
 bool PopupMenuEditor::eventFilter( TQObject * o, TQEvent * e )
 {
-    if ( o == lineEdit  && e->type() == TQEvent::FocusOut ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit)  && e->type() == TQEvent::FocusOut ) {
 	leaveEditMode( 0 );
 	update();
     }
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
 		 rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
     reg -= mid;
     p.setClipRegion( reg );
-    style().drawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() );
     p.restore();
     drawItems( &p );
 }
@@ -747,7 +747,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * )
 {
     setFocusAt( mousePressPos );
     if ( currentItem() == &addSeparator ) {
-	PopupMenuEditorItem * i = createItem( new QSeparatorAction( 0 ) );
+	PopupMenuEditorItem * i = createItem( new TQSeparatorAction( 0 ) );
 	i->setSeparator( TRUE );
 	return;
     }
@@ -771,7 +771,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e )
 		cmd.execute();
                 // FIXME: start rename after drop
 	    } else if ( draggedItem == &addSeparator ) {
-		draggedItem = createItem( new QSeparatorAction( 0 ) );
+		draggedItem = createItem( new TQSeparatorAction( 0 ) );
 		draggedItem->setSeparator( TRUE );
 	    }
 
@@ -786,7 +786,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e )
 	    // If the item is dropped in the same list,
 	    //  we will have two instances of the same pointer
 	    // in the list. We use node instead.
-	    int idx = itemList.find( draggedItem );
+	    int idx = itemList.tqfind( draggedItem );
 	    TQLNode * node = itemList.currentNode();
 
 	    d->dragCopy(); // dragevents and stuff happens
@@ -857,7 +857,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 	PopupMenuEditorItemPtrDrag::decode( e, &i );
     } else {
 	if ( e->provides( "application/x-designer-actiongroup" ) ) {
-	    TQActionGroup * g = ::qt_cast<QDesignerActionGroup*>(ActionDrag::action());
+	    TQActionGroup * g = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action());
 	    if ( g->usesDropDown() ) {
 		i = new PopupMenuEditorItem( g, this );
 		TQString n = TQString( g->name() ) + "Item";
@@ -866,7 +866,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 		TQObjectList *l = g->queryList( TQACTION_OBJECT_NAME_STRING, 0, FALSE, FALSE );
 		TQObjectListIterator it( *l );
 		for ( ; it.current(); ++it ) {
-		    g = ::qt_cast<TQActionGroup*>(it.current());
+		    g = ::tqqt_cast<TQActionGroup*>(it.current());
 		    if ( g )
 			i->s->insert( g );
 		    else
@@ -877,7 +877,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 		dropInPlace( g, e->pos().y() );
 	    }
 	} else if ( e->provides( "application/x-designer-actions" ) ) {
-	    TQAction *a = ::qt_cast<QDesignerAction*>(ActionDrag::action());
+	    TQAction *a = ::tqqt_cast<TQDesignerAction*>(ActionDrag::action());
 	    i = new PopupMenuEditorItem( a, this );
 	}
     }
@@ -899,65 +899,65 @@ void PopupMenuEditor::keyPressEvent( TQKeyEvent * e )
 
 	switch ( e->key() ) {
 
-	case Qt::Key_Delete:
+	case TQt::Key_Delete:
 	    hideSubMenu();
 	    removeItem();
 	    showSubMenu();
 	    break;
 
-	case Qt::Key_Backspace:
+	case TQt::Key_Backspace:
 	    clearCurrentField();
 	    break;
 
-	case Qt::Key_Up:
-	    navigateUp( e->state() & Qt::ControlButton );
+	case TQt::Key_Up:
+	    navigateUp( e->state() & TQt::ControlButton );
 	    break;
 
-	case Qt::Key_Down:
-	    navigateDown( e->state() & Qt::ControlButton );
+	case TQt::Key_Down:
+	    navigateDown( e->state() & TQt::ControlButton );
 	    break;
 
-	case Qt::Key_Left:
+	case TQt::Key_Left:
 	    navigateLeft();
 	    break;
 
-	case Qt::Key_Right:
+	case TQt::Key_Right:
 	    navigateRight();
 	    break;
 
-	case Qt::Key_PageUp:
+	case TQt::Key_PageUp:
 	    currentIndex = 0;
 	    break;
 
-	case Qt::Key_PageDown:
+	case TQt::Key_PageDown:
 	    currentIndex = itemList.count();
 	    break;
 
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
-	case Qt::Key_F2:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
+	case TQt::Key_F2:
 	    enterEditMode( e );
 	    // move on
-	case Qt::Key_Alt:
-	case Qt::Key_Shift:
-	case Qt::Key_Control:
+	case TQt::Key_Alt:
+	case TQt::Key_Shift:
+	case TQt::Key_Control:
 	    // do nothing
 	    return;
 
-	case Qt::Key_Escape:
+	case TQt::Key_Escape:
 	    currentField = 0;
 	    navigateLeft();
 	    break;
 
-	case Qt::Key_C:
-	    if ( e->state() & Qt::ControlButton &&
+	case TQt::Key_C:
+	    if ( e->state() & TQt::ControlButton &&
 		 currentIndex < (int)itemList.count() ) {
 		copy( currentIndex );
 		break;
 	    }
 
-	case Qt::Key_X:
-	    if ( e->state() & Qt::ControlButton &&
+	case TQt::Key_X:
+	    if ( e->state() & TQt::ControlButton &&
 		 currentIndex < (int)itemList.count() ) {
 		hideSubMenu();
 		cut( currentIndex );
@@ -965,8 +965,8 @@ void PopupMenuEditor::keyPressEvent( TQKeyEvent * e )
 		break;
 	    }
 
-	case Qt::Key_V:
-	    if ( e->state() & Qt::ControlButton ) {
+	case TQt::Key_V:
+	    if ( e->state() & TQt::ControlButton ) {
 		hideSubMenu();
 		paste( currentIndex < (int)itemList.count() ? currentIndex + 1: itemList.count() );
 		showSubMenu();
@@ -991,9 +991,9 @@ void PopupMenuEditor::keyPressEvent( TQKeyEvent * e )
 
     } else { // In edit mode
 	switch ( e->key() ) {
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
-	case Qt::Key_Escape:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
+	case TQt::Key_Escape:
 	    leaveEditMode( e );
 	    e->accept();
 	    return;
@@ -1006,20 +1006,20 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
 {
     showSubMenu();
     update();
-    parentMenu->update();
+    tqparentMenu->update();
 }
 
 void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
 {
-    TQWidget * fw = qApp->focusWidget();
-    if ( !fw || ( !::qt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
+    TQWidget * fw = tqApp->tqfocusWidget();
+    if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
 	hideSubMenu();
-	if ( fw && ::qt_cast<MenuBarEditor*>(fw) )
+	if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) )
 	    return;
 	TQWidget * w = this;
-	while ( w && w != fw && ::qt_cast<PopupMenuEditor*>(w) ) { // hide all popups
+	while ( w && w != fw && ::tqqt_cast<PopupMenuEditor*>(w) ) { // hide all popups
 	    w->hide();
-	    w = ((PopupMenuEditor *)w)->parentEditor();
+	    w = ((PopupMenuEditor *)w)->tqparentEditor();
 	}
     }
 }
@@ -1031,20 +1031,20 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     int y = r.y();
     int h = r.height();
 
-    p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
+    p->fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) );
 
     if ( i->isSeparator() ) {
-	style().drawPrimitive( TQStyle::PE_Separator, p,
+	tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p,
 			       TQRect( r.x(), r.y() + 2, r.width(), 1 ),
-			       colorGroup(), TQStyle::Style_Sunken | f );
+			       tqcolorGroup(), TQStyle::Style_Sunken | f );
 	return;
     }
 
     const TQAction * a = i->action();
     if ( a->isToggleAction() && a->isOn() ) {
-	style().drawPrimitive( TQStyle::PE_CheckMark, p,
+	tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
 			       TQRect( x , y, iconWidth, h ),
-			       colorGroup(), f );
+			       tqcolorGroup(), f );
     } else {
 	TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal );
 	p->drawPixmap( x + ( iconWidth - icon.width() ) / 2,
@@ -1055,8 +1055,8 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     p->drawText( x, y, textWidth, h,
 		 TQPainter::AlignLeft |
 		 TQPainter::AlignVCenter |
-		 Qt::ShowPrefix |
-		 Qt::SingleLine,
+		 TQt::ShowPrefix |
+		 TQt::SingleLine,
 		 a->menuText() );
 
     x += textWidth + borderSize * 3;
@@ -1064,9 +1064,9 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
 		 TQPainter::AlignLeft | TQPainter::AlignVCenter,
 		 a->accel() );
     if ( i->count() ) // Item has submenu
-	style().drawPrimitive( TQStyle::PE_ArrowRight, p,
+	tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
 			       TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
-			       colorGroup(), f );
+			       tqcolorGroup(), f );
 }
 
 void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const
@@ -1092,8 +1092,8 @@ void PopupMenuEditor::drawItems( TQPainter * p )
     int flags = 0;
     int idx = 0;
 
-    TQColorGroup enabled = colorGroup();
-    TQColorGroup disabled = palette().disabled();
+    TQColorGroup enabled = tqcolorGroup();
+    TQColorGroup disabled = tqpalette().disabled();
     TQRect focus;
     TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 );
 
@@ -1152,11 +1152,11 @@ TQSize PopupMenuEditor::contentsSize()
 		a = i->action();
 		w = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ).rect().width() +
 		    borderSize; // padding
-		iconWidth = QMAX( iconWidth, w );
+		iconWidth = TQMAX( iconWidth, w );
 		w = fontMetrics().boundingRect( a->menuText() ).width();
-		textWidth = QMAX( textWidth, w );
+		textWidth = TQMAX( textWidth, w );
 		w = fontMetrics().boundingRect( a->accel() ).width() + 2; // added padding?
-		accelWidth = QMAX( accelWidth, w );
+		accelWidth = TQMAX( accelWidth, w );
 	    }
 	    h += itemHeight( i );
 	}
@@ -1176,8 +1176,8 @@ int PopupMenuEditor::itemHeight( const PopupMenuEditorItem * item ) const
     int padding =  + borderSize * 6;
     TQAction * a = item->action();
     int h = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ).rect().height();
-    h = QMAX( h, fontMetrics().boundingRect( a->menuText() ).height() + padding );
-    h = QMAX( h, fontMetrics().boundingRect( a->accel() ).height() + padding );
+    h = TQMAX( h, fontMetrics().boundingRect( a->menuText() ).height() + padding );
+    h = TQMAX( h, fontMetrics().boundingRect( a->accel() ).height() + padding );
     return h;
 }
 
@@ -1229,7 +1229,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y )
 	idx++;
 	n = itemList.next();
     }
-    int same = itemList.findRef( i );
+    int same = itemList.tqfindRef( i );
     AddActionToPopupCommand * cmd = new AddActionToPopupCommand( i18n( "Drop Item" ), formWnd, this, i, idx );
     formWnd->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -1239,12 +1239,12 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y )
 
 void PopupMenuEditor::dropInPlace( TQActionGroup * g, int y )
 {
-    if (!g->children())
+    TQObjectList l = g->childrenListObject();
+    if (l.isEmpty())
 	return;
-    TQObjectList l = *g->children();
     for ( int i = 0; i < (int)l.count(); ++i ) {
-	TQAction *a = ::qt_cast<TQAction*>(l.at(i));
-	TQActionGroup *g = ::qt_cast<TQActionGroup*>(l.at(i));
+	TQAction *a = ::tqqt_cast<TQAction*>(l.at(i));
+	TQActionGroup *g = ::tqqt_cast<TQActionGroup*>(l.at(i));
 	if ( g )
 	    dropInPlace( g, y );
 	else if ( a )
@@ -1259,8 +1259,8 @@ void PopupMenuEditor::safeDec()
     } while ( currentIndex > 0 && !currentItem()->isVisible() );
     if ( currentIndex == 0 &&
 	 !currentItem()->isVisible() &&
-	 parentMenu ) {
-	parentMenu->setFocus();
+	 tqparentMenu ) {
+	tqparentMenu->setFocus();
     }
 }
 
@@ -1317,9 +1317,9 @@ void PopupMenuEditor::navigateUp( bool ctrl )
 	    safeDec();
 	}
 	showSubMenu();
-    } else if ( parentMenu ) {
-	parentMenu->setFocus();
-	parentMenu->update();
+    } else if ( tqparentMenu ) {
+	tqparentMenu->setFocus();
+	tqparentMenu->update();
     }
 }
 
@@ -1351,9 +1351,9 @@ void PopupMenuEditor::navigateLeft()
     if ( currentItem()->isSeparator() ||
 	 currentIndex >= (int)itemList.count() ||
 	 currentField == 0 ) {
-	if ( parentMenu ) {
+	if ( tqparentMenu ) {
 	    hideSubMenu();
-	    parentMenu->setFocus();
+	    tqparentMenu->setFocus();
 	} else if ( !currentItem()->isSeparator() ) {
 	    currentField = 2;
 	}
@@ -1380,7 +1380,7 @@ void PopupMenuEditor::enterEditMode( TQKeyEvent * e )
     PopupMenuEditorItem * i = currentItem();
 
     if ( i == &addSeparator ) {
-	i = createItem( new QSeparatorAction( 0 ) );
+	i = createItem( new TQSeparatorAction( 0 ) );
     } else if ( i->isSeparator() ) {
 	return;
     } else if ( currentField == 0 ) {
@@ -1401,7 +1401,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e )
     lineEdit->hide();
 
     PopupMenuEditorItem * i = 0;
-    if ( e && e->key() == Qt::Key_Escape ) {
+    if ( e && e->key() == TQt::Key_Escape ) {
  	update();
 	return;
     }
@@ -1410,7 +1410,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e )
 	// new item was created
 	TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx();
 	TQString actionText = lineEdit->text();
-	actionText.replace("&&", "&");
+	actionText.tqreplace("&&", "&");
 	TQString menuText = lineEdit->text();
 	a->setText( actionText );
 	a->setMenuText( menuText );
@@ -1448,14 +1448,14 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item )
 {
     TQString s;
     TQString name = item->action()->menuText();
-    TQWidget *e = parentEditor();
-    PopupMenuEditor *p = ::qt_cast<PopupMenuEditor*>(e);
+    TQWidget *e = tqparentEditor();
+    PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e);
     if ( p ) {
-	int idx = p->find( item->m );
+	int idx = p->tqfind( item->m );
 	PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 );
 	s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) );
     } else {
-	MenuBarEditor *b = ::qt_cast<MenuBarEditor*>(e);
+	MenuBarEditor *b = ::tqqt_cast<MenuBarEditor*>(e);
 	if ( b ) {
 	    int idx = b->findItem( item->m );
 	    MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 );
diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h
index 8c024e34..29ffcf4c 100644
--- a/kdevdesigner/designer/popupmenueditor.h
+++ b/kdevdesigner/designer/popupmenueditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,13 +34,14 @@
 class PopupMenuEditor;
 class TQMenuItem;
 
-class PopupMenuEditorItem : public QObject
+class PopupMenuEditorItem : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class PopupMenuEditor;
 
-    PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 );
+    PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * tqparent = 0, const char * name = 0 );
 
 public:
     enum ItemType {
@@ -50,9 +51,9 @@ public:
     };
 
     PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu,
-			 TQObject * parent = 0, const char * name = 0 );
+			 TQObject * tqparent = 0, const char * name = 0 );
     PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu,
-			 TQObject * parent = 0, const char * name = 0 );
+			 TQObject * tqparent = 0, const char * name = 0 );
     ~PopupMenuEditorItem();
 
     void init();
@@ -97,17 +98,18 @@ class TQLineEdit;
 
 #include <tqpopupmenu.h>
 
-class PopupMenuEditor : public QWidget
+class PopupMenuEditor : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class PopupMenuEditorItem;
     friend class MenuBarEditor;
     friend class Resource;
 
 public:
-    PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
-    PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 );
+    PopupMenuEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 );
+    PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * tqparent, const char * name = 0 );
     ~PopupMenuEditor();
 
     void init();
@@ -115,8 +117,8 @@ public:
     void insert( PopupMenuEditorItem * item, int index = -1 );
     void insert( TQAction * action, int index = -1 );
     void insert( TQActionGroup * actionGroup, int index = -1 );
-    int find( const TQAction * action );
-    int find( PopupMenuEditor * menu );
+    int tqfind( const TQAction * action );
+    int tqfind( PopupMenuEditor * menu );
     int count();
     PopupMenuEditorItem * at( int index );
     PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); }
@@ -131,14 +133,14 @@ public:
     void show();
     void choosePixmap( int index = -1 );
     void showLineEdit( int index = -1);
-    void setAccelerator( int key, Qt::ButtonState state, int index = -1 );
+    void setAccelerator( int key, TQt::ButtonState state, int index = -1 );
 
     FormWindow * formWindow() { return formWnd; }
     bool isCreatingAccelerator() { return ( currentField == 2 ); }
 
     TQPtrList<PopupMenuEditorItem> * items() { return &itemList; }
 
-    TQWidget * parentEditor() { return parentMenu; }
+    TQWidget * tqparentEditor() { return tqparentMenu; }
 
 signals:
     void inserted( TQAction * );
@@ -151,7 +153,7 @@ public slots:
     void paste() { paste( currentIndex ); }
 
     void remove( int index );
-    void remove( TQAction * a ) { remove( find( a ) ); }
+    void remove( TQAction * a ) { remove( tqfind( a ) ); }
 
     void resizeToContents();
     void showSubMenu();
@@ -210,7 +212,7 @@ private:
     TQPtrList<PopupMenuEditorItem> itemList;
     PopupMenuEditorItem addItem;
     PopupMenuEditorItem addSeparator;
-    TQWidget * parentMenu;
+    TQWidget * tqparentMenu;
 
     int iconWidth;
     int textWidth;
diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui
index 58cc7def..ea57a056 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/kdevdesigner/designer/preferences.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Preferences</cstring>
     </property>
@@ -56,11 +56,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>pageGeneral</cstring>
                 </property>
@@ -71,7 +71,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="1" column="1">
+                    <widget class="TQGroupBox" row="1" column="1">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -82,7 +82,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxAutoSave</cstring>
                                 </property>
@@ -93,15 +93,15 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout3</cstring>
+                                    <cstring>tqlayout3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>textLabelAutoSave</cstring>
                                         </property>
@@ -112,7 +112,7 @@
                                             <cstring>timeEditAutoSave</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QTimeEdit">
+                                    <widget class="TQTimeEdit">
                                         <property name="name">
                                             <cstring>timeEditAutoSave</cstring>
                                         </property>
@@ -128,7 +128,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
+                    <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>buttonGroup2</cstring>
                         </property>
@@ -139,7 +139,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTextEdit">
+                            <widget class="TQTextEdit">
                                 <property name="name">
                                     <cstring>textEditPluginPaths</cstring>
                                 </property>
@@ -156,7 +156,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -166,7 +166,7 @@
                             <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>GroupBox5</cstring>
                         </property>
@@ -183,7 +183,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxWorkspace</cstring>
                                 </property>
@@ -200,7 +200,7 @@
                                     <string>The current workspace settings will be restored the next time you start Qt Designer if this option is checked.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxSplash</cstring>
                                 </property>
@@ -217,7 +217,7 @@
                                     <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxStartDialog</cstring>
                                 </property>
@@ -228,7 +228,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkAutoEdit</cstring>
                                 </property>
@@ -239,7 +239,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxTextLabels</cstring>
                                 </property>
@@ -255,7 +255,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="1">
+                    <widget class="TQGroupBox" row="0" column="1">
                         <property name="name">
                             <cstring>groupBoxGrid</cstring>
                         </property>
@@ -278,7 +278,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxSnapGrid</cstring>
                                 </property>
@@ -295,7 +295,7 @@
                                     <string>&lt;b&gt;Customize the grid-settings for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Snap to Grid&lt;/b&gt; is checked, the widgets snap to the grid using the the X/Y resolution.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout4</cstring>
                                 </property>
@@ -309,7 +309,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QSpinBox" row="0" column="1">
+                                    <widget class="TQSpinBox" row="0" column="1">
                                         <property name="name">
                                             <cstring>spinGridX</cstring>
                                         </property>
@@ -329,7 +329,7 @@
                                             <string>&lt;b&gt;Customize the grid-settings for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Show Grid&lt;/b&gt; is checked, a grid is shown on all forms using the X/Y resolution.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox" row="1" column="1">
+                                    <widget class="TQSpinBox" row="1" column="1">
                                         <property name="name">
                                             <cstring>spinGridY</cstring>
                                         </property>
@@ -349,7 +349,7 @@
                                             <string>&lt;b&gt;Customize the grid-settings for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Show Grid&lt;/b&gt; is checked, a grid is shown on all forms using the X/Y resolution.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>Label1</cstring>
                                         </property>
@@ -360,7 +360,7 @@
                                             <cstring>spinGridX</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>Label1_2</cstring>
                                         </property>
@@ -375,7 +375,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup" row="0" column="0">
+                    <widget class="TQButtonGroup" row="0" column="0">
                         <property name="name">
                             <cstring>ButtonGroup1</cstring>
                         </property>
@@ -420,7 +420,7 @@
                                     <string>Select a color in the color dialog.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="0">
+                            <widget class="TQRadioButton" row="0" column="0">
                                 <property name="name">
                                     <cstring>radioColor</cstring>
                                 </property>
@@ -437,7 +437,7 @@
                                     <string>Use a background color.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="0">
+                            <widget class="TQRadioButton" row="1" column="0">
                                 <property name="name">
                                     <cstring>radioPixmap</cstring>
                                 </property>
@@ -484,7 +484,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -498,7 +498,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -519,14 +519,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -543,7 +543,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -636,11 +636,11 @@
     <tabstop>checkBoxTextLabels</tabstop>
     <tabstop>helpButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>styledbutton.h</includehint>
     <includehint>styledbutton.h</includehint>
diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp
index 98c3c9b0..1722d765 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/kdevdesigner/designer/previewframe.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,15 +29,15 @@
 
 #include "previewframe.h"
 
-PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
-    : TQVBox( parent, name )
+PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name )
+    : TQVBox( tqparent, name )
 {
     setMinimumSize(200, 200);
     setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
     setLineWidth(1);
 
     PreviewWorkspace * w = new PreviewWorkspace( this );
-    w->setEraseColor(colorGroup().dark());
+    w->setEraseColor(tqcolorGroup().dark());
     previewWidget = new PreviewWidget( w );
     previewWidget->move( 10, 10 );
 }
diff --git a/kdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h
index 0834c178..23af94ad 100644
--- a/kdevdesigner/designer/previewframe.h
+++ b/kdevdesigner/designer/previewframe.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,24 +32,26 @@
 
 #include "previewwidgetimpl.h"
 
-class PreviewWorkspace : public QWorkspace
+class PreviewWorkspace : public TQWorkspace
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 )
-        : TQWorkspace( parent, name ) {}
+    PreviewWorkspace( TQWidget* tqparent = 0, const char* name = 0 )
+        : TQWorkspace( tqparent, name ) {}
     ~PreviewWorkspace() {}
 
 protected:
     void paintEvent( TQPaintEvent* );
 };
 
-class PreviewFrame : public QVBox
+class PreviewFrame : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PreviewFrame( TQWidget *parent = 0, const char *name = 0 );
+    PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 );
     void setPreviewPalette(TQPalette);
 
 private:
diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui
index f297d2d4..0cc680c8 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/kdevdesigner/designer/previewwidget.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PreviewWidgetBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout17</cstring>
                     </property>
@@ -84,7 +84,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup1</cstring>
                             </property>
@@ -101,7 +101,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
@@ -112,7 +112,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton2</cstring>
                                     </property>
@@ -120,7 +120,7 @@
                                         <string>RadioButton2</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton3</cstring>
                                     </property>
@@ -130,7 +130,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup2</cstring>
                             </property>
@@ -147,7 +147,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>CheckBox1</cstring>
                                     </property>
@@ -158,7 +158,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>CheckBox2</cstring>
                                     </property>
@@ -168,7 +168,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QProgressBar">
+                        <widget class="TQProgressBar">
                             <property name="name">
                                 <cstring>ProgressBar1</cstring>
                             </property>
@@ -178,7 +178,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -200,7 +200,7 @@
                                 <string>LineEdit</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>ComboBox</string>
@@ -210,7 +210,7 @@
                                 <cstring>ComboBox1</cstring>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout13</cstring>
                             </property>
@@ -224,12 +224,12 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>SpinBox1</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>PushButton1</cstring>
                                     </property>
@@ -239,7 +239,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QScrollBar">
+                        <widget class="TQScrollBar">
                             <property name="name">
                                 <cstring>ScrollBar1</cstring>
                             </property>
@@ -247,7 +247,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>Slider1</cstring>
                             </property>
@@ -255,11 +255,11 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QTextView">
+                        <widget class="TQTextView">
                             <property name="name">
                                 <cstring>textView</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>50</height>
@@ -288,7 +288,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp
index a2226ac2..3279b284 100644
--- a/kdevdesigner/designer/previewwidgetimpl.cpp
+++ b/kdevdesigner/designer/previewwidgetimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,8 +27,8 @@
 #include "tqobjectlist.h"
 #include "previewwidgetimpl.h"
 
-PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
-    : PreviewWidgetBase( parent, name )
+PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name )
+    : PreviewWidgetBase( tqparent, name )
 {
     // install event filter on child widgets
     TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
@@ -37,7 +37,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
     while ((obj = it.current()) != 0) {
         ++it;
         obj->installEventFilter(this);
-	((TQWidget*)obj)->setFocusPolicy(NoFocus);
+	((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
     }
 }
 
diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h
index 497e2fe0..49f56875 100644
--- a/kdevdesigner/designer/previewwidgetimpl.h
+++ b/kdevdesigner/designer/previewwidgetimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,9 +32,10 @@
 class PreviewWidget : public PreviewWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PreviewWidget( TQWidget *parent = 0, const char *name = 0 );
+    PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 );
 
     void closeEvent(TQCloseEvent *);
     bool eventFilter(TQObject *, TQEvent *);
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index a714bd07..5c700a0f 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-**1 This file is part of Qt Designer.
+**1 This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 #include "designerappiface.h"
 #include "../interfaces/languageinterface.h"
 #include "pixmapcollection.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 #include "resource.h"
@@ -48,7 +48,7 @@
 #include "mainwindow.h"
 #include <tqworkspace.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqsqldatabase.h>
 #include <tqsqlrecord.h>
 #include <tqdatatable.h>
@@ -61,7 +61,7 @@
 
 #include <klocale.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()
 {
     delete iface;
@@ -69,7 +69,7 @@ DatabaseConnection::~DatabaseConnection()
 
 bool DatabaseConnection::refreshCatalog()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( loaded )
 	return TRUE;
     if ( !open() )
@@ -91,7 +91,7 @@ bool DatabaseConnection::refreshCatalog()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void DatabaseConnection::remove()
 {
     if ( nm == "(default)" )
@@ -105,15 +105,15 @@ void DatabaseConnection::remove()
 
 bool DatabaseConnection::open( bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     // register our name, if nec
     if ( nm == "(default)" ) {
-	if ( !TQSqlDatabase::contains() ) // default doesn't exists?
+	if ( !TQSqlDatabase::tqcontains() ) // default doesn't exists?
 	    conn = TQSqlDatabase::addDatabase( drv );
 	else
 	    conn = TQSqlDatabase::database();
     } else {
-	if ( !TQSqlDatabase::contains( nm ) )
+	if ( !TQSqlDatabase::tqcontains( nm ) )
 	    conn = TQSqlDatabase::addDatabase( drv, nm );
 	else
 	    conn = TQSqlDatabase::database( nm );
@@ -152,7 +152,7 @@ bool DatabaseConnection::open( bool suppressDialog )
 					  + TQString( "[" + conn->lastError().driverText() + "\n" +
 						     conn->lastError().databaseText() + "]\n" ),
 					  i18n( "&OK" ),
-					  i18n( "&Cancel" ), TQString::null, 0, 1 ) ) {
+					  i18n( "&Cancel" ), TQString(), 0, 1 ) ) {
 	    case 0: // OK or Enter
 		continue;
 	    case 1: // Cancel or Escape
@@ -178,7 +178,7 @@ void DatabaseConnection::close()
 {
     if ( !loaded )
 	return;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( conn ) {
 	conn->close();
     }
@@ -202,7 +202,7 @@ bool Project::isDummy() const
 }
 
 Project::Project( const TQString &fn, const TQString &pName,
-		  QPluginManager<ProjectSettingsInterface> *pm, bool isDummy,
+		  TQPluginManager<ProjectSettingsInterface> *pm, bool isDummy,
 		  const TQString &l )
     : proName( pName ), projectSettingsPluginManager( pm ), isDummyProject( isDummy )
 {
@@ -236,7 +236,7 @@ void Project::setModified( bool b )
     emit projectModified();
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection *Project::databaseConnection( const TQString &name )
 {
     for ( DatabaseConnection *conn = dbConnections.first();
@@ -285,8 +285,8 @@ void Project::setFileName( const TQString &fn, bool doClear )
     }
 
 
-    if ( proName.contains( '.' ) )
-	proName = proName.left( proName.find( '.' ) );
+    if ( proName.tqcontains( '.' ) )
+	proName = proName.left( proName.tqfind( '.' ) );
 
     if ( !doClear )
 	return;
@@ -389,7 +389,7 @@ TQStringList parse_multiline_part( const TQString &contents, const TQString &key
 		       c == '$' || c == '-' || c == '(' || c == ')' || c == ':'  || c == '+' || c == ',' || c == '~' ) &&
 		     c != ' ' && c != '\t' && c != '\n' ) {
 		    if ( !inName )
-			currName = TQString::null;
+			currName = TQString();
 		    if ( c != '\\' || contents[i+1] != '\n' ) {
 			currName += c;
 			inName = TRUE;
@@ -424,7 +424,7 @@ void Project::parse()
 
     TQStringList::ConstIterator it;
 
-    int i = contents.find( "LANGUAGE" );
+    int i = contents.tqfind( "LANGUAGE" );
     if ( i != -1 ) {
 	lang = "";
 	is_cpp = FALSE;
@@ -433,7 +433,7 @@ void Project::parse()
 	is_cpp = lang == "C++";
     }
 
-    i = contents.find( "DBFILE" );
+    i = contents.tqfind( "DBFILE" );
     if ( i != -1 ) {
 	dbFile = "";
 	TQString part = contents.mid( i + TQString( "DBFILE" ).length() );
@@ -449,7 +449,7 @@ void Project::parse()
     }
 
 
-    i = contents.find( "TEMPLATE" );
+    i = contents.tqfind( "TEMPLATE" );
     if ( i != -1 ) {
 	templ = "";
 	TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() );
@@ -477,12 +477,12 @@ void Project::parse()
     updateCustomSettings();
 
     for ( it = csList.begin(); it != csList.end(); ++it ) {
-	i = contents.find( *it );
+	i = contents.tqfind( *it );
 	if ( i != -1 ) {
 	    TQString val = "";
 	    TQString part = contents.mid( i + TQString( *it ).length() );
 	    val = parse_part( part );
-	    customSettings.replace( *it, val );
+	    customSettings.tqreplace( *it, val );
 	}
     }
 
@@ -511,7 +511,7 @@ void Project::clear()
 
 bool Project::removeSourceFile( SourceFile *sf )
 {
-    if ( !sourcefiles.containsRef( sf ) )
+    if ( !sourcefiles.tqcontainsRef( sf ) )
 	return FALSE;
     if ( !sf->close() )
 	return FALSE;
@@ -569,10 +569,10 @@ TQString Project::makeRelative( const TQString &f )
 
 static void remove_contents( TQString &contents, const TQString &s )
 {
-    int i = contents.find( s );
+    int i = contents.tqfind( s );
     if ( i != -1 ) {
 	int start = i;
-	int end = contents.find( '\n', i );
+	int end = contents.tqfind( '\n', i );
 	if ( end == -1 )
 	    end = contents.length() - 1;
 	contents.remove( start, end - start + 1 );
@@ -581,7 +581,7 @@ static void remove_contents( TQString &contents, const TQString &s )
 
 static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 )
 {
-    int i = contents.find( s );
+    int i = contents.tqfind( s );
     if ( strt )
 	*strt = i;
     int start = i;
@@ -691,7 +691,7 @@ void Project::save( bool onlyProjectFile )
  	contents +=
  	    "unix {\n"
  	    "  UI_DIR = .ui\n"
- 	    "  MOC_DIR = .moc\n"
+ 	    "  TQMOC_DIR = .tqmoc\n"
  	    "  OBJECTS_DIR = .obj\n"
  	    "}\n";
     }
@@ -704,7 +704,7 @@ void Project::save( bool onlyProjectFile )
 	    TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() );
 	    TQStringList lst = sourceToKey[ key ];
 	    lst << makeRelative( f->fileName() );
-	    sourceToKey.replace( key, lst );
+	    sourceToKey.tqreplace( key, lst );
 	}
 
 	for ( TQMap<TQString, TQStringList>::Iterator skit = sourceToKey.begin();
@@ -751,7 +751,7 @@ void Project::save( bool onlyProjectFile )
 
     // custom settings
     for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) {
-	TQString val = *customSettings.find( *it );
+	TQString val = *customSettings.tqfind( *it );
 	if ( !val.isEmpty() )
 	    contents += *it + "\t= " + val + "\n";
     }
@@ -778,21 +778,21 @@ void Project::save( bool onlyProjectFile )
     }
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQPtrList<DatabaseConnection> Project::databaseConnections() const
 {
     return dbConnections;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst )
 {
     dbConnections = lst;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::addDatabaseConnection( DatabaseConnection *conn )
 {
     dbConnections.append( conn );
@@ -800,7 +800,7 @@ void Project::addDatabaseConnection( DatabaseConnection *conn )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::removeDatabaseConnection( const TQString &c )
 {
     for ( DatabaseConnection *conn = dbConnections.first(); conn; conn = dbConnections.next() ) {
@@ -814,7 +814,7 @@ void Project::removeDatabaseConnection( const TQString &c )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseConnectionList()
 {
     TQStringList lst;
@@ -824,7 +824,7 @@ TQStringList Project::databaseConnectionList()
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseTableList( const TQString &connection )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -835,7 +835,7 @@ TQStringList Project::databaseTableList( const TQString &connection )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseFieldList( const TQString &connection, const TQString &table )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -845,7 +845,7 @@ TQStringList Project::databaseFieldList( const TQString &connection, const TQStr
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQString makeIndent( int indent )
 {
     TQString s;
@@ -854,7 +854,7 @@ static TQString makeIndent( int indent )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQString& value, int indent )
 {
     ts << makeIndent( indent ) << "<property name=\"" << name << "\">" << endl;
@@ -867,7 +867,7 @@ static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQ
 
 void Project::saveConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() ) {
 	TQFileInfo fi( fileName() );
 	setDatabaseDescription( fi.baseName() + ".db" );
@@ -934,7 +934,7 @@ void Project::saveConnections()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 {
     TQDomElement n;
@@ -950,7 +950,7 @@ static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 
 void Project::loadConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() || !TQFile::exists( makeAbsolute( dbFile ) ) )
 	return;
 
@@ -1021,7 +1021,7 @@ can be closed again with closeDatabase().
 
 bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
@@ -1040,7 +1040,7 @@ bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 */
 void Project::closeDatabase( const TQString &connection )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
@@ -1105,7 +1105,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value )
 
 TQString Project::customSetting( const TQString &key ) const
 {
-    return *customSettings.find( key );
+    return *customSettings.tqfind( key );
 }
 
 void Project::updateCustomSettings()
@@ -1115,14 +1115,14 @@ void Project::updateCustomSettings()
 
 /*
     ProjectSettingsInterface *iface = 0;
-    projectSettingsPluginManager->queryInterface( lang, (QUnknownInterface**)&iface );
+    projectSettingsPluginManager->queryInterface( lang, (TQUnknownInterface**)&iface );
     if ( !iface )
 	return;
     csList = iface->projectSettings();
     iface->release();
 */
 
-    QInterfacePtr<ProjectSettingsInterface> iface;
+    TQInterfacePtr<ProjectSettingsInterface> iface;
     projectSettingsPluginManager->queryInterface( lang, &iface );
     if ( !iface )
 	return;
@@ -1170,23 +1170,23 @@ void Project::setIncludePath( const TQString &platform, const TQString &path )
 {
     if ( inclPath[platform] == path )
 	return;
-    inclPath.replace( platform, path );
+    inclPath.tqreplace( platform, path );
     modified = TRUE;
 }
 
 void Project::setLibs( const TQString &platform, const TQString &path )
 {
-    lbs.replace( platform, path );
+    lbs.tqreplace( platform, path );
 }
 
 void Project::setDefines( const TQString &platform, const TQString &path )
 {
-    defs.replace( platform, path );
+    defs.tqreplace( platform, path );
 }
 
 void Project::setConfig( const TQString &platform, const TQString &config )
 {
-    cfg.replace( platform, config );
+    cfg.tqreplace( platform, config );
 }
 
 TQString Project::config( const TQString &platform ) const
@@ -1223,8 +1223,8 @@ void Project::readPlatformSettings( const TQString &contents,
 				    const TQString &setting,
 				    TQMap<TQString, TQString> &res )
 {
-    const TQString platforms[] = { "", "win32", "unix", "mac", TQString::null };
-    for ( int i = 0; platforms[ i ] != TQString::null; ++i ) {
+    const TQString platforms[] = { "", "win32", "unix", "mac", TQString() };
+    for ( int i = 0; platforms[ i ] != TQString(); ++i ) {
 	TQString p = platforms[ i ];
 	if ( !p.isEmpty() )
 	    p += ":";
@@ -1233,14 +1233,14 @@ void Project::readPlatformSettings( const TQString &contents,
 	TQString key = platforms[ i ];
 	if ( key.isEmpty() )
 	    key = "(all)";
-	res.replace( key, s );
+	res.tqreplace( key, s );
     }
 }
 
 void Project::removePlatformSettings( TQString &contents, const TQString &setting )
 {
-    const TQString platforms[] = { "win32", "unix", "mac", "", TQString::null };
-    for ( int i = 0; platforms[ i ] != TQString::null; ++i ) {
+    const TQString platforms[] = { "win32", "unix", "mac", "", TQString() };
+    for ( int i = 0; platforms[ i ] != TQString(); ++i ) {
 	TQString p = platforms[ i ];
 	if ( !p.isEmpty() )
 	    p += ":";
@@ -1251,21 +1251,21 @@ void Project::removePlatformSettings( TQString &contents, const TQString &settin
 void Project::writePlatformSettings( TQString &contents, const TQString &setting,
 				     const TQMap<TQString, TQString> &input )
 {
-    const TQString platforms[] = { "", "win32", "unix", "mac", TQString::null };
+    const TQString platforms[] = { "", "win32", "unix", "mac", TQString() };
     int i;
     LanguageInterface *iface = MetaDataBase::languageInterface( lang );
     if (iface && (setting == "SOURCES" || setting == "HEADERS")) // The (all) part will be saved later on
         i = 1;
     else
 	i = 0;
-    for (; platforms[ i ] != TQString::null; ++i ) {
+    for (; platforms[ i ] != TQString(); ++i ) {
 	TQString p = platforms[ i ];
 	if ( !p.isEmpty() )
 	    p += ":";
 	TQString key = platforms[ i ];
 	if ( key.isEmpty() )
 	    key = "(all)";
-	TQMap<TQString, TQString>::ConstIterator it = input.find( key );
+	TQMap<TQString, TQString>::ConstIterator it = input.tqfind( key );
 	if ( it == input.end() || (*it).isEmpty() )
 	    continue;
 	contents += p + setting + "\t+= " + *it + "\n";
@@ -1281,7 +1281,7 @@ void Project::addFormFile( FormFile *ff )
 
 bool Project::removeFormFile( FormFile *ff )
 {
-    if ( !formfiles.containsRef( ff ) )
+    if ( !formfiles.tqcontainsRef( ff ) )
 	return FALSE;
     if ( !ff->close() )
 	return FALSE;
@@ -1300,8 +1300,8 @@ void Project::addObject( TQObject *o )
     fakeFormFiles.insert( (void*)o, ff );
     MetaDataBase::addEntry( o );
     if ( hasGUI() ) {
-	TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0;
-	FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" );
+	TQWidget *tqparent = MainWindow::self ? MainWindow::self->qWorkspace() : 0;
+	FormWindow *fw = new FormWindow( ff, MainWindow::self, tqparent, "qt_fakewindow" );
 	fw->setProject( this );
 	if ( TQFile::exists( ff->absFileName() ) )
 	    Resource::loadExtraSource( ff, ff->absFileName(),
@@ -1316,8 +1316,8 @@ void Project::addObject( TQObject *o )
 		     TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) )
 		);
 	}
-	if ( fw->parentWidget() ) {
-	    fw->parentWidget()->setFixedSize( 1, 1 );
+	if ( fw->tqparentWidget() ) {
+	    fw->tqparentWidget()->setFixedSize( 1, 1 );
 	    fw->show();
 	}
     } else {
@@ -1352,7 +1352,7 @@ TQObjectList Project::objects() const
 
 FormFile *Project::fakeFormFileFor( TQObject *o ) const
 {
-    return fakeFormFiles.find( (void*)o );
+    return fakeFormFiles.tqfind( (void*)o );
 }
 
 TQObject *Project::objectForFakeForm( FormWindow *fw ) const
@@ -1396,7 +1396,7 @@ void Project::removeTempProject()
     }
     d.remove( TQFileInfo( filename ).dirPath() );
 #if defined(Q_OS_UNIX)
-    // ##### implement for all platforms, ideally should be in Qt
+    // ##### implement for all platforms, ideally should be in TQt
     ::rmdir( TQFile::encodeName( d.absPath() ) );
 #endif
 }
@@ -1411,14 +1411,14 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func
 		return;
 	    iface->functions( f->text(), &funcs );
 	    TQString func = function;
-	    int i = func.find( '(' );
+	    int i = func.tqfind( '(' );
 	    if ( i != -1 )
 		func = func.left( i );
 
 	    bool found = FALSE;
 	    for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin();
 		  it != funcs.end(); ++it ) {
-		if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) {
+		if ( (*it).name.left( (*it).name.tqfind( '(' ) ) == func ) {
 		    found = TRUE;
 		    break;
 		}
@@ -1460,12 +1460,12 @@ bool Project::hasParentObject( TQObject *o )
 TQString Project::qualifiedName( TQObject *o )
 {
     TQString name = o->name();
-    TQObject *p = o->parent();
+    TQObject *p = o->tqparent();
     while ( p ) {
 	name.prepend( TQString( p->name() ) + "." );
-	if ( objs.findRef( p ) != -1 )
+	if ( objs.tqfindRef( p ) != -1 )
 	    break;
-	p = p->parent();
+	p = p->tqparent();
     }
     return name;
 }
@@ -1494,7 +1494,7 @@ void Project::designerCreated()
 	fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE );
 	TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(),
 					TQEvent::ChildInserted );
-	fw->parentWidget()->setFixedSize( 1, 1 );
+	fw->tqparentWidget()->setFixedSize( 1, 1 );
 	fw->show();
     }
 }
@@ -1509,13 +1509,13 @@ void Project::formOpened( FormWindow *fw )
 TQString Project::locationOfObject( TQObject *o )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
 
     if ( MainWindow::self ) {
 	TQWidgetList windows = MainWindow::self->qWorkspace()->windowList();
 	for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	    FormWindow *fw = ::qt_cast<FormWindow*>(w);
-	    SourceEditor *se = ::qt_cast<SourceEditor*>(w);
+	    FormWindow *fw = ::tqqt_cast<FormWindow*>(w);
+	    SourceEditor *se = ::tqqt_cast<SourceEditor*>(w);
 	    if ( fw ) {
 		if ( fw->isFake() )
 		    return objectForFakeForm( fw )->name() + TQString( " [Source]" );
@@ -1532,7 +1532,7 @@ TQString Project::locationOfObject( TQObject *o )
 	}
     }
 
-    if ( ::qt_cast<SourceFile*>(o) ) {
+    if ( ::tqqt_cast<SourceFile*>(o) ) {
 	for ( TQPtrListIterator<SourceFile> sources = sourceFiles();
 	      sources.current(); ++sources ) {
 	    SourceFile* f = sources.current();
@@ -1544,15 +1544,15 @@ TQString Project::locationOfObject( TQObject *o )
     extern TQMap<TQWidget*, TQString> *qwf_forms;
     if ( !qwf_forms ) {
 	qWarning( "Project::locationOfObject: qwf_forms is NULL!" );
-	return TQString::null;
+	return TQString();
     }
 
-    TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) );
+    TQString s = makeRelative( *qwf_forms->tqfind( (TQWidget*)o ) );
     s += " [Source]";
     return s;
 }
 
 bool Project::hasGUI() const
 {
-    return qApp->type() != TQApplication::Tty;
+    return tqApp->type() != TQApplication::Tty;
 }
diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h
index 25ec499d..350fd6f0 100644
--- a/kdevdesigner/designer/project.h
+++ b/kdevdesigner/designer/project.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -33,7 +33,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include "../interfaces/projectsettingsiface.h"
 #include "sourcefile.h"
 #include "formfile.h"
@@ -47,14 +47,14 @@ struct DesignerDatabase;
 class PixmapCollection;
 class Project;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DatabaseConnection
 {
 public:
     DatabaseConnection( Project *p ) :
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	conn( 0 ),
 #endif
 	project( p ), loaded( FALSE ), iface( 0 ) {}
@@ -86,7 +86,7 @@ public:
     TQStringList tables() const { return tbls; }
     TQStringList fields( const TQString& t ) { return flds[t]; }
     TQMap<TQString, TQStringList> fields() { return flds; }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase* connection() const { return conn; }
     void remove();
 #endif
@@ -98,7 +98,7 @@ private:
     int prt;
     TQStringList tbls;
     TQMap<TQString, TQStringList> flds;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase *conn;
 #endif
     Project *project;
@@ -108,14 +108,15 @@ private:
 
 #endif
 
-class Project : public QObject
+class Project : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class DatabaseConnection;
 
 public:
-    Project( const TQString &fn, const TQString &pName = TQString::null,
-	     QPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE,
+    Project( const TQString &fn, const TQString &pName = TQString(),
+	     TQPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE,
 	     const TQString &l = "C++" );
     ~Project();
 
@@ -143,7 +144,7 @@ public:
 
     void save( bool onlyProjectFile = FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> databaseConnections() const;
     void setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst );
     void addDatabaseConnection( DatabaseConnection *conn );
@@ -248,14 +249,14 @@ private:
     TQString proName;
     TQString desc;
     TQString dbFile;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> dbConnections;
 #endif
     TQString lang;
     DesignerProject *iface;
     TQMap<TQString, TQString> customSettings;
     TQStringList csList;
-    QPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
+    TQPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
     PixmapCollection *pixCollection;
     TQPtrList<SourceFile> sourcefiles;
     TQPtrList<FormFile> formfiles;
diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui
index 258b7739..14ce1f0a 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/kdevdesigner/designer/projectsettings.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ProjectSettingsBase</cstring>
     </property>
@@ -53,11 +53,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tabSettings</cstring>
                 </property>
@@ -68,7 +68,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -79,7 +79,7 @@
                             <cstring>editProjectFile</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel1_3</cstring>
                         </property>
@@ -90,7 +90,7 @@
                             <cstring>comboLanguage</cstring>
                         </property>
                     </widget>
-                    <widget class="QToolButton" row="2" column="2">
+                    <widget class="TQToolButton" row="2" column="2">
                         <property name="name">
                             <cstring>buttonDatabaseFile_2</cstring>
                         </property>
@@ -103,7 +103,7 @@
                             <cstring>editDatabaseFile</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2_2_2</cstring>
                         </property>
@@ -114,7 +114,7 @@
                             <cstring>editDatabaseFile</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                    <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>comboLanguage</cstring>
                         </property>
@@ -122,7 +122,7 @@
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout1</cstring>
                         </property>
@@ -141,7 +141,7 @@
                                     <cstring>editProjectFile</cstring>
                                 </property>
                             </widget>
-                            <widget class="QToolButton">
+                            <widget class="TQToolButton">
                                 <property name="name">
                                     <cstring>buttonProject</cstring>
                                 </property>
@@ -161,7 +161,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>71</height>
@@ -171,7 +171,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -185,7 +185,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -206,14 +206,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -230,7 +230,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -288,7 +288,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">chooseDatabaseFile()</slot>
     <slot access="protected">chooseProjectFile()</slot>
     <slot access="protected">destroy()</slot>
@@ -296,6 +296,6 @@
     <slot access="protected">init()</slot>
     <slot access="protected">languageChanged( const QString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index 8d213a0a..b616930d 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -48,14 +48,14 @@
 #include <tqlabel.h>
 
 /*
- *  Constructs a ProjectSettings which is a child of 'parent', with the
+ *  Constructs a ProjectSettings which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent,  const char* name, bool modal, WFlags fl )
-    : ProjectSettingsBase( parent, name, modal, fl ), project( pro )
+ProjectSettings::ProjectSettings( Project *pro, TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
+    : ProjectSettingsBase( tqparent, name, modal, fl ), project( pro )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h
index bce8a1b9..301ceb70 100644
--- a/kdevdesigner/designer/projectsettingsimpl.h
+++ b/kdevdesigner/designer/projectsettingsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,9 +37,10 @@ class SourceFile;
 class ProjectSettings : public ProjectSettingsBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ProjectSettings( Project *pro, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~ProjectSettings();
 
 protected slots:
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 3ef4d687..4294deb5 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -81,7 +81,7 @@
 #include <tqprocess.h>
 #include <tqstyle.h>
 #include <tqdatetimeedit.h>
-#include <qassistantclient.h>
+#include <tqassistantclient.h>
 #include <tqdrawutil.h>
 #include <tqmultilineedit.h> // FIXME: obsolete
 #include <tqsplitter.h>
@@ -94,7 +94,7 @@
 static TQFontDatabase *fontDataBase = 0;
 TQString assistantPath();
 
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
 #include <tqwindowsstyle.h>
 static void setupStyle(TQWidget *w)
 {
@@ -119,11 +119,11 @@ static TQStringList getFontList()
 	fontDataBase = new TQFontDatabase;
 	qAddPostRoutine( cleanupFontDatabase );
     }
-    return fontDataBase->families();
+    return fontDataBase->tqfamilies();
 }
 
 
-class PropertyWhatsThis : public QWhatsThis
+class PropertyWhatsThis : public TQWhatsThis
 {
 public:
     PropertyWhatsThis( PropertyList *l );
@@ -148,7 +148,7 @@ TQString PropertyWhatsThis::text( const TQPoint &pos )
 bool PropertyWhatsThis::clicked( const TQString& href )
 {
     if ( !href.isEmpty() ) {
-	QAssistantClient *ac = MainWindow::self->assistantClient();
+	TQAssistantClient *ac = MainWindow::self->assistantClient();
 	ac->showPage( TQString( qInstallPathDocs() ) + "/html/" + href );
     }
     return FALSE; // do not hide window
@@ -167,7 +167,7 @@ bool PropertyWhatsThis::clicked( const TQString& href )
 */
 
 /*!  If this item should be a child of another property item, specify
-  \a prop as the parent item.
+  \a prop as the tqparent item.
 */
 
 PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName )
@@ -184,7 +184,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
 PropertyItem::~PropertyItem()
 {
     if ( resetButton )
-	delete resetButton->parentWidget();
+	delete resetButton->tqparentWidget();
     resetButton = 0;
 }
 
@@ -234,8 +234,8 @@ void PropertyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 {
     TQColorGroup g( cg );
     g.setColor( TQColorGroup::Base, backgroundColor() );
-    g.setColor( TQColorGroup::Foreground, Qt::black );
-    g.setColor( TQColorGroup::Text, Qt::black );
+    g.setColor( TQColorGroup::Foreground, TQt::black );
+    g.setColor( TQColorGroup::Text, TQt::black );
     int indent = 0;
     if ( column == 0 ) {
 	indent = 20 + ( property ? 20 : 0 );
@@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
 void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
 {
     p->save();
-    TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg,
+    TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
 					TQStyle::Style_Sunken, TQStyleOption(1,1) );
     p->restore();
 }
@@ -308,7 +308,7 @@ bool PropertyItem::hasSubItems() const
     return FALSE;
 }
 
-/*!  Returns the parent property item here if this is a child or 0
+/*!  Returns the tqparent property item here if this is a child or 0
  otherwise.
  */
 
@@ -329,17 +329,17 @@ void PropertyItem::setOpen( bool b )
     open = b;
 
     if ( !open ) {
-	children.setAutoDelete( TRUE );
-	children.clear();
-	children.setAutoDelete( FALSE );
-	qApp->processEvents();
+	tqchildren.setAutoDelete( TRUE );
+	tqchildren.clear();
+	tqchildren.setAutoDelete( FALSE );
+	tqApp->processEvents();
 	listview->updateEditorSize();
 	return;
     }
 
     createChildren();
     initChildren();
-    qApp->processEvents();
+    tqApp->processEvents();
     listview->updateEditorSize();
 }
 
@@ -349,7 +349,7 @@ void PropertyItem::setOpen( bool b )
 void PropertyItem::showEditor()
 {
     createResetButton();
-    resetButton->parentWidget()->show();
+    resetButton->tqparentWidget()->show();
 }
 
 /*!  Subclasses have to hide the editor of the item here
@@ -358,7 +358,7 @@ void PropertyItem::showEditor()
 void PropertyItem::hideEditor()
 {
     createResetButton();
-    resetButton->parentWidget()->hide();
+    resetButton->tqparentWidget()->hide();
 }
 
 /*!  This is called to init the value of the item. Reimplement in
@@ -387,7 +387,7 @@ void PropertyItem::setChanged( bool b, bool updateDb )
     if ( changed == b )
 	return;
     changed = b;
-    repaint();
+    tqrepaint();
     if ( updateDb ) {
 	MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed );
     }
@@ -402,7 +402,7 @@ TQString PropertyItem::name() const
 void PropertyItem::createResetButton()
 {
     if ( resetButton ) {
-	resetButton->parentWidget()->lower();
+	resetButton->tqparentWidget()->lower();
 	return;
     }
     const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance());
@@ -413,8 +413,8 @@ void PropertyItem::createResetButton()
     resetButton = new TQPushButton( hbox );
     setupStyle( resetButton );
     resetButton->setPixmap( DesignerResetPix );
-    resetButton->setFixedWidth( resetButton->sizeHint().width() );
-    hbox->layout()->setAlignment( Qt::AlignRight );
+    resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
+    hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
     listview->addChild( hbox );
     hbox->hide();
     TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -441,13 +441,13 @@ void PropertyItem::updateResetButtonState()
 void PropertyItem::placeEditor( TQWidget *w )
 {
     createResetButton();
-    TQRect r = listview->itemRect( this );
+    TQRect r = listview->tqitemRect( this );
     if ( !r.size().isValid() ) {
 	listview->ensureItemVisible( this );
-#if defined(Q_WS_WIN)
-	listview->repaintContents( FALSE );
+#if defined(TQ_WS_WIN)
+	listview->tqrepaintContents( FALSE );
 #endif
-	r = listview->itemRect( this );
+	r = listview->tqitemRect( this );
     }
     r.setX( listview->header()->sectionPos( 1 ) );
     r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -455,9 +455,9 @@ void PropertyItem::placeEditor( TQWidget *w )
     r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
     w->resize( r.size() );
     listview->moveChild( w, r.x(), r.y() );
-    resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
-    listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
-    resetButton->setFixedHeight( QMAX( 0, r.height() - 3 ) );
+    resetButton->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+    listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
+    resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
 }
 
 /*!  This should be called by subclasses if the user changed the value
@@ -491,18 +491,18 @@ void PropertyItem::childValueChanged( PropertyItem * )
 
 void PropertyItem::addChild( PropertyItem *i )
 {
-    children.append( i );
+    tqchildren.append( i );
 }
 
 int PropertyItem::childCount() const
 {
-    return children.count();
+    return tqchildren.count();
 }
 
 PropertyItem *PropertyItem::child( int i ) const
 {
     // ARRRRRRRRG
-    return ( (PropertyItem*)this )->children.at( i );
+    return ( (PropertyItem*)this )->tqchildren.at( i );
 }
 
 /*!  If the contents of the item is not displayable with a text, but
@@ -525,7 +525,7 @@ void PropertyItem::drawCustomContents( TQPainter *, const TQRect & )
 
 TQString PropertyItem::currentItem() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 int PropertyItem::currentIntItem() const
@@ -548,15 +548,15 @@ int PropertyItem::currentIntItemFromObject() const
 
 TQString PropertyItem::currentItemFromObject() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 void PropertyItem::setFocus( TQWidget *w )
 {
-    if ( !qApp->focusWidget() ||
+    if ( !tqApp->tqfocusWidget() ||
 	 listview->propertyEditor()->formWindow() &&
-	 ( !MainWindow::self->isAFormWindowChild( qApp->focusWidget() ) &&
-	   !qApp->focusWidget()->inherits( "Editor" ) ) )
+	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
+	   !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
 	w->setFocus();
 }
 
@@ -564,7 +564,7 @@ void PropertyItem::setText( int col, const TQString &t )
 {
     TQString txt( t );
     if ( col == 1 )
-	txt = txt.replace( "\n", " " );
+	txt = txt.tqreplace( "\n", " " );
     TQListViewItem::setText( col, txt );
 }
 
@@ -598,7 +598,7 @@ TQLineEdit *PropertyTextItem::lined()
 
     if ( asciiOnly ) {
 	if ( PropertyItem::name() == "name" ) {
-	    lin->setValidator( new AsciiValidator( TQString(":"), lin, "ascii_validator" ) );
+	    lin->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(lin), "ascii_validator" ) );
 	    if ( listview->propertyEditor()->formWindow()->isFake() )
 		lin->setEnabled( FALSE );
 	} else {
@@ -606,7 +606,7 @@ TQLineEdit *PropertyTextItem::lined()
 							   "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9"
 							   "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3"
 							   "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc"
-							   "\xbd\xbe\xbf"), lin, "ascii_validator" ) );
+							   "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) );
 	}
     } if ( !hasMultiLines ) {
 	lin->hide();
@@ -753,7 +753,7 @@ void PropertyTextItem::setValue()
 
 void PropertyTextItem::getText()
 {
-    bool richText = !::qt_cast<TQButton*>(listview->propertyEditor()->widget()) ||
+    bool richText = !::tqqt_cast<TQButton*>(listview->propertyEditor()->widget()) ||
 		    ( text( 0 ) == "whatsThis" );
     bool doWrap = FALSE;
     TQString txt = MultiLineEditor::getText( listview, value().toString(), richText, &doWrap );
@@ -781,7 +781,7 @@ TQLineEdit *PropertyDoubleItem::lined()
     if ( lin )
 	return lin;
     lin = new TQLineEdit( listview->viewport() );
-    lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) );
+    lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) );
 
     connect( lin, TQT_SIGNAL( returnPressed() ),
 	     this, TQT_SLOT( setValue() ) );
@@ -856,11 +856,11 @@ PropertyDateItem::PropertyDateItem( PropertyList *l, PropertyItem *after, Proper
     lin = 0;
 }
 
-QDateEdit *PropertyDateItem::lined()
+TQDateEdit *PropertyDateItem::lined()
 {
     if ( lin )
 	return lin;
-    lin = new QDateEdit( listview->viewport() );
+    lin = new TQDateEdit( listview->viewport() );
     TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() )
 	o->installEventFilter( listview );
@@ -872,7 +872,7 @@ QDateEdit *PropertyDateItem::lined()
 
 PropertyDateItem::~PropertyDateItem()
 {
-    delete (QDateEdit*)lin;
+    delete (TQDateEdit*)lin;
     lin = 0;
 }
 
@@ -931,11 +931,11 @@ PropertyTimeItem::PropertyTimeItem( PropertyList *l, PropertyItem *after, Proper
     lin = 0;
 }
 
-QTimeEdit *PropertyTimeItem::lined()
+TQTimeEdit *PropertyTimeItem::lined()
 {
     if ( lin )
 	return lin;
-    lin = new QTimeEdit( listview->viewport() );
+    lin = new TQTimeEdit( listview->viewport() );
     connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ),
 	     this, TQT_SLOT( setValue() ) );
     TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
@@ -947,7 +947,7 @@ QTimeEdit *PropertyTimeItem::lined()
 
 PropertyTimeItem::~PropertyTimeItem()
 {
-    delete (QTimeEdit*)lin;
+    delete (TQTimeEdit*)lin;
     lin = 0;
 }
 
@@ -1006,11 +1006,11 @@ PropertyDateTimeItem::PropertyDateTimeItem( PropertyList *l, PropertyItem *after
     lin = 0;
 }
 
-QDateTimeEdit *PropertyDateTimeItem::lined()
+TQDateTimeEdit *PropertyDateTimeItem::lined()
 {
     if ( lin )
 	return lin;
-    lin = new QDateTimeEdit( listview->viewport() );
+    lin = new TQDateTimeEdit( listview->viewport() );
     connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ),
 	     this, TQT_SLOT( setValue() ) );
     TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
@@ -1022,7 +1022,7 @@ QDateTimeEdit *PropertyDateTimeItem::lined()
 
 PropertyDateTimeItem::~PropertyDateTimeItem()
 {
-    delete (QDateTimeEdit*)lin;
+    delete (TQDateTimeEdit*)lin;
     lin = 0;
 }
 
@@ -1635,8 +1635,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
     box = new TQHBox( listview->viewport() );
     box->hide();
     pixPrev = new TQLabel( box );
-    pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
-    pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
+    pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
+    pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
     button = new TQPushButton( "...", box );
     setupStyle( button );
     button->setFixedWidth( 20 );
@@ -1679,7 +1679,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v )
     else
 	pixPrev->setPixmap( v.toImage() );
     PropertyItem::setValue( v );
-    repaint();
+    tqrepaint();
 }
 
 void PropertyPixmapItem::getPixmap()
@@ -1714,8 +1714,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
 
     if ( !pix.isNull() ) {
 	p->save();
-	p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
-				       (int)(p->worldMatrix().dy() + r.y()) ),
+	p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
+				       (int)(p->tqworldMatrix().dy() + r.y()) ),
 			       r.size() ) );
 	p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
 	p->restore();
@@ -1726,8 +1726,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
 // --------------------------------------------------------------
 
 PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
-				      const TQString &propName, bool children )
-    : PropertyItem( l, after, prop, propName ), withChildren( children )
+				      const TQString &propName, bool tqchildren )
+    : PropertyItem( l, after, prop, propName ), withChildren( tqchildren )
 {
     box = new TQHBox( listview->viewport() );
     box->hide();
@@ -1829,7 +1829,7 @@ void PropertyColorItem::childValueChanged( PropertyItem *child )
 
 void PropertyColorItem::getColor()
 {
-    TQColor c = QColorDialog::getColor( val.asColor(), listview );
+    TQColor c = TQColorDialog::getColor( val.asColor(), listview );
     if ( c.isValid() ) {
 	setValue( c );
 	notifyValueChange();
@@ -1945,7 +1945,7 @@ void PropertyFontItem::setValue( const TQVariant &v )
 void PropertyFontItem::getFont()
 {
     bool ok = FALSE;
-    TQFont f = QFontDialog::getFont( &ok, val.toFont(), listview );
+    TQFont f = TQFontDialog::getFont( &ok, val.toFont(), listview );
     if ( ok && f != val.toFont() ) {
 	setValue( f );
 	notifyValueChange();
@@ -2013,7 +2013,7 @@ void PropertyDatabaseItem::createChildren()
 
 void PropertyDatabaseItem::initChildren()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     PropertyItem *item = 0;
     TQStringList lst = value().toStringList();
     TQString conn, table;
@@ -2026,13 +2026,13 @@ void PropertyDatabaseItem::initChildren()
 	    else if ( lst.count() > 0 )
 		item->setValue( TQStringList( lst[ 0 ] ) );
 	    else if ( withField )
-		item->setValue( TQStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(),
+		item->setValue( TQStringList( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()),
 									 "database" ).toStringList()[ 0 ] ) );
 
 	    if ( lst.count() > 0 && !lst[ 0 ].isEmpty() )
 		item->setCurrentItem( lst[ 0 ] );
 	    else if ( !isChanged() && withField )
-		item->setCurrentItem( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(),
+		item->setCurrentItem( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()),
 								  "database" ).toStringList()[ 0 ] );
 	    else
 		item->setCurrentItem( 0 );
@@ -2044,7 +2044,7 @@ void PropertyDatabaseItem::initChildren()
 	    else if ( lst.count() > 1 )
 		item->setValue( TQStringList( lst[ 1 ] ) );
 	    else if ( withField ) {
-		TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList();
+		TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList();
 		if ( fakeLst.count() > 1 )
 		    item->setValue( fakeLst[ 1 ] );
 	    }
@@ -2052,7 +2052,7 @@ void PropertyDatabaseItem::initChildren()
 	    if ( lst.count() > 1 && !lst[ 1 ].isEmpty() )
 		item->setCurrentItem( lst[ 1 ] );
 	    else if ( !isChanged() && withField ) {
-		TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList();
+		TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList();
 		if ( fakeLst.count() > 1 )
 		    item->setCurrentItem( fakeLst[ 1 ] );
 	        else
@@ -2115,7 +2115,7 @@ bool PropertyDatabaseItem::hasSubItems() const
 
 void PropertyDatabaseItem::childValueChanged( PropertyItem *c )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList lst;
     lst << ( (PropertyListItem*)PropertyItem::child( 0 ) )->currentItem()
 	<< ( (PropertyListItem*)PropertyItem::child( 1 ) )->currentItem();
@@ -2224,7 +2224,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
 	return;
 
     TQString s = i18n( "%1/%2/%3/%4" );
-    s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ).
+    s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ).
 	arg( size_type_to_string( v.toSizePolicy().verData() ) ).
 	arg( v.toSizePolicy().horStretch() ).
 	arg( v.toSizePolicy().verStretch() );
@@ -2298,7 +2298,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v )
     TQString s;
     palettePrev->setPalette( v.toPalette() );
     PropertyItem::setValue( v );
-    repaint();
+    tqrepaint();
 }
 
 void PropertyPaletteItem::getPalette()
@@ -2307,11 +2307,11 @@ void PropertyPaletteItem::getPalette()
 	return;
     bool ok = FALSE;
     TQWidget *w = (TQWidget*)listview->propertyEditor()->widget();
-    if ( ::qt_cast<TQScrollView*>(w) )
+    if ( ::tqqt_cast<TQScrollView*>(w) )
 	w = ( (TQScrollView*)w )->viewport();
     TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
-#if defined(QT_NON_COMMERCIAL)
-					      w->backgroundMode(), listview->topLevelWidget(),
+#if defined(TQT_NON_COMMERCIAL)
+					      w->backgroundMode(), listview->tqtopLevelWidget(),
 #else
 					      w->backgroundMode(), listview,
 #endif
@@ -2331,8 +2331,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
 {
     TQPalette pal( value().toPalette() );
     p->save();
-    p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
-				   (int)(p->worldMatrix().dy() + r.y()) ),
+    p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
+				   (int)(p->tqworldMatrix().dy() + r.y()) ),
 			   r.size() ) );
     TQRect r2( r );
     r2.setX( r2.x() + 2 );
@@ -2382,16 +2382,16 @@ TQComboBox *PropertyCursorItem::combo()
     comb->insertItem( CrossPix, i18n("Cross"), TQObject::CrossCursor );
     comb->insertItem( WaitPix, i18n("Waiting"), TQObject::WaitCursor );
     comb->insertItem( IBeamPix, i18n("iBeam"), TQObject::IbeamCursor );
-    comb->insertItem( SizeVPix, i18n("Size Vertical"), TQObject::SizeVerCursor );
-    comb->insertItem( SizeHPix, i18n("Size Horizontal"), TQObject::SizeHorCursor );
+    comb->insertItem( SizeVPix, i18n("SizeQt::Vertical"), TQObject::SizeVerCursor );
+    comb->insertItem( SizeHPix, i18n("SizeQt::Horizontal"), TQObject::SizeHorCursor );
     comb->insertItem( SizeFPix, i18n("Size Slash"), TQObject::SizeBDiagCursor );
     comb->insertItem( SizeBPix, i18n("Size Backslash"), TQObject::SizeFDiagCursor );
     comb->insertItem( SizeAllPix, i18n("Size All"), TQObject::SizeAllCursor );
     cur = TQBitmap( 25, 25, 1 );
     cur.setMask( cur );
     comb->insertItem( cur, i18n("Blank"), TQObject::BlankCursor );
-    comb->insertItem( VSplitPix, i18n("Split Vertical"), TQObject::SplitVCursor );
-    comb->insertItem( HSplitPix, i18n("Split Horizontal"), TQObject::SplitHCursor );
+    comb->insertItem( VSplitPix, i18n("SplitQt::Vertical"), TQObject::SplitVCursor );
+    comb->insertItem( HSplitPix, i18n("SplitQt::Horizontal"), TQObject::SplitHCursor );
     comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor );
     comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor );
 
@@ -2411,7 +2411,7 @@ void PropertyCursorItem::showEditor()
     PropertyItem::showEditor();
     if ( !comb ) {
 	combo()->blockSignals( TRUE );
-	combo()->setCurrentItem( (int)value().toCursor().shape() );
+	combo()->setCurrentItem( (int)value().toCursor().tqshape() );
 	combo()->blockSignals( FALSE );
     }
     placeEditor( combo() );
@@ -2434,7 +2434,7 @@ void PropertyCursorItem::setValue( const TQVariant &v )
 	return;
 
     combo()->blockSignals( TRUE );
-    combo()->setCurrentItem( (int)v.toCursor().shape() );
+    combo()->setCurrentItem( (int)v.toCursor().tqshape() );
     combo()->blockSignals( FALSE );
     setText( 1, combo()->currentText() );
     PropertyItem::setValue( v );
@@ -2592,12 +2592,12 @@ void PropertyKeysequenceItem::setValue( const TQVariant &v )
 
 // --------------------------------------------------------------
 
-EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f )
-    : TQFrame( parent, name, f )
+EnumPopup::EnumPopup( TQWidget *tqparent, const char *name, WFlags f )
+    : TQFrame( tqparent, name, f )
 {
     setLineWidth( 1 );
     setFrameStyle( Panel | Plain );
-    setPaletteBackgroundColor( Qt::white );
+    setPaletteBackgroundColor( TQt::white );
     popLayout = new TQVBoxLayout( this, 3 );
     checkBoxList.setAutoDelete( TRUE );
 }
@@ -2654,8 +2654,8 @@ TQValueList<EnumItem> EnumPopup::enumList() const
     return itemList;
 }
 
-EnumBox::EnumBox( TQWidget *parent, const char *name )
-    : TQComboBox( parent, name )
+EnumBox::EnumBox( TQWidget *tqparent, const char *name )
+    : TQComboBox( tqparent, name )
 {
     pop = new EnumPopup( this, "popup", TQObject::WType_Popup );
     connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) );
@@ -2678,7 +2678,7 @@ void EnumBox::popupClosed()
 void EnumBox::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
-    const TQColorGroup & g = colorGroup();
+    const TQColorGroup & g = tqcolorGroup();
     p.setPen(g.text());
 
     TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -2692,15 +2692,15 @@ void EnumBox::paintEvent( TQPaintEvent * )
 		&g.brush( TQColorGroup::Button ) );
 	return;
     }
-    style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+    tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
 				    flags, TQStyle::SC_All,
 				    (arrowDown ?
 				     TQStyle::SC_ComboBoxArrow :
 				     TQStyle::SC_None ));
 
-    TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 	    TQStyle::SC_ComboBoxEditField );
-    re = TQStyle::visualRect(re, this);
+    re = TQStyle::tqvisualRect(re, this);
     p.setClipRect( re );
 
     if ( !str.isNull() ) {
@@ -2730,7 +2730,7 @@ void EnumBox::popup()
 	popupShown = FALSE;
 	return;
     }
-    pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) );
+    pop->move( ((TQWidget*)tqparent())->mapToGlobal( tqgeometry().bottomLeft() ) );
     pop->setMinimumWidth( width() );
     emit aboutToShowPopup();
     pop->show();
@@ -2739,18 +2739,18 @@ void EnumBox::popup()
 
 void EnumBox::mousePressEvent( TQMouseEvent *e )
 {
-    if ( e->button() != LeftButton )
+    if ( e->button() != Qt::LeftButton )
 	return;
 
-    TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 						      TQStyle::SC_ComboBoxArrow);
-    arrowRect = TQStyle::visualRect(arrowRect, this);
+    arrowRect = TQStyle::tqvisualRect(arrowRect, this);
 
-    arrowRect.setHeight( QMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
+    arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
-    if ( arrowRect.contains( e->pos() ) ) {
+    if ( arrowRect.tqcontains( e->pos() ) ) {
 	arrowDown = TRUE;
-	repaint( FALSE );
+	tqrepaint( FALSE );
     }
 
     popup();
@@ -2770,13 +2770,13 @@ void EnumBox::keyPressEvent( TQKeyEvent *e )
 void EnumBox::restoreArrow()
 {
     arrowDown = FALSE;
-    repaint( FALSE );
+    tqrepaint( FALSE );
 }
 
 void EnumBox::setText( const TQString &text )
 {
     str = text;
-    repaint( FALSE );
+    tqrepaint( FALSE );
 }
 
 
@@ -2847,7 +2847,7 @@ void PropertyEnumItem::setValue()
 	    enumString += "|" + (*it).key;
     }
     if ( !enumString.isEmpty() )
-	enumString.replace( 0, 1, "" );
+	enumString.tqreplace( 0, 1, "" );
 
     box->setText( enumString );
     setText( 1, enumString );
@@ -2870,7 +2870,7 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst )
 	}
     }
     if ( !enumString.isEmpty() )
-	enumString.replace( 0, 1, "" );
+	enumString.tqreplace( 0, 1, "" );
     box->setText( enumString );
     setText( 1, enumString );
 }
@@ -2982,9 +2982,9 @@ static TQVariant::Type type_to_variant( const TQString &s )
     if ( s == "Palette" )
 	return TQVariant::Palette;
     if ( s == "ColorGroup" )
-	return TQVariant::ColorGroup;
+	return (QVariant::Type)TQVariant::ColorGroup;
     if ( s == "IconSet" )
-	return TQVariant::IconSet;
+	return (QVariant::Type)TQVariant::IconSet;
     if ( s == "Point" )
 	return TQVariant::Point;
     if ( s == "Image" )
@@ -2998,9 +2998,9 @@ static TQVariant::Type type_to_variant( const TQString &s )
     if ( s == "Double" )
 	return TQVariant::Double;
     if ( s == "CString" )
-	return TQVariant::CString;
+	return (QVariant::Type)TQVariant::CString;
     if ( s == "PointArray" )
-	return TQVariant::PointArray;
+	return (QVariant::Type)TQVariant::PointArray;
     if ( s == "Region" )
 	return TQVariant::Region;
     if ( s == "Bitmap" )
@@ -3018,14 +3018,14 @@ static TQVariant::Type type_to_variant( const TQString &s )
     return TQVariant::Invalid;
 }
 
-#ifndef QT_NO_SQL
-static bool parent_is_data_aware( TQWidget *w )
+#ifndef TQT_NO_SQL
+static bool tqparent_is_data_aware( TQWidget *w )
 {
-    TQWidget *p = w ? w->parentWidget() : 0;
+    TQWidget *p = w ? w->tqparentWidget() : 0;
     while ( p && !p->isTopLevel() ) {
-	if ( ::qt_cast<QDesignerDataBrowser*>(p) || ::qt_cast<QDesignerDataView*>(p) )
+	if ( ::tqqt_cast<TQDesignerDataBrowser*>(p) || ::tqqt_cast<TQDesignerDataView*>(p) )
 	    return TRUE;
-	p = p->parentWidget();
+	p = p->tqparentWidget();
     }
     return FALSE;
 }
@@ -3039,26 +3039,26 @@ void PropertyList::setupProperties()
 {
     if ( !editor->widget() )
 	return;
-    bool allProperties = !::qt_cast<Spacer*>(editor->widget());
-    TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
+    bool allProperties = !::tqqt_cast<Spacer*>(editor->widget());
+    TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
     PropertyItem *item = 0;
     TQMap<TQString, bool> unique;
     TQObject *w = editor->widget();
     TQStringList valueSet;
-    bool parentHasLayout =
+    bool tqparentHasLayout =
 	w->isWidgetType() &&
-	!editor->formWindow()->isMainContainer( (TQWidget*)w ) && ( (TQWidget*)w )->parentWidget() &&
-	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
+	!editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->tqparentWidget() &&
+	WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
 	const TQMetaProperty* p =
-	    editor->widget()->metaObject()->
-	    property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
+	    editor->widget()->tqmetaObject()->
+	    property( editor->widget()->tqmetaObject()->tqfindProperty( it.current(), allProperties), allProperties );
 	if ( !p )
 	    continue;
-	if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
+	if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) )
 	    continue;
-	if ( ::qt_cast<QDesignerToolBar*>(editor->widget()) ||
-	     ::qt_cast<MenuBarEditor*>(editor->widget()) ) {
+	if ( ::tqqt_cast<TQDesignerToolBar*>(editor->widget()) ||
+	     ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) {
 	    if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
 		continue;
 	    if ( qstrcmp( p->name(), "minimumWidth" ) == 0 )
@@ -3071,14 +3071,14 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
 		continue;
 	}
-	unique.insert( TQString::fromLatin1( it.current() ), TRUE );
+	unique.insert( TQString::tqfromLatin1( it.current() ), TRUE );
 	if ( editor->widget()->isWidgetType() &&
-	     editor->formWindow()->isMainContainer( (TQWidget*)editor->widget() ) ) {
+	     editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
 	} else { // hide some toplevel-only stuff
@@ -3092,9 +3092,9 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "baseSize" ) == 0 )
 		continue;
-	    if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
+	    if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
-	    if ( ::qt_cast<QLayoutWidget*>(w) || ::qt_cast<Spacer*>(w) ) {
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) || ::tqqt_cast<Spacer*>(w) ) {
 		if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
@@ -3107,9 +3107,9 @@ void PropertyList::setupProperties()
 		    continue;
 		if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "enabled" ) == 0 )
 		    continue;
@@ -3137,7 +3137,7 @@ void PropertyList::setupProperties()
 		    continue;
 	    }
 	}
-	if ( ::qt_cast<TQActionGroup*>(w) ) {
+	if ( ::tqqt_cast<TQActionGroup*>(w) ) {
 	    if ( qstrcmp( p->name(), "usesDropDown" ) == 0 )
 		continue;
 	    if ( qstrcmp( p->name(), "toggleAction" ) == 0 )
@@ -3151,10 +3151,10 @@ void PropertyList::setupProperties()
 	    continue;
 	if ( qstrcmp( p->name(), "maximumWidth" ) == 0 )
 	    continue;
-	if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case)
+	if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case)
 	    if ( !editor->widget()->isWidgetType() ||
-		 !editor->widget()->parent() ||
-		 !::qt_cast<TQButtonGroup*>(editor->widget()->parent()) )
+		 !editor->widget()->tqparent() ||
+		 !::tqqt_cast<TQButtonGroup*>(editor->widget()->tqparent()) )
 		continue;
 	}
 
@@ -3164,7 +3164,7 @@ void PropertyList::setupProperties()
 	       isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) &&
 	     ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) {
 	    if ( p->isSetType() ) {
-		if ( TQString( p->name() ) == "alignment" ) {
+		if ( TQString( p->name() ) == "tqalignment" ) {
 		    TQStringList lst;
 		    lst << p->valueToKey( AlignAuto )
 			<< p->valueToKey( AlignLeft )
@@ -3176,7 +3176,7 @@ void PropertyList::setupProperties()
 		    setPropertyValue( item );
 		    if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) )
 			item->setChanged( TRUE, FALSE );
-		    if ( !::qt_cast<TQMultiLineEdit*>(editor->widget()) ) {
+		    if ( !::tqqt_cast<TQMultiLineEdit*>(editor->widget()) ) {
 			lst.clear();
 			lst << p->valueToKey( AlignTop )
 			    << p->valueToKey( AlignVCenter )
@@ -3187,7 +3187,7 @@ void PropertyList::setupProperties()
 			if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) )
 			    item->setChanged( TRUE, FALSE );
 			item = new PropertyBoolItem( this, item, 0, "wordwrap" );
-			if ( ::qt_cast<TQGroupBox*>(w) )
+			if ( ::tqqt_cast<TQGroupBox*>(w) )
 			    item->setVisible( FALSE );
 			setPropertyValue( item );
 			if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) )
@@ -3212,7 +3212,7 @@ void PropertyList::setupProperties()
 		TQStringList lst;
 		for ( uint i = 0; i < l.count(); ++i ) {
 		    TQString k = l.at( i );
-		    // filter out enum-masks
+		    // filter out enum-tqmasks
 		    if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase )
 			continue;
 		    lst << k;
@@ -3226,7 +3226,7 @@ void PropertyList::setupProperties()
 	    }
 	}
 	if ( item && !p->isSetType() ) {
-	    if ( valueSet.findIndex( item->name() ) == -1 ) {
+	    if ( valueSet.tqfindIndex( item->name() ) == -1 ) {
 		setPropertyValue( item );
 		valueSet << item->name();
 	    }
@@ -3235,25 +3235,25 @@ void PropertyList::setupProperties()
 	}
     }
 
-    if ( !::qt_cast<TQSplitter*>(w) && !::qt_cast<MenuBarEditor*>(w) && !::qt_cast<QDesignerToolBar*>(w) &&
-	 w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
-	item = new PropertyLayoutItem( this, item, 0, "layoutSpacing" );
+    if ( !::tqqt_cast<TQSplitter*>(w) && !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<TQDesignerToolBar*>(w) &&
+	 w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
+	item = new PropertyLayoutItem( this, item, 0, "tqlayoutSpacing" );
 	setPropertyValue( item );
-	if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutSpacing" )
+	if ( MetaDataBase::isPropertyChanged( editor->widget(), "tqlayoutSpacing" )
 	     || MetaDataBase::spacing( editor->widget() ) != -1 )
-	    layoutInitValue( item, TRUE );
+	    tqlayoutInitValue( item, TRUE );
 	else
-	    layoutInitValue( item );
-	item = new PropertyLayoutItem( this, item, 0, "layoutMargin" );
+	    tqlayoutInitValue( item );
+	item = new PropertyLayoutItem( this, item, 0, "tqlayoutMargin" );
 	setPropertyValue( item );
-	if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutMargin" )
+	if ( MetaDataBase::isPropertyChanged( editor->widget(), "tqlayoutMargin" )
 	     || MetaDataBase::margin( editor->widget() ) != -1 )
-	    layoutInitValue( item, TRUE );
+	    tqlayoutInitValue( item, TRUE );
 	else
-	    layoutInitValue( item );
+	    tqlayoutInitValue( item );
 	TQWidget *widget = (TQWidget*)w;
-	if ( ( !::qt_cast<QLayoutWidget*>(widget) &&
-	       widget->parentWidget() && ::qt_cast<FormWindow*>(widget->parentWidget()) ) ) {
+	if ( ( !::tqqt_cast<TQLayoutWidget*>(widget) &&
+	       widget->tqparentWidget() && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) ) {
 	    item = new PropertyListItem( this, item, 0, "resizeMode", FALSE );
 	    TQStringList lst;
 	    lst << "Auto" << "FreeResize" << "Minimum" << "Fixed";
@@ -3268,8 +3268,8 @@ void PropertyList::setupProperties()
 	}
     }
 
-    if ( !::qt_cast<Spacer*>(w) && !::qt_cast<QLayoutWidget*>(w) &&
-	 !::qt_cast<MenuBarEditor*>(w) && !::qt_cast<QDesignerToolBar*>(w) ) {
+    if ( !::tqqt_cast<Spacer*>(w) && !::tqqt_cast<TQLayoutWidget*>(w) &&
+	 !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<TQDesignerToolBar*>(w) ) {
 	item = new PropertyTextItem( this, item, 0, "toolTip", TRUE, FALSE );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "toolTip" ) )
@@ -3280,17 +3280,17 @@ void PropertyList::setupProperties()
 	    item->setChanged( TRUE, FALSE );
     }
 
-#ifndef QT_NO_SQL
-    if ( !::qt_cast<TQDataTable*>(editor->widget()) && !::qt_cast<TQDataBrowser*>(editor->widget()) &&
-	 !::qt_cast<TQDataView*>(editor->widget()) && parent_is_data_aware( ::qt_cast<TQWidget*>(editor->widget()) ) ) {
-	item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
+#ifndef TQT_NO_SQL
+    if ( !::tqqt_cast<TQDataTable*>(editor->widget()) && !::tqqt_cast<TQDataBrowser*>(editor->widget()) &&
+	 !::tqqt_cast<TQDataView*>(editor->widget()) && tqparent_is_data_aware( ::tqqt_cast<TQWidget*>(editor->widget()) ) ) {
+	item = new PropertyDatabaseItem( this, item, 0, "database", TQT_BASE_OBJECT(editor->formWindow()->mainContainer()) != TQT_BASE_OBJECT(w) );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
 	    item->setChanged( TRUE, FALSE );
     }
 
-    if ( ::qt_cast<TQDataTable*>(editor->widget()) || ::qt_cast<TQDataBrowser*>(editor->widget()) ||
-	 ::qt_cast<TQDataView*>(editor->widget()) ) {
+    if ( ::tqqt_cast<TQDataTable*>(editor->widget()) || ::tqqt_cast<TQDataBrowser*>(editor->widget()) ||
+	 ::tqqt_cast<TQDataView*>(editor->widget()) ) {
 	item = new PropertyDatabaseItem( this, item, 0, "database", FALSE );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@@ -3324,7 +3324,7 @@ void PropertyList::setupProperties()
 	sort();
 	setSorting( -1 );
 	setCurrentItem( firstChild() );
-	qApp->processEvents();
+	tqApp->processEvents();
     }
 
     updateEditorSize();
@@ -3339,7 +3339,7 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw,
 
     for ( TQValueList<MetaDataBase::Property>::Iterator it =
 	  cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) {
-	if ( unique.contains( TQString( (*it).property ) ) )
+	if ( unique.tqcontains( TQString( (*it).property ) ) )
 	    continue;
 	unique.insert( TQString( (*it).property ), TRUE );
 	addPropertyItem( item, (*it).property, type_to_variant( (*it).type ) );
@@ -3359,7 +3359,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
 	l << "";
 	while ( it.current() ) {
 	    if ( editor->formWindow()->canBeBuddy( it.current() ) ) {
-		if ( l.find( it.current()->name() ) == l.end() )
+		if ( l.tqfind( it.current()->name() ) == l.end() )
 		    l << it.current()->name();
 	    }
 	    ++it;
@@ -3373,14 +3373,14 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
     switch ( t ) {
     case TQVariant::String:
 	item = new PropertyTextItem( this, item, 0, name, TRUE,
-				     ::qt_cast<TQLabel*>(editor->widget()) ||
-				     ::qt_cast<TQTextView*>(editor->widget()) ||
-				     ::qt_cast<TQButton*>(editor->widget()) );
+				     ::tqqt_cast<TQLabel*>(editor->widget()) ||
+				     ::tqqt_cast<TQTextView*>(editor->widget()) ||
+				     ::tqqt_cast<TQButton*>(editor->widget()) );
 	break;
     case TQVariant::CString:
 	item = new PropertyTextItem( this, item, 0,
 				     name, name == "name" &&
-				     editor->widget() == editor->formWindow()->mainContainer(),
+				     TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()),
 				     FALSE, TRUE );
 	break;
     case TQVariant::Bool:
@@ -3392,7 +3392,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
     case TQVariant::Int:
 	if ( name == "accel" )
 	    item = new PropertyTextItem( this, item, 0, name, FALSE, FALSE, FALSE, TRUE );
-	else if ( name == "layoutSpacing" || name == "layoutMargin" )
+	else if ( name == "tqlayoutSpacing" || name == "tqlayoutMargin" )
 	    item = new PropertyLayoutItem( this, item, 0, name );
 	else if ( name == "resizeMode" )
 	    item = new PropertyListItem( this, item, 0, name, TRUE );
@@ -3486,7 +3486,7 @@ void PropertyList::valueChanged( PropertyItem *i )
 {
     if ( !editor->widget() )
 	return;
-    TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
+    TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@@ -3496,11 +3496,11 @@ void PropertyList::valueChanged( PropertyItem *i )
     editor->formWindow()->commandHistory()->addCommand( cmd, TRUE );
 }
 
-void PropertyList::layoutInitValue( PropertyItem *i, bool changed )
+void PropertyList::tqlayoutInitValue( PropertyItem *i, bool changed )
 {
     if ( !editor->widget() )
 	return;
-    TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
+    TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@@ -3546,15 +3546,15 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
     else if ( e->type() == TQEvent::MouseButtonPress )
 	theLastEvent = MouseEvent;
 
-    if ( o != this &&e->type() == TQEvent::KeyPress ) {
+    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) {
 	TQKeyEvent *ke = (TQKeyEvent*)e;
 	if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) &&
-	     ( o != this || o != viewport() ) &&
+	     ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) &&
 	     !( ke->state() & ControlButton ) ) {
 	    TQApplication::sendEvent( this, (TQKeyEvent*)e );
 	    return TRUE;
-	} else if ( ( !::qt_cast<TQLineEdit*>(o) ||
-		      ( ::qt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) &&
+	} else if ( ( !::tqqt_cast<TQLineEdit*>(o) ||
+		      ( ::tqqt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) &&
 		    i && i->hasSubItems() ) {
 	    if ( !i->isOpen() &&
 		 ( ke->key() == Key_Plus ||
@@ -3564,21 +3564,21 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 		      ( ke->key() == Key_Minus ||
 			ke->key() == Key_Left ) )
 		i->setOpen( FALSE );
-	} else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::qt_cast<TQComboBox*>(o) ) {
+	} else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::tqqt_cast<TQComboBox*>(o) ) {
 	    TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 );
 	    TQApplication::sendEvent( o, &ke2 );
 	    return TRUE;
 	}
-    } else if ( e->type() == TQEvent::FocusOut && ::qt_cast<TQLineEdit*>(o) && editor->formWindow() ) {
+    } else if ( e->type() == TQEvent::FocusOut && ::tqqt_cast<TQLineEdit*>(o) && editor->formWindow() ) {
 	TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) );
-    } else if ( o == viewport() ) {
+    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) {
 	TQMouseEvent *me;
 	PropertyListItem* i;
 	switch ( e->type() ) {
 	case TQEvent::MouseButtonPress:
 	    me = (TQMouseEvent*)e;
 	    i = (PropertyListItem*) itemAt( me->pos() );
-	    if ( i && ( ::qt_cast<PropertyColorItem*>(i) || ::qt_cast<PropertyPixmapItem*>(i) ) ) {
+	    if ( i && ( ::tqqt_cast<PropertyColorItem*>(i) || ::tqqt_cast<PropertyPixmapItem*>(i) ) ) {
 		pressItem = i;
 		pressPos = me->pos();
 		mousePressed = TRUE;
@@ -3586,13 +3586,13 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	    break;
 	case TQEvent::MouseMove:
 	    me = (TQMouseEvent*)e;
-	    if ( me && me->state() & LeftButton && mousePressed) {
+	    if ( me && me->state() & Qt::LeftButton && mousePressed) {
 
 		i = (PropertyListItem*) itemAt( me->pos() );
 		if ( i  && i == pressItem ) {
 
 		    if (( pressPos - me->pos() ).manhattanLength() > TQApplication::startDragDistance() ){
-			if ( ::qt_cast<PropertyColorItem*>(i) ) {
+			if ( ::tqqt_cast<PropertyColorItem*>(i) ) {
 			    TQColor col = i->value().asColor();
 			    TQColorDrag *drg = new TQColorDrag( col, this );
 			    TQPixmap pix( 25, 25 );
@@ -3604,7 +3604,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 			    mousePressed = FALSE;
 			    drg->dragCopy();
 			}
-			else if ( ::qt_cast<PropertyPixmapItem*>(i) ) {
+			else if ( ::tqqt_cast<PropertyPixmapItem*>(i) ) {
 			    TQPixmap pix = i->value().asPixmap();
 			    if( !pix.isNull() ) {
 				TQImage img = pix.convertToImage();
@@ -3621,7 +3621,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	default:
 	    break;
 	}
-    } else if ( o == header() ) {
+    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) {
 	if ( e->type() == TQEvent::ContextMenu ) {
 	    ((TQContextMenuEvent *)e)->accept();
 	    TQPopupMenu menu( 0 );
@@ -3663,7 +3663,7 @@ void PropertyList::refetchData()
 	if ( i->hasSubItems() )
 	    i->initChildren();
 	bool changed = MetaDataBase::isPropertyChanged( editor->widget(), i->name() );
-	if ( ( i->name() == "layoutSpacing" || i->name() == "layoutMargin" ) ) {
+	if ( ( i->name() == "tqlayoutSpacing" || i->name() == "tqlayoutMargin" ) ) {
 	    if ( i->value().toString() != "-1" )
 		i->setChanged( TRUE, FALSE );
 	    else
@@ -3679,9 +3679,9 @@ static void clearAlignList( TQStrList &l )
 {
     if ( l.count() == 1 )
 	return;
-    if ( l.find( "AlignAuto" ) != -1 )
+    if ( l.tqfind( "AlignAuto" ) != -1 )
 	l.remove( "AlignAuto" );
-    if ( l.find( "WordBreak" ) != -1 )
+    if ( l.tqfind( "WordBreak" ) != -1 )
 	l.remove( "WordBreak" );
 }
 
@@ -3692,35 +3692,35 @@ static void clearAlignList( TQStrList &l )
 void PropertyList::setPropertyValue( PropertyItem *i )
 {
     const TQMetaProperty *p =
-	editor->widget()->metaObject()->
-	property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE );
+	editor->widget()->tqmetaObject()->
+	property( editor->widget()->tqmetaObject()->tqfindProperty( i->name(), TRUE), TRUE );
     if ( !p ) {
 	if ( i->name() == "hAlign" ) {
-	    int align = editor->widget()->property( "alignment" ).toInt();
-	    p = editor->widget()->metaObject()->
-		property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE );
+	    int align = editor->widget()->property( "tqalignment" ).toInt();
+	    p = editor->widget()->tqmetaObject()->
+		property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
 	    align &= ~AlignVertical_Mask;
 	    TQStrList l = p->valueToKeys( align );
 	    clearAlignList( l );
 	    ( (PropertyListItem*)i )->setCurrentItem( l.last() );
 	} else if ( i->name() == "vAlign" ) {
-	    int align = editor->widget()->property( "alignment" ).toInt();
-	    p = editor->widget()->metaObject()->
-		property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE );
+	    int align = editor->widget()->property( "tqalignment" ).toInt();
+	    p = editor->widget()->tqmetaObject()->
+		property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
 	    align &= ~AlignHorizontal_Mask;
 	    ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
 	} else if ( i->name() == "wordwrap" ) {
-	    int align = editor->widget()->property( "alignment" ).toInt();
+	    int align = editor->widget()->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		i->setValue( TQVariant( TRUE, 0 ) );
 	    else
 		i->setValue( TQVariant( FALSE, 0 ) );
-	} else if ( i->name() == "layoutSpacing" ) {
-	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
-	} else if ( i->name() == "layoutMargin" ) {
-	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
+	} else if ( i->name() == "tqlayoutSpacing" ) {
+	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
+	} else if ( i->name() == "tqlayoutMargin" ) {
+	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
 	} else if ( i->name() == "resizeMode" ) {
-	    ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
+	    ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) )) );
 	} else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) {
 	    i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) );
 	} else if ( editor->widget()->inherits( "CustomWidget" ) ) {
@@ -3769,7 +3769,7 @@ void PropertyList::resetProperty()
     PropertyItem *i = (PropertyItem*)currentItem();
     if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) )
 	return;
-    TQString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
+    TQString pn( i18n( "Reset '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), i->value(),
@@ -3790,9 +3790,9 @@ void PropertyList::viewportDragEnterEvent( TQDragEnterEvent *e )
 	return;
     }
 
-    if ( ::qt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
+    if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
 	e->accept();
-    else if ( ::qt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
+    else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
 	e->accept();
     else
 	e->ignore();
@@ -3806,9 +3806,9 @@ void PropertyList::viewportDragMoveEvent ( TQDragMoveEvent *e )
 	return;
     }
 
-    if ( ::qt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
+    if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
 	e->accept();
-    else if ( ::qt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
+    else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
 	e->accept();
     else
 	e->ignore();
@@ -3822,14 +3822,14 @@ void PropertyList::viewportDropEvent ( TQDropEvent *e )
 	return;
     }
 
-    if ( ::qt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) {
+    if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) {
 	TQColor color;
 	TQColorDrag::decode( e, color );
 	i->setValue( TQVariant( color ) );
 	valueChanged( i );
 	e->accept();
     }
-    else if ( ::qt_cast<PropertyPixmapItem*>(i)  && TQImageDrag::canDecode( e ) ) {
+    else if ( ::tqqt_cast<PropertyPixmapItem*>(i)  && TQImageDrag::canDecode( e ) ) {
 	TQImage img;
 	TQImageDrag::decode( e, img );
 	TQPixmap pm;
@@ -3859,24 +3859,24 @@ void PropertyList::showCurrentWhatsThis()
 TQString PropertyList::whatsThisText( TQListViewItem *i )
 {
     if ( !i || !editor->widget() )
-	return TQString::null;
+	return TQString();
     readPropertyDocs();
     if ( ( (PropertyItem*)i )->propertyParent() )
 	i = ( (PropertyItem*)i )->propertyParent();
 
-    const TQMetaObject *mo = editor->widget()->metaObject();
+    const TQMetaObject *mo = editor->widget()->tqmetaObject();
     TQString prop = ( (PropertyItem*)i )->name();
     while ( mo ) {
 	TQString s;
 	s = TQString( mo->className() ) + "::" + prop;
 	TQMap<TQString, TQString>::Iterator it;
-	if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
+	if ( ( it = propertyDocs.tqfind( s ) ) != propertyDocs.end() ) {
 	    return *it;
 	}
-	mo = mo->superClass();
+	mo = mo->tqsuperClass();
     }
 
-    return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).arg( prop );
+    return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
 }
 
 void PropertyList::readPropertyDocs()
@@ -3916,8 +3916,8 @@ PropertyList::LastEventType PropertyList::lastEvent()
 }
 // ------------------------------------------------------------
 
-EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e )
-    : HierarchyList( parent, fw, TRUE ), editor( e )
+EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e )
+    : HierarchyList( tqparent, fw, TRUE ), editor( e )
 {
     header()->hide();
     removeColumn( 1 );
@@ -3929,15 +3929,15 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e )
 TQString clean_arguments( const TQString &s )
 {
     TQString slot = s;
-    TQString arg = slot.mid( slot.find( '(' ) + 1 );
-    arg = arg.left( arg.findRev( ')' ) );
+    TQString arg = slot.mid( slot.tqfind( '(' ) + 1 );
+    arg = arg.left( arg.tqfindRev( ')' ) );
     TQStringList args = TQStringList::split( ',', arg );
-    slot = slot.left( slot.find( '(' ) + 1 );
+    slot = slot.left( slot.tqfind( '(' ) + 1 );
     int num = 0;
     for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) {
 	TQString a = *it;
 	int i;
-	if ( ( i =a.find( ':' ) ) == -1 )
+	if ( ( i =a.tqfind( ':' ) ) == -1 )
 	    slot += a.simplifyWhiteSpace();
 	else
 	    slot += a.mid( i + 1 ).simplifyWhiteSpace();
@@ -3967,10 +3967,10 @@ void EventList::setup()
     TQStrListIterator it( sigs );
     while ( it.current() ) {
 	HierarchyItem *eventItem = new HierarchyItem( HierarchyItem::Event, this, (HierarchyItem*)0,
-						      it.current(), TQString::null, TQString::null );
+						      it.current(), TQString(), TQString() );
 	eventItem->setOpen( TRUE );
 	TQValueList<MetaDataBase::Connection> conns =
-	    MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() );
+	    MetaDataBase::connections( TQT_TQOBJECT(formWindow), TQT_TQOBJECT(editor->widget()), TQT_TQOBJECT(formWindow->mainContainer()) );
 	HierarchyItem *item = 0;
 	for ( TQValueList<MetaDataBase::Connection>::Iterator cit = conns.begin();
 	      cit != conns.end(); ++cit ) {
@@ -3979,7 +3979,7 @@ void EventList::setup()
 		 MetaDataBase::normalizeFunction( clean_arguments( s ) ) )
 		continue;
 	    item = new HierarchyItem( HierarchyItem::EventFunction, eventItem, item,
-						     (*cit).slot, TQString::null, TQString::null );
+						     (*cit).slot, TQString(), TQString() );
 	    item->setPixmap( 0, DesignerEditSlotsPix );
 	}
 	++it;
@@ -3991,12 +3991,12 @@ extern TQListViewItem *newItem;
 void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 {
     TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) );
-    if ( !i || i->parent() )
+    if ( !i || i->tqparent() )
 	return;
     TQString s;
     if ( !formWindow->project()->isCpp() ) {
 	TQString s1 = i->text( 0 );
-	int pt = s1.find( "(" );
+	int pt = s1.tqfind( "(" );
 	if ( pt != -1 )
 	    s1 = s1.left( pt );
 	s = TQString( editor->widget()->name() ) + "_" + s1;
@@ -4014,7 +4014,7 @@ void EventList::setCurrent( TQWidget * )
 
 void EventList::objectClicked( TQListViewItem *i )
 {
-    if ( !i || !i->parent() )
+    if ( !i || !i->tqparent() )
 	return;
 //    formWindow->clearSelection(false);
     formWindow->mainWindow()->part()->emitEditFunction(formWindow->fileName(), i->text( 0 ));
@@ -4034,20 +4034,20 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
     if ( res == NEW_ITEM ) {
 	TQString s;
 	if ( !formWindow->project()->isCpp() ) {
-	    TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 );
-	    int pt = s1.find( "(" );
+	    TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 );
+	    int pt = s1.tqfind( "(" );
 	    if ( pt != -1 )
 		s1 = s1.left( pt );
 	    s = TQString( editor->widget()->name() ) + "_" + s1;
 	} else {
-	    s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 );
+	    s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 );
 	}
-	insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
-    } else if ( res == DEL_ITEM && i->parent() ) {
+	insertEntry( i->tqparent() ? i->tqparent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
+    } else if ( res == DEL_ITEM && i->tqparent() ) {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
-	conn.receiver = formWindow->mainContainer();
-	conn.signal = i->parent()->text( 0 );
+	conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
+	conn.signal = i->tqparent()->text( 0 );
 	conn.slot = i->text( 0 );
 	delete i;
 	RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Connection" ),
@@ -4063,9 +4063,9 @@ void EventList::renamed( TQListViewItem *i )
 {
     if ( newItem == i )
 	newItem = 0;
-    if ( !i->parent() )
+    if ( !i->tqparent() )
 	return;
-    TQListViewItem *itm = i->parent()->firstChild();
+    TQListViewItem *itm = i->tqparent()->firstChild();
     bool del = FALSE;
     while ( itm ) {
 	if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) {
@@ -4080,8 +4080,8 @@ void EventList::renamed( TQListViewItem *i )
     } else {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
-	conn.receiver = formWindow->mainContainer();
-	conn.signal = i->parent()->text( 0 );
+	conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
+	conn.signal = i->tqparent()->text( 0 );
 	conn.slot = i->text( 0 );
 	AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ),
 							      formWindow,
@@ -4090,9 +4090,9 @@ void EventList::renamed( TQListViewItem *i )
 	// #### we should look if the specified slot already
 	// exists and if we can connect to this one
 	TQString funcname = i->text( 0 ).latin1();
-	if ( funcname.find( '(' ) == -1 ) { // try to create a signature
-	    TQString sig = i->parent()->text( 0 );
-	    sig = sig.mid( sig.find( '(' ) + 1 );
+	if ( funcname.tqfind( '(' ) == -1 ) { // try to create a signature
+	    TQString sig = i->tqparent()->text( 0 );
+	    sig = sig.mid( sig.tqfind( '(' ) + 1 );
 	    sig.remove( (int)sig.length() - 1, 1 );
 	    LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() );
 	    if ( iface )
@@ -4110,7 +4110,7 @@ void EventList::renamed( TQListViewItem *i )
 /*	MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public",
 				   "slot", formWindow->project()->language(), "void" );
 	editor->formWindow()->mainWindow()->
-	    editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE );*/
+	    editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), TRUE );*/
 	cmd->execute();
         cmd2->execute();
 	editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
@@ -4138,8 +4138,8 @@ void EventList::save( TQListViewItem *p )
   listview for editing properties.
 */
 
-PropertyEditor::PropertyEditor( TQWidget *parent )
-    : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+PropertyEditor::PropertyEditor( TQWidget *tqparent )
+    : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
 		  WStyle_StaysOnTop | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu )
 {
     setCaption( i18n( "Property Editor" ) );
@@ -4165,11 +4165,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 	// if there is no properties displayed then we really should show them.
 	// to do this check the number of properties in the list.
 	bool ret = (listview->childCount() > 0) ? TRUE : FALSE;
-	if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
+	if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
 	    TQListViewItemIterator it( listview );
 	    ret = FALSE;
 	    while ( it.current() ) {
-		if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) {
+		if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) {
 		    ret = TRUE;
 		    break;
 		}
@@ -4190,7 +4190,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 
     wid = w;
     formwindow = fw;
-    setCaption( i18n( "Property Editor (%1)" ).arg( formwindow->name() ) );
+    setCaption( i18n( "Property Editor (%1)" ).tqarg( formwindow->name() ) );
     listview->viewport()->setUpdatesEnabled( FALSE );
     listview->setUpdatesEnabled( FALSE );
     clear();
@@ -4262,7 +4262,7 @@ FormWindow *PropertyEditor::formWindow() const
 TQString PropertyEditor::currentProperty() const
 {
     if ( !wid )
-	return TQString::null;
+	return TQString();
     if ( ( (PropertyItem*)listview->currentItem() )->propertyParent() )
 	return ( (PropertyItem*)listview->currentItem() )->propertyParent()->name();
     return ( (PropertyItem*)listview->currentItem() )->name();
@@ -4271,24 +4271,24 @@ TQString PropertyEditor::currentProperty() const
 TQString PropertyEditor::classOfCurrentProperty() const
 {
     if ( !wid )
-	return TQString::null;
+	return TQString();
     TQObject *o = wid;
     TQString curr = currentProperty();
-    TQMetaObject *mo = o->metaObject();
+    TQMetaObject *mo = o->tqmetaObject();
     while ( mo ) {
 	TQStrList props = mo->propertyNames( FALSE );
-	if ( props.find( curr.latin1() ) != -1 )
+	if ( props.tqfind( curr.latin1() ) != -1 )
 	    return mo->className();
-	mo = mo->superClass();
+	mo = mo->tqsuperClass();
     }
-    return TQString::null;
+    return TQString();
 }
 
-TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
 {
     if ( !wid )
 	return 0;
-    return wid->metaObject();
+    return wid->tqmetaObject();
 }
 
 void PropertyEditor::resetFocus()
@@ -4323,10 +4323,10 @@ void PropertyEditor::setSignalHandlersEnabled( bool b )
 void PropertyEditor::updateWindow()
 {
     if ( isHidden() && count() ) {
-	parentWidget()->show();
-	MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), TRUE );
+	tqparentWidget()->show();
+	MainWindow::self->setAppropriate( (TQDockWindow*)tqparentWidget(), TRUE );
     } else if ( isShown() && !count() ) {
-	parentWidget()->hide();
-	MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), FALSE );
+	tqparentWidget()->hide();
+	MainWindow::self->setAppropriate( (TQDockWindow*)tqparentWidget(), FALSE );
     }
 }
diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h
index 17673086..55341fb4 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/kdevdesigner/designer/propertyeditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -55,11 +55,11 @@ class FormWindow;
 class TQCloseEvent;
 class TQResizeEvent;
 class PropertyWhatsThis;
-class QDateEdit;
-class QTimeEdit;
-class QDateTimeEdit;
+class TQDateEdit;
+class TQTimeEdit;
+class TQDateTimeEdit;
 
-class PropertyItem : public QListViewItem
+class PropertyItem : public TQListViewItem
 {
 public:
     PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -129,7 +129,7 @@ private:
     bool open, changed;
     PropertyItem *property;
     TQString propertyName;
-    TQPtrList<PropertyItem> children;
+    TQPtrList<PropertyItem> tqchildren;
     TQColor backColor;
     TQPushButton *resetButton;
 
@@ -139,6 +139,7 @@ class PropertyTextItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -175,6 +176,7 @@ class PropertyBoolItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -199,6 +201,7 @@ class PropertyIntItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -224,6 +227,7 @@ class PropertyLayoutItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyLayoutItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -248,6 +252,7 @@ class PropertyDoubleItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -271,6 +276,7 @@ class PropertyListItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -306,6 +312,7 @@ class PropertyFontItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -335,6 +342,7 @@ class PropertyCoordItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { Rect, Size, Point };
@@ -364,10 +372,11 @@ class PropertyColorItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
-		       const TQString &propName, bool children );
+		       const TQString &propName, bool tqchildren );
     ~PropertyColorItem();
 
     virtual void createChildren();
@@ -398,6 +407,7 @@ class PropertyPixmapItem : public TQObject,
 			   public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { Pixmap, IconSet, Image };
@@ -430,6 +440,7 @@ class PropertySizePolicyItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -456,6 +467,7 @@ class PropertyPaletteItem : public TQObject,
 			    public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -484,6 +496,7 @@ class PropertyCursorItem : public TQObject,
 			   public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -508,6 +521,7 @@ class PropertyKeysequenceItem : public TQObject,
 				public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyKeysequenceItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -538,6 +552,7 @@ class PropertyDatabaseItem : public TQObject,
 			     public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName, bool wField );
@@ -564,7 +579,7 @@ private:
 struct EnumItem {
     EnumItem( const TQString &k, bool s )
 	: key( k ), selected( s ) {}
-    EnumItem() : key( TQString::null ), selected( FALSE ) {}
+    EnumItem() : key( TQString() ), selected( FALSE ) {}
     bool operator==( const EnumItem &item ) const {
 	return key == item.key;
     }
@@ -572,12 +587,13 @@ struct EnumItem {
     bool selected;
 };
 
-class EnumPopup : public QFrame
+class EnumPopup : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EnumPopup( TQWidget *parent, const char *name, WFlags f=0 );
+    EnumPopup( TQWidget *tqparent, const char *name, WFlags f=0 );
     ~EnumPopup();
     void insertEnums( TQValueList<EnumItem> lst );
     TQValueList<EnumItem> enumList() const;
@@ -596,12 +612,13 @@ private:
     TQVBoxLayout *popLayout;
 };
 
-class EnumBox : public QComboBox
+class EnumBox : public TQComboBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EnumBox( TQWidget *parent, const char *name = 0 );
+    EnumBox( TQWidget *tqparent, const char *name = 0 );
     ~EnumBox() {}
     void setText( const TQString &text );
     void insertEnums( TQValueList<EnumItem> lst );
@@ -633,6 +650,7 @@ class PropertyEnumItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyEnumItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -656,9 +674,10 @@ private:
     TQString enumString;
 };
 
-class PropertyList : public QListView
+class PropertyList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyList( PropertyEditor *e );
@@ -671,7 +690,7 @@ public:
     virtual void setPropertyValue( PropertyItem *i );
     virtual void setCurrentProperty( const TQString &n );
 
-    void layoutInitValue( PropertyItem *i, bool changed = FALSE );
+    void tqlayoutInitValue( PropertyItem *i, bool changed = FALSE );
     PropertyEditor *propertyEditor() const;
     TQString whatsThisAt( const TQPoint &p );
     void showCurrentWhatsThis();
@@ -721,9 +740,10 @@ private:
 class EventList : public HierarchyList
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e );
+    EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e );
 
     void setup();
     void setCurrent( TQWidget *w );
@@ -745,12 +765,13 @@ private:
 };
 
 
-class PropertyEditor : public QTabWidget
+class PropertyEditor : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PropertyEditor( TQWidget *parent );
+    PropertyEditor( TQWidget *tqparent );
 
     TQObject *widget() const;
 
@@ -768,7 +789,7 @@ public:
 
     TQString currentProperty() const;
     TQString classOfCurrentProperty() const;
-    TQMetaObject* metaObjectOfCurrentProperty() const;
+    TQMetaObject* tqmetaObjectOfCurrentProperty() const;
 
     void resetFocus();
 
@@ -799,6 +820,7 @@ class PropertyDateItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -813,8 +835,8 @@ private slots:
     void setValue();
 
 private:
-    QDateEdit *lined();
-    TQGuardedPtr<QDateEdit> lin;
+    TQDateEdit *lined();
+    TQGuardedPtr<TQDateEdit> lin;
 
 };
 
@@ -822,6 +844,7 @@ class PropertyTimeItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -836,8 +859,8 @@ private slots:
     void setValue();
 
 private:
-    QTimeEdit *lined();
-    TQGuardedPtr<QTimeEdit> lin;
+    TQTimeEdit *lined();
+    TQGuardedPtr<TQTimeEdit> lin;
 
 };
 
@@ -845,6 +868,7 @@ class PropertyDateTimeItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -859,8 +883,8 @@ private slots:
     void setValue();
 
 private:
-    QDateTimeEdit *lined();
-    TQGuardedPtr<QDateTimeEdit> lin;
+    TQDateTimeEdit *lined();
+    TQGuardedPtr<TQDateTimeEdit> lin;
 
 };
 
diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp
index 8053501e..39d23b48 100644
--- a/kdevdesigner/designer/propertyobject.cpp
+++ b/kdevdesigner/designer/propertyobject.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,12 +38,12 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
     v.resize( objects.count() );
     v.setAutoDelete( TRUE );
 
-    for ( TQObject *o = objects.first(); o; o = objects.next() ) {
-	const TQMetaObject *m = o->metaObject();
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
+	const TQMetaObject *m = o->tqmetaObject();
 	TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>;
 	while ( m ) {
 	    mol->insert( 0, m );
-	    m = m->superClass();
+	    m = m->tqsuperClass();
 	}
 	v.insert( v.count(), mol );
     }
@@ -74,7 +74,7 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
 
 bool PropertyObject::setProperty( const char *name, const TQVariant& value )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	o->setProperty( name, value );
 
     return TRUE;
@@ -87,13 +87,13 @@ TQVariant PropertyObject::property( const char *name ) const
 
 void PropertyObject::mdPropertyChanged( const TQString &property, bool changed )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setPropertyChanged( o, property, changed );
 }
 
 bool PropertyObject::mdIsPropertyChanged( const TQString &property )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() ) {
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
 	if ( MetaDataBase::isPropertyChanged( o, property ) )
 	    return TRUE;
     }
@@ -102,29 +102,29 @@ bool PropertyObject::mdIsPropertyChanged( const TQString &property )
 
 void PropertyObject::mdSetPropertyComment( const TQString &property, const TQString &comment )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setPropertyComment( o, property, comment );
 }
 
 TQString PropertyObject::mdPropertyComment( const TQString &property )
 {
-    return MetaDataBase::propertyComment( objects.first(), property );
+    return MetaDataBase::propertyComment( TQT_TQOBJECT(objects.first()), property );
 }
 
 void PropertyObject::mdSetFakeProperty( const TQString &property, const TQVariant &value )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setFakeProperty( o, property, value );
 }
 
 TQVariant PropertyObject::mdFakeProperty( const TQString &property )
 {
-    return MetaDataBase::fakeProperty( objects.first(), property );
+    return MetaDataBase::fakeProperty( TQT_TQOBJECT(objects.first()), property );
 }
 
 void PropertyObject::mdSetCursor( const TQCursor &c )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() ) {
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
 	if ( o->isWidgetType() )
 	    MetaDataBase::setCursor( (TQWidget*)o, c );
     }
@@ -137,22 +137,22 @@ TQCursor PropertyObject::mdCursor()
 
 void PropertyObject::mdSetPixmapKey( int pixmap, const TQString &arg )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setPixmapKey( o, pixmap, arg );
 }
 
 TQString PropertyObject::mdPixmapKey( int pixmap )
 {
-    return MetaDataBase::pixmapKey( objects.first(), pixmap );
+    return MetaDataBase::pixmapKey( TQT_TQOBJECT(objects.first()), pixmap );
 }
 
 void PropertyObject::mdSetExportMacro( const TQString &macro )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setExportMacro( o, macro );
 }
 
 TQString PropertyObject::mdExportMacro()
 {
-    return MetaDataBase::exportMacro( objects.first() );
+    return MetaDataBase::exportMacro( TQT_TQOBJECT(objects.first()) );
 }
diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h
index 784fa74b..4cfb54fd 100644
--- a/kdevdesigner/designer/propertyobject.h
+++ b/kdevdesigner/designer/propertyobject.h
@@ -5,10 +5,10 @@
 #include <tqwidgetlist.h>
 #include <tqcursor.h>
 
-class PropertyObject : public QObject
+class PropertyObject : public TQObject
 {
 public:
-    TQMetaObject *metaObject() const { return (TQMetaObject*)mobj; }
+    TQMetaObject *tqmetaObject() const { return (TQMetaObject*)mobj; }
     const char *className() const { return "PropertyObject"; }
     TQObject* qObject() { return (TQObject*)this; }
 private:
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp
index c00e9b84..f963cf51 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,8 +30,8 @@
 #include <tqapplication.h>
 #include <tqvbox.h>
 
-QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name )
-    : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE )
+TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name )
+    : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE )
 {
     popup = new TQVBox( 0, 0, WType_Popup );
     popup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
@@ -51,27 +51,27 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name )
     installEventFilter( this );
 }
 
-bool QCompletionEdit::autoAdd() const
+bool TQCompletionEdit::autoAdd() const
 {
     return aAdd;
 }
 
-TQStringList QCompletionEdit::completionList() const
+TQStringList TQCompletionEdit::completionList() const
 {
     return compList;
 }
 
-void QCompletionEdit::setCompletionList( const TQStringList &l )
+void TQCompletionEdit::setCompletionList( const TQStringList &l )
 {
     compList = l;
 }
 
-void QCompletionEdit::setAutoAdd( bool add )
+void TQCompletionEdit::setAutoAdd( bool add )
 {
     aAdd = add;
 }
 
-void QCompletionEdit::textDidChange( const TQString &text )
+void TQCompletionEdit::textDidChange( const TQString &text )
 {
     if ( text.isEmpty() ) {
 	popup->close();
@@ -81,15 +81,15 @@ void QCompletionEdit::textDidChange( const TQString &text )
     placeListBox();
 }
 
-void QCompletionEdit::placeListBox()
+void TQCompletionEdit::placeListBox()
 {
     if ( listbox->count() == 0 ) {
 	popup->close();
 	return;
     }
 
-    popup->resize( QMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
-		   listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+    popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+		   listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
 
     TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
     if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
@@ -102,7 +102,7 @@ void QCompletionEdit::placeListBox()
     setFocus();
 }
 
-void QCompletionEdit::updateListBox()
+void TQCompletionEdit::updateListBox()
 {
     listbox->clear();
     if ( compList.isEmpty() )
@@ -114,9 +114,9 @@ void QCompletionEdit::updateListBox()
     }
 }
 
-bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
+bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( o == popup || o == listbox || o == listbox->viewport() ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) {
 	if ( e->type() == TQEvent::KeyPress ) {
 	    TQKeyEvent *ke = (TQKeyEvent*)e;
 	    if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) {
@@ -159,7 +159,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 	    emit chosen( text() );
 	    return TRUE;
 	}
-    } else if ( o == this ) {
+    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
 	if ( e->type() == TQEvent::KeyPress ) {
 	    TQKeyEvent *ke = (TQKeyEvent*)e;
 	    if ( ke->key() == Key_Up ||
@@ -178,32 +178,32 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
     return TQLineEdit::eventFilter( o, e );
 }
 
-void QCompletionEdit::addCompletionEntry( const TQString &entry )
+void TQCompletionEdit::addCompletionEntry( const TQString &entry )
 {
-    if ( compList.find( entry ) == compList.end() ) {
+    if ( compList.tqfind( entry ) == compList.end() ) {
 	compList << entry;
 	compList.sort();
     }
 }
 
-void QCompletionEdit::removeCompletionEntry( const TQString &entry )
+void TQCompletionEdit::removeCompletionEntry( const TQString &entry )
 {
-    TQStringList::Iterator it = compList.find( entry );
+    TQStringList::Iterator it = compList.tqfind( entry );
     if ( it != compList.end() )
 	compList.remove( it );
 }
 
-void QCompletionEdit::setCaseSensitive( bool b )
+void TQCompletionEdit::setCaseSensitive( bool b )
 {
     caseSensitive = b;
 }
 
-bool QCompletionEdit::isCaseSensitive() const
+bool TQCompletionEdit::isCaseSensitive() const
 {
     return caseSensitive;
 }
 
-void QCompletionEdit::clear()
+void TQCompletionEdit::clear()
 {
     TQLineEdit::clear();
     compList.clear();
diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h
index e2044435..8bc7e72d 100644
--- a/kdevdesigner/designer/qcompletionedit.h
+++ b/kdevdesigner/designer/qcompletionedit.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,15 +17,15 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
-#ifndef QCOMPLETIONEDIT_H
-#define QCOMPLETIONEDIT_H
+#ifndef TQCOMPLETIONEDIT_H
+#define TQCOMPLETIONEDIT_H
 
 #include <tqlineedit.h>
 #include <tqstringlist.h>
@@ -33,14 +33,15 @@
 class TQListBox;
 class TQVBox;
 
-class QCompletionEdit : public QLineEdit
+class TQCompletionEdit : public TQLineEdit
 {
     Q_OBJECT
-    Q_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
-    Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
+  TQ_OBJECT
+    TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
+    TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
 
 public:
-    QCompletionEdit( TQWidget *parent = 0, const char *name = 0 );
+    TQCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
     bool autoAdd() const;
     TQStringList completionList() const;
diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui
index 41a211ea..546cdeaa 100644
--- a/kdevdesigner/designer/replacedialog.ui
+++ b/kdevdesigner/designer/replacedialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ReplaceDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <cstring>comboReplace</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <cstring>comboFind</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>comboFind</cstring>
                     </property>
@@ -102,7 +102,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>comboReplace</cstring>
                     </property>
@@ -120,7 +120,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -144,14 +144,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonReplace</cstring>
                     </property>
@@ -162,7 +162,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonReplaceAll</cstring>
                     </property>
@@ -170,7 +170,7 @@
                         <string>Replace &amp;All</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -180,7 +180,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -197,7 +197,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkWords</cstring>
                     </property>
@@ -205,7 +205,7 @@
                         <string>&amp;Whole words only</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkCase</cstring>
                     </property>
@@ -213,7 +213,7 @@
                         <string>Case &amp;sensitive</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBegin</cstring>
                     </property>
@@ -223,7 +223,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="1">
+        <widget class="TQButtonGroup" row="1" column="1">
             <property name="name">
                 <cstring>ButtonGroup2</cstring>
             </property>
@@ -240,7 +240,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioForward</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioBackward</cstring>
                     </property>
@@ -297,7 +297,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
+    <include location="global" impldecl="in implementation">tqlineedit.h</include>
     <include location="local" impldecl="in implementation">replacedialog.ui.h</include>
 </includes>
 <forwards>
@@ -305,14 +305,14 @@
 </forwards>
 <variables>
     <variable>EditorInterface *editor;</variable>
-    <variable>QObject *formWindow;</variable>
+    <variable>TQObject *formWindow;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>doReplace()</slot>
     <slot>doReplaceAll()</slot>
-    <slot>setEditor( EditorInterface * e, QObject * fw )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>setEditor( EditorInterface * e, TQObject * fw )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/replacedialog.ui.h b/kdevdesigner/designer/replacedialog.ui.h
index 7867d0c6..3b43488d 100644
--- a/kdevdesigner/designer/replacedialog.ui.h
+++ b/kdevdesigner/designer/replacedialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -44,7 +44,7 @@ void ReplaceDialog::doReplace()
     if ( !editor ) 
 	return; 
      
-    if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), 
+    if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), 
 	checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) 
 	checkBegin->setChecked( TRUE ); 
     else 
@@ -56,7 +56,7 @@ void ReplaceDialog::doReplaceAll()
     if ( !editor )  
 	return;  
       
-    if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(),  
+    if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(),  
 	checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) )  
 	checkBegin->setChecked( TRUE );  
     else  
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index eff7c84c..0e342060 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -26,7 +26,7 @@
 
 #include "actiondnd.h"
 #include "command.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 #include "formfile.h"
@@ -63,7 +63,7 @@
 #include <tqobject.h>
 #include <tqobjectlist.h>
 #include <tqtabbar.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #include <tqdatatable.h>
 #endif
@@ -79,7 +79,7 @@
 #include <tqworkspace.h>
 #include <tqworkspace.h>
 #include <tqsplitter.h>
-#include <private/qucom_p.h>
+#include <private/tqucom_p.h>
 
 #include <kiconloader.h>
 #include <kfiledialog.h>
@@ -97,109 +97,109 @@ static TQString makeIndent( int indent )
 static TQString entitize( const TQString &s, bool attribute = FALSE )
 {
     TQString s2 = s;
-    s2 = s2.replace( "&", "&amp;" );
-    s2 = s2.replace( ">", "&gt;" );
-    s2 = s2.replace( "<", "&lt;" );
+    s2 = s2.tqreplace( "&", "&amp;" );
+    s2 = s2.tqreplace( ">", "&gt;" );
+    s2 = s2.tqreplace( "<", "&lt;" );
     if ( attribute ) {
-	s2 = s2.replace( "\"", "&quot;" );
-	s2 = s2.replace( "'", "&apos;" );
+	s2 = s2.tqreplace( "\"", "&quot;" );
+	s2 = s2.tqreplace( "'", "&apos;" );
     }
     return s2;
 }
 
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
 static struct {
     int key;
     const char* name;
 } keyname[] = {
-    { Qt::Key_Space,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) },
-    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) },
-    { Qt::Key_Tab,          QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) },
-    { Qt::Key_Backtab,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) },
-    { Qt::Key_Backspace,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) },
-    { Qt::Key_Return,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) },
-    { Qt::Key_Enter,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) },
-    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) },
-    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) },
-    { Qt::Key_Pause,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) },
-    { Qt::Key_Print,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) },
-    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) },
-    { Qt::Key_Home,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
-    { Qt::Key_End,          QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) },
-    { Qt::Key_Left,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) },
-    { Qt::Key_Up,           QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) },
-    { Qt::Key_Right,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) },
-    { Qt::Key_Down,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) },
-    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) },
-    { Qt::Key_Next,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) },
-    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) },
-    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) },
-    { Qt::Key_Menu,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) },
-    { Qt::Key_Help,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) },
+    { TQt::Key_Space,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) },
+    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) },
+    { TQt::Key_Tab,          TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) },
+    { TQt::Key_Backtab,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) },
+    { TQt::Key_Backspace,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) },
+    { TQt::Key_Return,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) },
+    { TQt::Key_Enter,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) },
+    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) },
+    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) },
+    { TQt::Key_Pause,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) },
+    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) },
+    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) },
+    { TQt::Key_Home,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
+    { TQt::Key_End,          TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) },
+    { TQt::Key_Left,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) },
+    { TQt::Key_Up,           TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) },
+    { TQt::Key_Right,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) },
+    { TQt::Key_Down,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) },
+    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) },
+    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) },
+    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) },
+    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) },
+    { TQt::Key_Menu,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) },
+    { TQt::Key_Help,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) },
 
     // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) },
-    { Qt::Key_MediaPrev,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) },
+    { TQt::Key_Back,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) },
+    { TQt::Key_Forward,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) },
+    { TQt::Key_Stop,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) },
+    { TQt::Key_Refresh,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) },
+    { TQt::Key_VolumeDown,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) },
+    { TQt::Key_VolumeMute,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) },
+    { TQt::Key_VolumeUp,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) },
+    { TQt::Key_BassBoost,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) },
+    { TQt::Key_BassUp,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) },
+    { TQt::Key_BassDown,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) },
+    { TQt::Key_TrebleUp,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) },
+    { TQt::Key_TrebleDown,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) },
+    { TQt::Key_MediaPlay,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) },
+    { TQt::Key_MediaStop,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) },
+    { TQt::Key_MediaPrev,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) },
+    { TQt::Key_MediaNext,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) },
+    { TQt::Key_MediaRecord,  TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) },
+    { TQt::Key_HomePage,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
+    { TQt::Key_Favorites,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) },
+    { TQt::Key_Search,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) },
+    { TQt::Key_Standby,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) },
+    { TQt::Key_OpenUrl,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) },
+    { TQt::Key_LaunchMail,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) },
+    { TQt::Key_LaunchMedia,  TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) },
+    { TQt::Key_Launch0,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) },
+    { TQt::Key_Launch1,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) },
+    { TQt::Key_Launch2,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) },
+    { TQt::Key_Launch3,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) },
+    { TQt::Key_Launch4,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) },
+    { TQt::Key_Launch5,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) },
+    { TQt::Key_Launch6,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) },
+    { TQt::Key_Launch7,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) },
+    { TQt::Key_Launch8,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) },
+    { TQt::Key_Launch9,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) },
+    { TQt::Key_LaunchA,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) },
+    { TQt::Key_LaunchB,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) },
+    { TQt::Key_LaunchC,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) },
+    { TQt::Key_LaunchD,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) },
+    { TQt::Key_LaunchE,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) },
+    { TQt::Key_LaunchF,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) },
 
     // --------------------------------------------------------------
     // More consistent namings
-    { Qt::Key_Print,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) },
-    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) },
-    { Qt::Key_Next,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) },
-    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) },
-    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) },
-    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) },
-    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) },
-    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) },
-    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) },
+    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) },
+    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) },
+    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) },
+    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) },
+    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) },
+    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) },
+    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) },
+    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) },
+    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) },
 
     { 0, 0 }
 };
 #endif
 static TQString platformNeutralKeySequence(const TQKeySequence &ks)
 {
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
     return TQString(ks);
 #else
     uint k;
@@ -207,26 +207,26 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
     TQString p;
     for (k = 0; k < ks.count(); ++k) {
 	int keycombo = ks[k];
-	int basekey = keycombo & ~(Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META);
-	if (keycombo & Qt::CTRL)
+	int basekey = keycombo & ~(TQt::SHIFT | TQt::CTRL | TQt::ALT | TQt::META);
+	if (keycombo & TQt::CTRL)
 	    str += "Ctrl+";
-	if (keycombo & Qt::ALT)
+	if (keycombo & TQt::ALT)
 	    str += "Alt+";
-	if (keycombo & Qt::META)
+	if (keycombo & TQt::META)
 	    str += "Meta+";
-	if (keycombo & Qt::SHIFT)
+	if (keycombo & TQt::SHIFT)
 	    str += "Shift+";
 
 	// begin copy and paste from TQKeySequence :(
-	if (basekey & Qt::UNICODE_ACCEL) {
+	if (basekey & TQt::UNICODE_ACCEL) {
 	    // Note: This character should NOT be upper()'ed, since
 	    // the encoded string should indicate EXACTLY what the
 	    // key represents! Hence a 'Ctrl+Shift+c' is posible to
 	    // represent, but is clearly impossible to trigger...
 	    p = TQChar(basekey & 0xffff);
-	} else if ( basekey >= Qt::Key_F1 && basekey <= Qt::Key_F35 ) {
-	    p = TQAccel::tr( "F%1" ).arg(basekey - Qt::Key_F1 + 1);
-	} else if ( basekey > Qt::Key_Space && basekey <= Qt::Key_AsciiTilde ) {
+	} else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) {
+	    p = TQAccel::tr( "F%1" ).tqarg(basekey - TQt::Key_F1 + 1);
+	} else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) {
 	    p.sprintf( "%c", basekey );
 	} else {
 	    int i = 0;
@@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
 		++i;
 	    }
 	    // If we can't find the actual translatable keyname,
-	    // fall back on the unicode representation of it...
+	    // fall back on the tqunicode representation of it...
 	    // Or else characters like Key_aring may not get displayed
 	    // ( Really depends on you locale )
 	    if ( !keyname[i].name )
@@ -319,7 +319,7 @@ bool Resource::load( FormFile *ff, Project *defProject )
     TQFile f( ff->absFileName() );
     f.open( IO_ReadOnly | IO_Translate );
 
-    bool b = load( ff, &f, defProject );
+    bool b = load( ff, TQT_TQIODEVICE(&f), defProject );
     f.close();
 
     return b;
@@ -347,10 +347,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	formwindow->setProject( MainWindow::self->currProject() );
     if ( mainwindow )
 	formwindow->setMainWindow( mainwindow );
-    MetaDataBase::addEntry( formwindow );
+    MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) );
 
     if ( !langIface ) {
-	TQString lang = "Qt Script";
+	TQString lang = "TQt Script";
 	if ( mainwindow )
 	    lang = mainwindow->currProject()->language();
 	langIface = MetaDataBase::languageInterface( lang );
@@ -460,10 +460,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	    }
 	} else if ( e.tagName() == "exportmacro" ) {
 	    exportMacro = e.firstChild().toText().data();
-	} else if ( e.tagName() == "layoutdefaults" ) {
-	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() );
-	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() );
-	} else if ( e.tagName() == "layoutfunctions" ) {
+	} else if ( e.tagName() == "tqlayoutdefaults" ) {
+	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() );
+	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() );
+	} else if ( e.tagName() == "tqlayoutfunctions" ) {
 	    formwindow->setSpacingFunction( e.attribute( "spacing" ) );
 	    formwindow->setMarginFunction( e.attribute( "margin" ) );
 	    if ( !formwindow->marginFunction().isEmpty() || !formwindow->spacingFunction().isEmpty() )
@@ -478,13 +478,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
     if ( !customWidgets.isNull() )
 	loadCustomWidgets( customWidgets, this );
 
-#if defined (QT_NON_COMMERCIAL)
+#if defined (TQT_NON_COMMERCIAL)
     bool previewMode = MainWindow::self ? MainWindow::self->isPreviewing() : FALSE;
     TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self );
     if ( !w )
 	return FALSE;
     if ( previewMode )
-	w->reparent( MainWindow::self, Qt::WType_TopLevel,  w->pos(), TRUE );
+	w->reparent( MainWindow::self, TQt::WType_TopLevel,  w->pos(), TRUE );
 #else
     if ( !createObject( widget, formwindow) )
 	return FALSE;
@@ -552,11 +552,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 		    function.returnType = "void";
 		function.type = "slot";
 		function.function = n.firstChild().toText().data();
-		if ( !MetaDataBase::hasFunction( formwindow, function.function, TRUE ) )
-		    MetaDataBase::addFunction( formwindow, function.function, function.specifier,
+		if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) )
+		    MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier,
 					       function.access, "slot", function.language, function.returnType );
 		else
-		    MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function,
+		    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function,
 							    function.specifier, function.access,
 							    "slot", function.language,
 							    function.returnType );
@@ -580,12 +580,12 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 		if ( function.returnType.isEmpty() )
 		    function.returnType = "void";
 		function.function = n.firstChild().toText().data();
-		if ( !MetaDataBase::hasFunction( formwindow, function.function, TRUE ) )
-		    MetaDataBase::addFunction( formwindow, function.function, function.specifier,
+		if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) )
+		    MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier,
 					       function.access, function.type, function.language,
 					       function.returnType );
 		else
-		    MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function,
+		    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function,
 							    function.specifier, function.access,
 							    function.type, function.language, function.returnType );
 	    }
@@ -606,13 +606,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	loadTabOrder( tabOrder );
 
     if ( formwindow ) {
-	MetaDataBase::setIncludes( formwindow, metaIncludes );
-	MetaDataBase::setForwards( formwindow, metaForwards );
-	MetaDataBase::setVariables( formwindow, metaVariables );
-	MetaDataBase::setSignalList( formwindow, metaSignals );
+	MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes );
+	MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards );
+	MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), metaVariables );
+	MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals );
 	metaInfo.classNameChanged = metaInfo.className != TQString( formwindow->name() );
-	MetaDataBase::setMetaInfo( formwindow, metaInfo );
-	MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro );
+	MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo );
+	MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro );
     }
 
     loadExtraSource( formwindow->formFile(), currFileName, langIface, hasFunctions );
@@ -621,14 +621,14 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	mainwindow->insertFormWindow( formwindow );
 
     if ( formwindow ) {
-	formwindow->killAccels( formwindow );
-	if ( formwindow->layout() )
-	    formwindow->layout()->activate();
+	formwindow->killAccels( TQT_TQOBJECT(formwindow) );
+	if ( formwindow->tqlayout() )
+	    formwindow->tqlayout()->activate();
 	if ( hadGeometry )
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
-							       expandedTo( formwindow->minimumSizeHint() ) ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
+							       expandedTo( formwindow->tqminimumSizeHint() ) ) );
 	else
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
     }
 
     return TRUE;
@@ -650,7 +650,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly )
     if ( !formwindow || filename.isEmpty() )
 	return FALSE;
     if (!langIface) {
-	TQString lang = "Qt Script";
+	TQString lang = "TQt Script";
 	if ( mainwindow )
 	    lang = mainwindow->currProject()->language();
 	langIface = MetaDataBase::languageInterface( lang );
@@ -678,7 +678,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly )
     TQFile f( filename );
     if ( !f.open( IO_WriteOnly | IO_Translate ) )
 	return FALSE;
-    bool b = save( &f );
+    bool b = save( TQT_TQIODEVICE(&f) );
     f.close();
     return b;
 }
@@ -702,19 +702,19 @@ bool Resource::save( TQIODevice* dev )
 
     ts << "<!DOCTYPE UI><UI version=\"3.3\" stdsetdef=\"1\">" << endl;
     saveMetaInfoBefore( ts, 0 );
-    saveObject( formwindow->mainContainer(), 0, ts, 0 );
-    if ( ::qt_cast<TQMainWindow*>(formwindow->mainContainer()) ) {
+    saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 );
+    if ( ::tqqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) {
 	saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 );
 	saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 );
     }
     if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() )
 	saveCustomWidgets( ts, 0 );
-    if ( ::qt_cast<TQMainWindow*>(formwindow->mainContainer()) )
+    if ( ::tqqt_cast<TQMainWindow*>(formwindow->mainContainer()) )
 	saveActions( formwindow->actionList(), ts, 0 );
     if ( !images.isEmpty() )
 	saveImageCollection( ts, 0 );
-    if ( !MetaDataBase::connections( formwindow ).isEmpty() ||
-	 !MetaDataBase::slotList( formwindow ).isEmpty() )
+    if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() ||
+	 !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() )
 	saveConnections( ts, 0 );
     saveTabOrder( ts, 0 );
     saveMetaInfoAfter( ts, 0 );
@@ -729,7 +729,7 @@ bool Resource::save( TQIODevice* dev )
 TQString Resource::copy()
 {
     if ( !formwindow )
-	return TQString::null;
+	return TQString();
 
     copying = TRUE;
     TQString s;
@@ -739,17 +739,17 @@ TQString Resource::copy()
     TQWidgetList widgets = formwindow->selectedWidgets();
     TQWidgetList tmp( widgets );
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	TQWidget *p = w->parentWidget();
+	TQWidget *p = w->tqparentWidget();
 	bool save = TRUE;
 	while ( p ) {
-	    if ( tmp.findRef( p ) != -1 ) {
+	    if ( tmp.tqfindRef( p ) != -1 ) {
 		save = FALSE;
 		break;
 	    }
-	    p = p->parentWidget();
+	    p = p->tqparentWidget();
 	}
 	if ( save )
-	    saveObject( w, 0, ts, 0 );
+	    saveObject( TQT_TQOBJECT(w), 0, ts, 0 );
     }
     if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() )
 	saveCustomWidgets( ts, 0 );
@@ -761,7 +761,7 @@ TQString Resource::copy()
 }
 
 
-void Resource::paste( const TQString &cb, TQWidget *parent )
+void Resource::paste( const TQString &cb, TQWidget *tqparent )
 {
     if ( !formwindow )
 	return;
@@ -795,33 +795,33 @@ void Resource::paste( const TQString &cb, TQWidget *parent )
     formwindow->clearSelection( FALSE );
     while ( !firstWidget.isNull() ) {
 	if ( firstWidget.tagName() == "widget" ) {
-	    TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 );
+	    TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 );
 	    if ( !w )
 		continue;
 	    widgets.append( w );
 	    int x = w->x() + formwindow->grid().x();
 	    int y = w->y() + formwindow->grid().y();
-	    if ( w->x() + w->width() > parent->width() )
-		x = QMAX( 0, parent->width() - w->width() );
-	    if ( w->y() + w->height() > parent->height() )
-		y = QMAX( 0, parent->height() - w->height() );
+	    if ( w->x() + w->width() > tqparent->width() )
+		x = TQMAX( 0, tqparent->width() - w->width() );
+	    if ( w->y() + w->height() > tqparent->height() )
+		y = TQMAX( 0, tqparent->height() - w->height() );
 	    if ( x != w->x() || y != w->y() )
 		w->move( x, y );
-	    formwindow->selectWidget( w );
+	    formwindow->selectWidget( TQT_TQOBJECT(w) );
 	} else if ( firstWidget.tagName() == "spacer" ) {
-	    TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
+	    TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
 	    if ( !w )
 		continue;
 	    widgets.append( w );
 	    int x = w->x() + formwindow->grid().x();
 	    int y = w->y() + formwindow->grid().y();
-	    if ( w->x() + w->width() > parent->width() )
-		x = QMAX( 0, parent->width() - w->width() );
-	    if ( w->y() + w->height() > parent->height() )
-		y = QMAX( 0, parent->height() - w->height() );
+	    if ( w->x() + w->width() > tqparent->width() )
+		x = TQMAX( 0, tqparent->width() - w->width() );
+	    if ( w->y() + w->height() > tqparent->height() )
+		y = TQMAX( 0, tqparent->height() - w->height() );
 	    if ( x != w->x() || y != w->y() )
 		w->move( x, y );
-	    formwindow->selectWidget( w );
+	    formwindow->selectWidget( TQT_TQOBJECT(w) );
 	}
 	firstWidget = firstWidget.nextSibling().toElement();
     }
@@ -832,7 +832,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent )
     formwindow->commandHistory()->addCommand( cmd );
 }
 
-void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent )
+void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent )
 {
     if ( obj && obj->isWidgetType() && ( (TQWidget*)obj )->isHidden() )
 	return;
@@ -846,12 +846,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    includeHints << WidgetDatabase::includeFile( classID );
 	}
 
-	if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) )
+	if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) )
 	    return; // we don't know anything about this thing
 
 	TQString attributes;
 	if ( grid ) {
-	    QDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ];
+	    TQDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ];
 	    attributes += TQString(" row=\"") + TQString::number(item.row) + "\"";
 	    attributes += TQString(" column=\"") + TQString::number(item.column) + "\"";
 	    if ( item.rowspan * item.colspan != 1 ) {
@@ -877,13 +877,13 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	return;
     }
 
-    QDesignerWidgetStack* ws = 0;
+    TQDesignerWidgetStack* ws = 0;
 
-    if ( ::qt_cast<TQTabWidget*>(obj) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(obj) ) {
 	TQTabWidget* tw = (TQTabWidget*) obj;
 	TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING );
 	TQWidgetStack *ws = (TQWidgetStack*)tmpl->first();
-	TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar();
+	TQTabBar *tb = ( (TQDesignerTabWidget*)obj )->tabBar();
 	for ( int i = 0; i < tb->count(); ++i ) {
 	    TQTab *t = tb->tabAt( i );
 	    if ( !t )
@@ -891,9 +891,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    TQWidget *w = ws->widget( t->identifier() );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ) == -1 )
+	    if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -906,19 +906,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
 	delete tmpl;
-    } else if ( (ws = ::qt_cast<QDesignerWidgetStack*>(obj)) != 0 ) {
+    } else if ( (ws = ::tqqt_cast<TQDesignerWidgetStack*>(obj)) != 0 ) {
 	for ( int i = 0; i < ws->count(); ++i ) {
 	    TQWidget *w = ws->page( i );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 )
+	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -930,19 +930,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<number>" << TQString::number(i) << "</number>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
-    } else if ( ::qt_cast<TQToolBox*>(obj) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(obj) ) {
 	TQToolBox* tb = (TQToolBox*)obj;
 	for ( int i = 0; i < tb->count(); ++i ) {
 	    TQWidget *w = tb->item( i );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 )
+	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -951,7 +951,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "</property>" << endl;
 	    ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl;
 	    indent++;
-	    saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent );
+	    saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent );
 	    indent--;
 	    ts << makeIndent( indent ) << "</property>" << endl;
 	    ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl;
@@ -959,19 +959,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
-    } else if ( ::qt_cast<TQWizard*>(obj) ) {
+    } else if ( ::tqqt_cast<TQWizard*>(obj) ) {
 	TQWizard* wiz = (TQWizard*)obj;
 	for ( int i = 0; i < wiz->pageCount(); ++i ) {
 	    TQWidget *w = wiz->page( i );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 )
+	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -984,21 +984,21 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
-    } else if ( ::qt_cast<TQMainWindow*>(obj) ) {
-	saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent );
+    } else if ( ::tqqt_cast<TQMainWindow*>(obj) ) {
+	saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent );
     } else {
 	bool saved = FALSE;
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 	if ( isPlugin ) {
 	    WidgetInterface *iface = 0;
 	    widgetManager()->queryInterface( className, &iface );
 	    if ( iface ) {
-		QWidgetContainerInterfacePrivate *iface2 = 0;
-		iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+		TQWidgetContainerInterfacePrivate *iface2 = 0;
+		iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
 		if ( iface2 ) {
 		    if ( iface2->supportsPages( className ) )  {
 			TQWidgetList containers = iface2->pages( className, (TQWidget*)obj );
@@ -1007,10 +1007,10 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			    int i = 0;
 			    for ( TQWidget *w = containers.first(); w; w = containers.next(), ++i ) {
 				if ( WidgetDatabase::
-				     idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 )
+				     idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 )
 				    continue; // we don't know this widget
 				ts << makeIndent( indent ) << "<widget class=\""
-				   << WidgetFactory::classNameOf( w )
+				   << WidgetFactory::classNameOf( TQT_TQOBJECT(w) )
 				   << "\">" << endl;
 				++indent;
 				ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
@@ -1036,7 +1036,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			TQWidget *w = iface2->containerOfWidget( className, (TQWidget*)obj );
 			if ( obj != w ) {
 			    ts << makeIndent( indent ) << "<widget class=\""
-			       << WidgetFactory::classNameOf( w )
+			       << WidgetFactory::classNameOf( TQT_TQOBJECT(w) )
 			       << "\">" << endl;
 			    ++indent;
 			    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
@@ -1054,14 +1054,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			MetaDataBase::CustomWidget *cw = new MetaDataBase::CustomWidget;
 			cw->className = className;
 			cw->includeFile =  WidgetDatabase::includeFile( classID );
-			TQStrList lst = w->metaObject()->signalNames( TRUE );
+			TQStrList lst = w->tqmetaObject()->signalNames( TRUE );
 			for ( TQPtrListIterator<char> it(lst); it.current(); ++it )
 			    cw->lstSignals.append(it.current());
 
 			int i;
-			int total = w->metaObject()->numProperties( TRUE );
+			int total = w->tqmetaObject()->numProperties( TRUE );
 			for ( i = 0; i < total; i++ ) {
-			    const TQMetaProperty *p = w->metaObject()->property( i, TRUE );
+			    const TQMetaProperty *p = w->tqmetaObject()->property( i, TRUE );
 			    if ( p->designable(w) ) {
 				MetaDataBase::Property prop;
 				prop.property = p->name();
@@ -1079,27 +1079,27 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			    }
 			}
 
-			total = w->metaObject()->numSlots( TRUE );
+			total = w->tqmetaObject()->numSlots( TRUE );
 			for ( i = 0; i < total; i++ ) {
-			    const QMetaData *md = w->metaObject()->slot( i, TRUE );
+			    const TQMetaData *md = w->tqmetaObject()->slot( i, TRUE );
 			    MetaDataBase::Function funky;
 			    // Find out if we have a return type.
 			    if ( md->method->count > 0 ) {
-				const QUParameter p = md->method->parameters[0];
-				if ( p.inOut == QUParameter::InOut )
+				const TQUParameter p = md->method->parameters[0];
+				if ( p.inOut == TQUParameter::InOut )
 				    funky.returnType = p.type->desc();
 			    }
 
 			    funky.function = md->name;
 			    funky.language = "C++";
 			    switch ( md->access ) {
-				case QMetaData::Public:
+				case TQMetaData::Public:
 				    funky.access = "public";
 				    break;
-				case QMetaData::Protected:
+				case TQMetaData::Protected:
 				    funky.access = "protected";
 				    break;
-				case QMetaData::Private:
+				case TQMetaData::Private:
 				    funky.access = "private";
 				    break;
 			    }
@@ -1112,7 +1112,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 		iface->release();
 	    }
 	}
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
 	if ( !saved )
 	    saveChildrenOf( obj, ts, indent );
     }
@@ -1123,9 +1123,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 
 void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 {
-    if ( ::qt_cast<TQListBox*>(obj) || ::qt_cast<TQComboBox*>(obj) ) {
+    if ( ::tqqt_cast<TQListBox*>(obj) || ::tqqt_cast<TQComboBox*>(obj) ) {
 	TQListBox *lb = 0;
-	if ( ::qt_cast<TQListBox*>(obj) )
+	if ( ::tqqt_cast<TQListBox*>(obj) )
 	    lb = (TQListBox*)obj;
 	else
 	    lb = ( (TQComboBox*)obj )->listBox();
@@ -1143,7 +1143,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</item>" << endl;
 	}
-    } else if ( ::qt_cast<TQIconView*>(obj) ) {
+    } else if ( ::tqqt_cast<TQIconView*>(obj) ) {
 	TQIconView *iv = (TQIconView*)obj;
 
 	TQIconViewItem *i = iv->firstItem();
@@ -1159,7 +1159,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</item>" << endl;
 	}
-    } else if ( ::qt_cast<TQListView*>(obj) ) {
+    } else if ( ::tqqt_cast<TQListView*>(obj) ) {
 	TQListView *lv = (TQListView*)obj;
 	int i;
 	for ( i = 0; i < lv->header()->count(); ++i ) {
@@ -1187,13 +1187,13 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	}
 	saveItem( lv->firstChild(), ts, indent - 1 );
     }
-#if !defined (QT_NO_TABLE)
-    else if ( ::qt_cast<TQTable*>(obj) ) {
+#if !defined (TQT_NO_TABLE)
+    else if ( ::tqqt_cast<TQTable*>(obj) ) {
 	TQTable *table = (TQTable*)obj;
 	int i;
-	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
-#  ifndef QT_NO_SQL
-	bool isDataTable = ::qt_cast<TQDataTable*>(table);
+	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
+#  ifndef TQT_NO_SQL
+	bool isDataTable = ::tqqt_cast<TQDataTable*>(table);
 #  else
         bool isDataTable = false;
 #  endif
@@ -1214,7 +1214,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 		if ( isDataTable && !columnFields.isEmpty() ) {
 		    ts << makeIndent( indent ) << "<property name=\"field\">" << endl;
 		    indent++;
-		    ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl;
+		    ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl;
 		    indent--;
 		    ts << makeIndent( indent ) << "</property>" << endl;
 		}
@@ -1277,10 +1277,10 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons
     if ( formwindow && formwindow->savePixmapInline() )
 	ts << makeIndent( indent ) << "<" << tagname << ">" << saveInCollection( p ) << "</" << tagname << ">" << endl;
     else if ( formwindow && formwindow->savePixmapInProject() )
-	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() )
+	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() )
 	   << "</" << tagname << ">" << endl;
     else
-	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() )
+	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() )
 	   << "</" << tagname << ">" << endl;
 }
 
@@ -1292,7 +1292,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
 	TQImage img = loadFromCollection( arg );
 	TQPixmap pix;
 	pix.convertFromImage( img );
-	MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg );
+	MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
 	return pix;
     } else if ( formwindow && formwindow->savePixmapInProject() ) {
 	TQPixmap pix;
@@ -1304,13 +1304,13 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
 	    pix.convertFromImage( pix.convertToImage() );
 	}
 
-	MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
 	return pix;
     }
     TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() );
     // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
     pix.convertFromImage( pix.convertToImage() );
-    MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg );
+    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
     return pix;
 }
 
@@ -1342,19 +1342,19 @@ void Resource::saveItem( const TQStringList &text,
 
 void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 {
-    const TQObjectList *l = obj->children();
-    if ( !l )
-	return; // no children to save
+    const TQObjectList l = obj->childrenListObject();
+    if ( l.isEmpty() )
+	return; // no tqchildren to save
 
     TQString closeTag;
-    // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer
-    TQLayout *layout = 0;
-    QDesignerGridLayout* grid = 0;
-    if ( !::qt_cast<TQSplitter*>(obj) &&
+    // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer
+    TQLayout *tqlayout = 0;
+    TQDesignerGridLayout* grid = 0;
+    if ( !::tqqt_cast<TQSplitter*>(obj) &&
 	 WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
 	 obj->isWidgetType() &&
-	 WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) {
-	WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout );
+	 WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
+	WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout );
 	switch ( lay ) {
 	case WidgetFactory::HBox:
 	    closeTag = makeIndent( indent ) + "</hbox>";
@@ -1370,20 +1370,20 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 	    closeTag = makeIndent( indent ) + "</grid>";
 	    ts << makeIndent( indent ) << "<grid>" << endl;
 	    ++indent;
-	    grid = (QDesignerGridLayout*) layout;
+	    grid = (TQDesignerGridLayout*) tqlayout;
 	    break;
 	default:
 	    break;
 	}
 
-	// save properties of layout
+	// save properties of tqlayout
 	if ( lay != WidgetFactory::NoLayout )
-	    saveObjectProperties( layout, ts, indent );
+	    saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent );
 
     }
 
     TQObject *o = 0;
-    for ( TQPtrListIterator<TQObject> it ( *l ); ( o = it.current() ); ++it )
+    for ( TQPtrListIterator<TQObject> it ( l ); ( o = it.current() ); ++it )
 	if ( !TQString( o->name() ).startsWith( "qt_dead_widget_" ) )
 	    saveObject( o, grid, ts, indent );
     if ( !closeTag.isEmpty() ) {
@@ -1398,55 +1398,55 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     TQStringList changed;
     changed = MetaDataBase::changedProperties( w );
     if ( w->isWidgetType() ) {
-	if ( ::qt_cast<Spacer*>(w) ) {
-	    if ( !changed.contains( "sizeHint" ) )
-		changed << "sizeHint";
-	    if ( !changed.contains( "geometry" ) )
+	if ( ::tqqt_cast<Spacer*>(w) ) {
+	    if ( !changed.tqcontains( "tqsizeHint" ) )
+		changed << "tqsizeHint";
+	    if ( !changed.tqcontains( "geometry" ) )
 		changed << "geometry";
  	} else {
-	    TQToolButton *tb = ::qt_cast<TQToolButton*>(w);
+	    TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w);
 	    if ( tb && !tb->iconSet().isNull() ) {
 		changed << "iconSet";
 	    }
 	}
-    } else if ( ::qt_cast<TQLayout*>(w) ) {
-	if ( MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) > -1 )
+    } else if ( ::tqqt_cast<TQLayout*>(w) ) {
+	if ( MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
 	    changed << "spacing";
-	if ( MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) > -1 )
+	if ( MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
 	    changed << "margin";
-	if ( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) != "Auto"
-	     && !MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ).isEmpty() )
+	if ( MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) != "Auto"
+	     && !MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ).isEmpty() )
 	    changed << "resizeMode";
     }
 
-    if ( w == formwindow->mainContainer() ) {
-	if ( changed.findIndex( "geometry" ) == -1 )
+    if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
+	if ( changed.tqfindIndex( "geometry" ) == -1 )
 	    changed << "geometry";
-	if ( changed.findIndex( "caption" ) == -1 )
+	if ( changed.tqfindIndex( "caption" ) == -1 )
 	    changed << "caption";
     }
 
     if ( changed.isEmpty() )
 	    return;
 
-    bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
-		    WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
+    bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() &&
+		    WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
 
-    TQStrList lst = w->metaObject()->propertyNames( !::qt_cast<Spacer*>(w) );
+    TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-	if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
+	if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
 	    continue;
-	if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
+	if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
 	    continue;
-	saved << TQString::fromLatin1( it.current() );
-	const TQMetaProperty* p = w->metaObject()->
-				 property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE );
+	saved << TQString::tqfromLatin1( it.current() );
+	const TQMetaProperty* p = w->tqmetaObject()->
+				 property( w->tqmetaObject()->tqfindProperty( it.current(), TRUE ), TRUE );
 	if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
 	    continue;
-	if ( ::qt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
+	if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
 	     ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) )
 	    continue;
-	if ( ::qt_cast<MenuBarEditor*>(w) &&
+	if ( ::tqqt_cast<MenuBarEditor*>(w) &&
 	     ( qstrcmp( p->name(), "itemName" ) == 0 || qstrcmp( p->name(), "itemNumber" ) == 0 ||
 	       qstrcmp( p->name(), "itemText" ) == 0 ) )
 	    continue;
@@ -1460,7 +1460,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
 	    ts << " stdset=\"0\"";
 	ts << ">" << endl;
 	indent++;
-	if ( strcmp( it.current(), "resizeMode" ) == 0 && ::qt_cast<TQLayout*>(w) ) {
+	if ( strcmp( it.current(), "resizeMode" ) == 0 && ::tqqt_cast<TQLayout*>(w) ) {
 	    saveProperty( w, it.current(), "", TQVariant::String, ts, indent );
 	} else if ( p->isSetType() ) {
 	    saveSetProperty( w, it.current(), TQVariant::nameToType( p->type() ), ts, indent );
@@ -1496,7 +1496,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
 
 void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE );
     TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
     TQString v;
     for ( uint i = 0; i < l.count(); ++i ) {
@@ -1509,25 +1509,25 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
 
 void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE );
     ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
 }
 
 void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent )
 {
     if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" ||
-	 name == "layoutMargin" || name =="layoutSpacing" )
+	 name == "tqlayoutMargin" || name =="tqlayoutSpacing" )
 	return;
     int num;
     uint unum;
     double dob;
     TQString comment;
-    if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) )
+    if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) || formwindow->actionList().tqfind( (TQAction*)w ) )
 	comment = MetaDataBase::propertyComment( w, name );
     switch ( t ) {
     case TQVariant::String:
 	if ( name == "resizeMode" ) {
-	    TQString resmod = MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+	    TQString resmod = MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
 	    if ( !resmod.isNull() && resmod != "Auto" ) {
 		ts << makeIndent( indent ) << "<enum>";
 		ts << resmod;
@@ -1547,12 +1547,12 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	ts << makeIndent( indent ) << "<bool>" << mkBool( value.toBool() ) << "</bool>" << endl;
 	break;
     case TQVariant::Int:
-	if ( ::qt_cast<TQLayout*>(w) ) {
+	if ( ::tqqt_cast<TQLayout*>(w) ) {
 	    num = -1;
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+		num = MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+		num = MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
 	    if ( num != -1 )
 		ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
 	} else {
@@ -1612,9 +1612,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
     case TQVariant::Font: {
 	TQVariant v( value );
 	ts << makeIndent( indent ) << "<font>" << endl;
-	TQFont f( qApp->font() );
-	if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() )
-	    f = ((TQWidget*)w)->parentWidget()->font();
+	TQFont f( tqApp->font() );
+	if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() )
+	    f = ((TQWidget*)w)->tqparentWidget()->font();
 	TQFont f2( v.toFont() );
 	indent++;
 	if ( f.family() != f2.family() )
@@ -1680,7 +1680,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	ts << makeIndent( indent ) << "</palette>" << endl;
     } break;
     case TQVariant::Cursor:
-	ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</cursor>" << endl;
+	ts << makeIndent( indent ) << "<cursor>" << value.toCursor().tqshape() << "</cursor>" << endl;
 	break;
     case TQVariant::StringList: {
 	TQStringList lst = value.toStringList();
@@ -1743,7 +1743,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup
 	saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) );
 	indent--;
 	ts << makeIndent( indent ) << "</color>" << endl;
-	TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap();
+	TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap();
 	if ( pm && !pm->isNull() )
 	    savePixmap( *pm, ts, indent );
     }
@@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
     ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl;
 }
 
-TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout )
+TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -1773,21 +1773,21 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	colspan = 1;
 
     TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
-    TQString parentClassName = WidgetFactory::classNameOf( parent );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
+    TQString tqparentClassName = WidgetFactory::classNameOf( tqparent );
     bool isPlugin =
-	WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) );
+	WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( tqparentClassName ) );
     if ( isPlugin )
 	qWarning( "####### loading custom container widgets without page support not implemented!" );
     // ### TODO loading for custom container widgets without pages
 #endif
     if ( !className.isNull() ) {
-	obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE );
+	obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, FALSE ));
 	if ( !obj ) {
 	    TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ),
 				   i18n( "Error loading %1.\n"
 						   "The widget %2 could not be created." ).
-				   arg( currFileName ).arg( className ) );
+				   tqarg( currFileName ).tqarg( className ) );
 	    return 0;
 	}
 	if ( !mainContainerSet ) {
@@ -1796,18 +1796,18 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	    mainContainerSet = TRUE;
 	}
 	w = (TQWidget*)obj;
-	if ( ::qt_cast<TQMainWindow*>(w) )
+	if ( ::tqqt_cast<TQMainWindow*>(w) )
 	    w = ( (TQMainWindow*)w )->centralWidget();
-	if ( layout ) {
-	    switch ( WidgetFactory::layoutType( layout ) ) {
+	if ( tqlayout ) {
+	    switch ( WidgetFactory::tqlayoutType( tqlayout ) ) {
 	    case WidgetFactory::HBox:
-		( (TQHBoxLayout*)layout )->addWidget( w );
+		( (TQHBoxLayout*)tqlayout )->addWidget( w );
 		break;
 	    case WidgetFactory::VBox:
-		( (TQVBoxLayout*)layout )->addWidget( w );
+		( (TQVBoxLayout*)tqlayout )->addWidget( w );
 		break;
 	    case WidgetFactory::Grid:
-		( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
+		( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								      col, col + colspan - 1 );
 		break;
 	    default:
@@ -1817,29 +1817,29 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
 	if ( !toplevel )
 	    toplevel = w;
-	layout = 0;
+	tqlayout = 0;
 
 	if ( w && formwindow ) {
-	    if ( !parent ||
-		 ( !::qt_cast<TQTabWidget*>(parent) &&
-		   !::qt_cast<TQWidgetStack*>(parent) &&
-		   !::qt_cast<TQToolBox*>(parent) &&
-		   !::qt_cast<TQWizard*>(parent)
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+	    if ( !tqparent ||
+		 ( !::tqqt_cast<TQTabWidget*>(tqparent) &&
+		   !::tqqt_cast<TQWidgetStack*>(tqparent) &&
+		   !::tqqt_cast<TQToolBox*>(tqparent) &&
+		   !::tqqt_cast<TQWizard*>(tqparent)
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
                    && !isPlugin
 #endif
                      ) )
 		formwindow->insertWidget( w, pasting );
-	    else if ( parent &&
-		      ( ::qt_cast<TQTabWidget*>(parent) ||
-			::qt_cast<TQWidgetStack*>(parent) ||
-			::qt_cast<TQToolBox*>(parent) ||
-			::qt_cast<TQWizard*>(parent)
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+	    else if ( tqparent &&
+		      ( ::tqqt_cast<TQTabWidget*>(tqparent) ||
+			::tqqt_cast<TQWidgetStack*>(tqparent) ||
+			::tqqt_cast<TQToolBox*>(tqparent) ||
+			::tqqt_cast<TQWizard*>(tqparent)
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
                         || isPlugin
 #endif
                           ) )
-		MetaDataBase::addEntry( w );
+		MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	}
     }
 
@@ -1848,22 +1848,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
     while ( !n.isNull() ) {
 	if ( n.tagName() == "spacer" ) {
-	    createSpacer( n, w, layout, Qt::Horizontal );
+	    createSpacer( n, w, tqlayout, Qt::Horizontal );
 	} else if ( n.tagName() == "widget" ) {
-	    createObject( n, w, layout );
+	    createObject( n, w, tqlayout );
 	} else if ( n.tagName() == "hbox" ) {
-	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox );
-	    obj = layout;
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "grid" ) {
-	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid );
-	    obj = layout;
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "vbox" ) {
-	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox );
-	    obj = layout;
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
@@ -1877,35 +1877,35 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	} else if ( n.tagName() == "attribute" && w ) {
 	    TQString attrib = n.attribute( "name" );
 	    TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
-	    if ( ::qt_cast<TQTabWidget*>(parent) ) {
+	    if ( ::tqqt_cast<TQTabWidget*>(tqparent) ) {
 		if ( attrib == "title" )
-		    ( (TQTabWidget*)parent )->insertTab( w, v.toString() );
-	    } else if ( ::qt_cast<TQWidgetStack*>(parent) ) {
+		    ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() );
+	    } else if ( ::tqqt_cast<TQWidgetStack*>(tqparent) ) {
 		if ( attrib == "id" )
-		    ( (QDesignerWidgetStack*)parent )->insertPage( w, v.toInt() );
-	    } else if ( ::qt_cast<TQToolBox*>(parent) ) {
+		    ( (TQDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() );
+	    } else if ( ::tqqt_cast<TQToolBox*>(tqparent) ) {
 		if ( attrib == "label" )
-		    ( (TQToolBox*)parent )->addItem( w, v.toString() );
-	    } else if ( ::qt_cast<TQWizard*>(parent) ) {
+		    ( (TQToolBox*)tqparent )->addItem( w, v.toString() );
+	    } else if ( ::tqqt_cast<TQWizard*>(tqparent) ) {
 		if ( attrib == "title" )
-		    ( (TQWizard*)parent )->addPage( w, v.toString() );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+		    ( (TQWizard*)tqparent )->addPage( w, v.toString() );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 	    } else if ( isPlugin ) {
 		if ( attrib == "label" ) {
 		    WidgetInterface *iface = 0;
-		    widgetManager()->queryInterface( parentClassName, &iface );
+		    widgetManager()->queryInterface( tqparentClassName, &iface );
 		    if ( iface ) {
-			QWidgetContainerInterfacePrivate *iface2 = 0;
-			iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+			TQWidgetContainerInterfacePrivate *iface2 = 0;
+			iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
 			if ( iface2 ) {
-			    iface2->insertPage( parentClassName,
-						(TQWidget*)parent, v.toString(), -1, w );
+			    iface2->insertPage( tqparentClassName,
+						(TQWidget*)tqparent, v.toString(), -1, w );
 			    iface2->release();
 			}
 			iface->release();
 		    }
 		}
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
 	    }
 	} else if ( n.tagName() == "item" ) {
 	    createItem( n, w );
@@ -1926,7 +1926,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
     if ( w->isWidgetType() )
 	widgets.insert( w->name(), w );
 
-    return w;
+    return TQT_TQOBJECT(w);
 }
 
 void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
@@ -1934,7 +1934,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
     if ( !widget )
 	return;
 
-    if ( ::qt_cast<TQListView*>(widget) && e.tagName() == "column" ) {
+    if ( ::tqqt_cast<TQListView*>(widget) && e.tagName() == "column" ) {
 	TQListView *lv = (TQListView*)widget;
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
@@ -1967,8 +1967,8 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	if ( !resizable )
 	    lv->header()->setResizeEnabled( resizable, i );
     }
-#ifndef QT_NO_TABLE
-    else if ( ::qt_cast<TQTable*>(widget) ) {
+#ifndef TQT_NO_TABLE
+    else if ( ::tqqt_cast<TQTable*>(widget) ) {
 	TQTable *table = (TQTable*)widget;
 	bool isRow;
 	if ( ( isRow = e.tagName() == "row" ) )
@@ -1981,7 +1981,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	bool hasPixmap = FALSE;
 	TQString txt;
 	TQString field;
-	TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table );
+	TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
 	while ( !n.isNull() ) {
 	    if ( n.tagName() == "property" ) {
 		TQString attrib = n.attribute( "name" );
@@ -2006,7 +2006,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	    h->setLabel( i, txt );
 	if ( !isRow && !field.isEmpty() )
 	    fieldMap.insert( txt, field );
-	MetaDataBase::setColumnFields( table, fieldMap );
+	MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap );
     }
 #endif
 }
@@ -2032,17 +2032,17 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo
 
 void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i )
 {
-    if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ), widget ) )
+    if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ), TQT_TQOBJECT(widget) ) )
 	return;
 
-    if ( ::qt_cast<TQListBox*>(widget) || ::qt_cast<TQComboBox*>(widget) ) {
+    if ( ::tqqt_cast<TQListBox*>(widget) || ::tqqt_cast<TQComboBox*>(widget) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
 	bool hasPixmap = FALSE;
 	TQString txt;
 	loadItem( n, pix, txt, hasPixmap );
 	TQListBox *lb = 0;
-	if ( ::qt_cast<TQListBox*>(widget) )
+	if ( ::tqqt_cast<TQListBox*>(widget) )
 	    lb = (TQListBox*)widget;
 	else
 	    lb = ( (TQComboBox*)widget)->listBox();
@@ -2051,7 +2051,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
 	} else {
 	    new TQListBoxText( lb, txt );
 	}
-    } else if ( ::qt_cast<TQIconView*>(widget) ) {
+    } else if ( ::tqqt_cast<TQIconView*>(widget) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
 	bool hasPixmap = FALSE;
@@ -2062,7 +2062,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
 	    new TQIconViewItem( iv, txt, pix );
 	else
 	    new TQIconViewItem( iv, txt );
-    } else if ( ::qt_cast<TQListView*>(widget) ) {
+    } else if ( ::tqqt_cast<TQListView*>(widget) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
 	TQValueList<TQPixmap> pixmaps;
@@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
     }
 }
 
-TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o )
+TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -2117,23 +2117,23 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
 	colspan = 1;
 
     Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"),
-						      parent, "spacer", FALSE);
+						      tqparent, "spacer", FALSE);
     spacer->setOrientation( o );
     spacer->setInteraciveMode( FALSE );
     while ( !n.isNull() ) {
 	if ( n.tagName() == "property" )
-	    setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() );
+	    setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() );
 	n = n.nextSibling().toElement();
     }
     spacer->setInteraciveMode( TRUE );
     if ( formwindow )
 	formwindow->insertWidget( spacer, pasting );
-    if ( layout ) {
-	if ( ::qt_cast<TQBoxLayout*>(layout) )
-	    ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
+    if ( tqlayout ) {
+	if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) )
+	    ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() );
 	else
-	    ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
-								  spacer->alignment() );
+	    ( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
+								  spacer->tqalignment() );
     }
     return spacer;
 }
@@ -2143,9 +2143,9 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
 */
 void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
 {
-    const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE );
+    const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE );
 
-    if ( !::qt_cast<TQLayout*>(obj)  ) {// no layouts in metadatabase... (RS)
+    if ( !::tqqt_cast<TQLayout*>(obj)  ) {// no tqlayouts in metadatabase... (RS)
 	if ( obj->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget();
 	    if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" )
@@ -2156,9 +2156,9 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
 
     TQVariant defVarient;
     if ( e.tagName() == "font" ) {
-	TQFont f( qApp->font() );
-	if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() )
-	    f = ( (TQWidget*)obj )->parentWidget()->font();
+	TQFont f( tqApp->font() );
+	if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() )
+	    f = ( (TQWidget*)obj )->tqparentWidget()->font();
 	defVarient = TQVariant( f );
     }
 
@@ -2187,7 +2187,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     if ( !p ) {
 	MetaDataBase::setFakeProperty( obj, prop, v );
 	if ( obj->isWidgetType() ) {
-	    if ( prop == "database" && obj != toplevel ) {
+	    if ( prop == "database" && TQT_TQOBJECT(obj) != TQT_TQOBJECT(toplevel) ) {
 		TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList();
 		if ( lst.count() > 2 )
 		    dbControls.insert( obj->name(), lst[ 2 ] );
@@ -2241,32 +2241,32 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     }
     if ( prop == "icon" ) {
 	formwindow->setIcon( v.toPixmap() );
-	TQString pmk = MetaDataBase::pixmapKey( formwindow, v.toPixmap().serialNumber() );
-	MetaDataBase::setPixmapKey( formwindow,
+	TQString pmk = MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), v.toPixmap().serialNumber() );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow),
 				    formwindow->icon()->serialNumber(), pmk );
     }
 
     if ( prop == "geometry" ) {
-	if ( obj == toplevel ) {
+	if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
 	    hadGeometry = TRUE;
 	    toplevel->resize( v.toRect().size() );
 	    return;
-	} else if ( obj == formwindow->mainContainer() ) {
+	} else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
 	    hadGeometry = TRUE;
 	    formwindow->resize( v.toRect().size() );
 	    return;
 	}
     }
 
-    if ( ::qt_cast<TQLayout*>(obj) ) {
+    if ( ::tqqt_cast<TQLayout*>(obj) ) {
 	if ( prop == "spacing" ) {
-	    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() );
+	    MetaDataBase::setSpacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
 	    return;
 	} else if ( prop == "margin" ) {
-	    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
 	    return;
 	} else if ( e.tagName() == "enum" &&  prop == "resizeMode" ) {
-	    MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toString() );
+	    MetaDataBase::setResizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toString() );
 	    return;
 	}
     }
@@ -2274,10 +2274,10 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     if ( prop == "name" ) {
 	if ( pasting ) {
 	    TQString s = v.toString();
-	    formwindow->unify( (TQWidget*)obj, s, TRUE );
+	    formwindow->unify( TQT_TQOBJECT(obj), s, TRUE );
 	    obj->setName( s );
 	    return;
-	} else if ( formwindow && obj == formwindow->mainContainer() ) {
+	} else if ( formwindow && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
 	    formwindow->setName( v.toCString() );
 	}
     }
@@ -2335,9 +2335,9 @@ void Resource::saveImageData( const TQImage &img, TQTextStream &ts, int indent )
     TQByteArray bazip = ba;
     int i = 0;
     if (compress) {
-	bazip = qCompress( ba );
+	bazip = tqCompress( ba );
 	format += ".GZ";
-	// The first 4 bytes in qCompress() are the length of the unzipped
+	// The first 4 bytes in tqCompress() are the length of the unzipped
 	// format. The XPM.GZ format does not use these.
 	i = 4;
     }
@@ -2397,14 +2397,14 @@ static TQImage loadImageData( TQDomElement &n2 )
 	ulong len = n2.attribute( "length" ).toULong();
 	if ( len < data.length() * 5 )
 	    len = data.length() * 5;
-	// qUncompress() expects the first 4 bytes to be the expected length of
+	// tqUncompress() expects the first 4 bytes to be the expected length of
 	// the uncompressed data
 	ba[0] = ( len & 0xff000000 ) >> 24;
 	ba[1] = ( len & 0x00ff0000 ) >> 16;
 	ba[2] = ( len & 0x0000ff00 ) >> 8;
 	ba[3] = ( len & 0x000000ff );
-	TQByteArray baunzip = qUncompress( ba, baSize );
-	img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) );
+	TQByteArray baunzip = tqUncompress( ba, baSize );
+	img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')) );
     }  else {
 	img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format );
     }
@@ -2443,7 +2443,7 @@ TQImage Resource::loadFromCollection( const TQString &name )
 
 void Resource::saveConnections( TQTextStream &ts, int indent )
 {
-    TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow );
+    TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) );
     if ( connections.isEmpty() )
 	return;
     ts << makeIndent( indent ) << "<connections>" << endl;
@@ -2451,13 +2451,13 @@ void Resource::saveConnections( TQTextStream &ts, int indent )
     TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin();
     for ( ; it != connections.end(); ++it ) {
 	MetaDataBase::Connection conn = *it;
-	if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 &&
+	if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 &&
 	       qstrcmp( conn.sender->name(), "this" ) != 0 ) ||
-	     ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 &&
+	     ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 &&
 	       qstrcmp( conn.receiver->name(), "this" ) != 0 ) )
 	    continue;
-	if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) &&
-	     !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) )
+	if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) &&
+	     !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) )
 	    continue;
 
 	if ( conn.sender->inherits( "CustomWidget" ) ) {
@@ -2500,7 +2500,7 @@ void Resource::loadConnections( const TQDomElement &e )
 		    conn.sender = 0;
 		    TQString name = n2.firstChild().toText().data();
 		    if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
-			conn.sender = toplevel;
+			conn.sender = TQT_TQOBJECT(toplevel);
 		    } else {
 			if ( name == "this" )
 			    name = toplevel->name();
@@ -2520,7 +2520,7 @@ void Resource::loadConnections( const TQDomElement &e )
 		    conn.receiver = 0;
 		    TQString name = n2.firstChild().toText().data();
 		    if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
-			conn.receiver = toplevel;
+			conn.receiver = TQT_TQOBJECT(toplevel);
 		    } else {
 			TQObjectList *l = toplevel->queryList( 0, name, FALSE );
 			if ( l ) {
@@ -2538,14 +2538,14 @@ void Resource::loadConnections( const TQDomElement &e )
 		n2 = n2.nextSibling().toElement();
 	    }
 	    if ( formwindow ) {
-		if ( conn.sender == formwindow )
-		    conn.sender = formwindow->mainContainer();
-		if ( conn.receiver == formwindow )
-		    conn.receiver = formwindow->mainContainer();
+		if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) )
+		    conn.sender = TQT_TQOBJECT(formwindow->mainContainer());
+		if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) )
+		    conn.receiver = TQT_TQOBJECT(formwindow->mainContainer());
 	    }
 	    if ( conn.sender && conn.receiver ) {
 		if ( lang == "C++" ) {
-		    MetaDataBase::addConnection( formwindow ? formwindow : toplevel,
+		    MetaDataBase::addConnection( TQT_TQOBJECT(formwindow ? formwindow : toplevel),
 						 conn.sender, conn.signal, conn.receiver, conn.slot );
 		}
 	    }
@@ -2562,11 +2562,11 @@ void Resource::loadConnections( const TQDomElement &e )
 	    if ( slot.returnType.isEmpty() )
 		slot.returnType = "void";
 	    slot.function = n.firstChild().toText().data();
-	    if ( !MetaDataBase::hasFunction( formwindow, slot.function, TRUE ) )
-		MetaDataBase::addFunction( formwindow, slot.function, slot.specifier,
+	    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), slot.function, TRUE ) )
+		MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), slot.function, slot.specifier,
 				       slot.access, "slot", slot.language, slot.returnType );
 	    else
-		MetaDataBase::changeFunctionAttributes( formwindow, slot.function, slot.function,
+		MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), slot.function, slot.function,
 							slot.specifier, slot.access,
 							"slot", slot.language, slot.returnType );
 	}
@@ -2581,7 +2581,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
 
     TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets();
     for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) {
-	if ( usedCustomWidgets.findIndex( w->className ) == -1 )
+	if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 )
 	    continue;
 	ts << makeIndent( indent ) << "<customwidget>" << endl;
 	indent++;
@@ -2591,8 +2591,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
 	   << "\">" << w->includeFile << "</header>" << endl;
 	ts << makeIndent( indent ) << "<sizehint>" << endl;
 	indent++;
-	ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
-	ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
+	ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
+	ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
 	indent--;
 	ts << makeIndent( indent ) << "</sizehint>" << endl;
 	ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2648,9 +2648,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
 		    TQDomElement n3 = n2.firstChild().toElement();
 		    while ( !n3.isNull() ) {
 			if ( n3.tagName() == "width" )
-			    w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+			    w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
 			else if ( n3.tagName() == "height" )
-			    w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+			    w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
 			n3 = n3.nextSibling().toElement();
 		    }
 		} else if ( n2.tagName() == "sizepolicy" ) {
@@ -2716,7 +2716,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent )
     indent++;
 
     for ( TQWidget *w = l.first(); w; w = l.next() ) {
-	if ( w->testWState( Qt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 )
+	if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 )
 	    continue;
 	ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl;
     }
@@ -2756,7 +2756,7 @@ void Resource::loadTabOrder( const TQDomElement &e )
 
 void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent )
 {
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) );
     TQString cn;
     if ( info.classNameChanged && !info.className.isEmpty() )
 	cn = info.className;
@@ -2771,9 +2771,9 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent )
 
 void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 {
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) );
     if ( !langIface || formwindow->project()->isCpp() ) {
-	TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow );
+	TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) );
 	TQString extensionInclude;
 	bool needExtensionInclude = FALSE;
 	if ( langIface &&
@@ -2800,7 +2800,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    ts << makeIndent( indent ) << "</includes>" << endl;
 	}
 
-	TQStringList forwards = MetaDataBase::forwards( formwindow );
+	TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) );
 	if ( !forwards.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<forwards>" << endl;
 	    indent++;
@@ -2809,7 +2809,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</forwards>" << endl;
 	}
-	TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formwindow );
+	TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formwindow) );
 	if ( !varLst.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<variables>" << endl;
 	    indent++;
@@ -2825,7 +2825,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</variables>" << endl;
 	}
-	TQStringList sigs = MetaDataBase::signalList( formwindow );
+	TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) );
 	if ( !sigs.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<signals>" << endl;
 	    indent++;
@@ -2835,7 +2835,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    ts << makeIndent( indent ) << "</signals>" << endl;
 	}
 
-	TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( formwindow );
+	TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) );
 	if ( !slotList.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<slots>" << endl;
 	    indent++;
@@ -2858,7 +2858,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    ts << makeIndent( indent ) << "</slots>" << endl;
 	}
 
-	TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formwindow, TRUE );
+	TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formwindow), TRUE );
 	if ( !functionList.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<functions>" << endl;
 	    indent++;
@@ -2888,19 +2888,19 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	ts << makeIndent( indent ) << "<pixmapinproject/>" << endl;
     else
 	ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl;
-    if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() )
+    if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() )
 	ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl;
     if ( formwindow ) {
-	ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing()
-	   << "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl;
+	ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing()
+	   << "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl;
 	if ( formwindow->hasLayoutFunctions() ) {
 	    TQString s = "";
 	    TQString m = "";
 	    if ( !formwindow->spacingFunction().isEmpty() )
-		s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() );
+		s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() );
 	    if ( !formwindow->marginFunction().isEmpty() )
-		m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() );
-	    ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl;
+		m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() );
+	    ts << makeIndent( indent ) << "<tqlayoutfunctions" << s << m << "/>" << endl;
 	}
     }
 }
@@ -2938,16 +2938,17 @@ TQColorGroup Resource::loadColorGroup( const TQDomElement &e )
 
 void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent )
 {
-    if ( !a->children() )
+    TQObjectList clo = a->childrenListObject();
+    if ( clo.isEmpty() )
 	return;
-    TQObjectListIt it( *a->children() );
+    TQObjectListIt it( clo );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
-	if ( !::qt_cast<TQAction*>(o) )
+	if ( !::tqqt_cast<TQAction*>(o) )
 	    continue;
 	TQAction *ac = (TQAction*)o;
-	bool isGroup = ::qt_cast<TQActionGroup*>(ac);
+	bool isGroup = ::tqqt_cast<TQActionGroup*>(ac);
 	if ( isGroup )
 	    ts << makeIndent( indent ) << "<actiongroup>" << endl;
 	else
@@ -2976,7 +2977,7 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts
     TQPtrListIterator<TQAction> it( actions );
     while ( it.current() ) {
 	TQAction *a = it.current();
-	bool isGroup = ::qt_cast<TQActionGroup*>(a);
+	bool isGroup = ::tqqt_cast<TQActionGroup*>(a);
 	if ( isGroup )
 	    ts << makeIndent( indent ) << "<actiongroup>" << endl;
 	else
@@ -2999,12 +3000,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts
     ts << makeIndent( indent ) << "</actions>" << endl;
 }
 
-void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
+void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
 {
     TQDomElement n = e;
     TQAction *a = 0;
     if ( n.tagName() == "action" ) {
-	a = new QDesignerAction( parent );
+	a = new TQDesignerAction( tqparent );
 	MetaDataBase::addEntry( a );
 	TQDomElement n2 = n.firstChild().toElement();
 	bool hasMenuText = FALSE;
@@ -3021,10 +3022,10 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !::qt_cast<TQAction*>(parent) )
+	if ( !::tqqt_cast<TQAction*>(tqparent) )
 	    formwindow->actionList().append( a );
     } else if ( n.tagName() == "actiongroup" ) {
-	a = new QDesignerActionGroup( parent );
+	a = new TQDesignerActionGroup( tqparent );
 	MetaDataBase::addEntry( a );
 	TQDomElement n2 = n.firstChild().toElement();
 	bool hasMenuText = FALSE;
@@ -3044,7 +3045,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !::qt_cast<TQAction*>(parent) )
+	if ( !::tqqt_cast<TQAction*>(tqparent) )
 	    formwindow->actionList().append( a );
     }
 }
@@ -3054,9 +3055,9 @@ void Resource::loadActions( const TQDomElement &e )
     TQDomElement n = e.firstChild().toElement();
     while ( !n.isNull() ) {
 	if ( n.tagName() == "action" ) {
-	    loadChildAction( formwindow, n );
+	    loadChildAction( TQT_TQOBJECT(formwindow), n );
 	} else if ( n.tagName() == "actiongroup" ) {
-	    loadChildAction( formwindow, n );
+	    loadChildAction( TQT_TQOBJECT(formwindow), n );
 	}
 	n = n.nextSibling().toElement();
     }
@@ -3068,8 +3069,8 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent )
     indent++;
 
     TQPtrList<TQToolBar> tbList;
-    for ( int i = 0; i <= (int)Qt::DockMinimized; ++i ) {
-	tbList = mw->toolBars( (Qt::Dock)i );
+    for ( int i = 0; i <= (int)TQt::DockMinimized; ++i ) {
+	tbList = mw->toolBars( (TQt::Dock)i );
 	if ( tbList.isEmpty() )
 	    continue;
 	for ( TQToolBar *tb = tbList.first(); tb; tb = tbList.next() ) {
@@ -3077,23 +3078,23 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent )
 		continue;
 	    ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl;
 	    indent++;
-	    saveObjectProperties( tb, ts, indent );
-	    TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions();
+	    saveObjectProperties( TQT_TQOBJECT(tb), ts, indent );
+	    TQPtrList<TQAction> actionList = ( (TQDesignerToolBar*)tb )->insertedActions();
 	    for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
-		if ( ::qt_cast<QSeparatorAction*>(a) ) {
+		if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
 		    ts << makeIndent( indent ) << "<separator/>" << endl;
 		} else {
-		    if ( ::qt_cast<QDesignerAction*>(a) && !( (QDesignerAction*)a )->supportsMenu() ) {
-			TQWidget *w = ( (QDesignerAction*)a )->widget();
+		    if ( ::tqqt_cast<TQDesignerAction*>(a) && !( (TQDesignerAction*)a )->supportsMenu() ) {
+			TQWidget *w = ( (TQDesignerAction*)a )->widget();
 			ts <<  makeIndent( indent ) << "<widget class=\""
-			   << WidgetFactory::classNameOf( w ) << "\">" << endl;
+			   << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl;
 			indent++;
-			const char *className = WidgetFactory::classNameOf( w );
+			const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 			if ( w->isA( "CustomWidget" ) )
 			    usedCustomWidgets << TQString( className );
-			if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), w ) )
-			    saveItems( w, ts, indent );
-			saveObjectProperties( w, ts, indent );
+			if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) )
+			    saveItems( TQT_TQOBJECT(w), ts, indent );
+			saveObjectProperties( TQT_TQOBJECT(w), ts, indent );
 			indent--;
 			ts << makeIndent( indent ) << "</widget>" << endl;
 		    } else {
@@ -3116,8 +3117,8 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent )
 	return;
     ts << makeIndent( indent ) << "<menubar>" << endl;
     indent++;
-    MetaDataBase::setPropertyChanged( mb, "name", TRUE ); // FIXME: remove
-    saveObjectProperties( mb, ts, indent );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mb), "name", TRUE ); // FIXME: remove
+    saveObjectProperties( TQT_TQOBJECT(mb), ts, indent );
 
     for ( int i = 0; i < (int)mb->count(); ++i ) {
 	MenuBarEditorItem *m = mb->item( i );
@@ -3142,11 +3143,11 @@ void Resource::savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStrea
 {
     for ( PopupMenuEditorItem *i = pm->items()->first(); i; i = pm->items()->next() ) {
 	TQAction *a = i->action();
-	if ( ::qt_cast<QSeparatorAction*>(a) )
+	if ( ::tqqt_cast<TQSeparatorAction*>(a) )
 	    ts <<  makeIndent( indent ) << "<separator/>" << endl;
-	else if ( ::qt_cast<QDesignerAction*>(a) )
+	else if ( ::tqqt_cast<TQDesignerAction*>(a) )
 	    ts <<  makeIndent( indent ) << "<action name=\"" << a->name() << "\"/>" << endl;
-	else if  ( ::qt_cast<QDesignerActionGroup*>(a) )
+	else if  ( ::tqqt_cast<TQDesignerActionGroup*>(a) )
 	    ts <<  makeIndent( indent ) << "<actiongroup name=\"" << a->name() << "\"/>" << endl;
 	PopupMenuEditor *s =  i->subMenu();
 	if ( s && s->count() ) {
@@ -3167,11 +3168,11 @@ void Resource::loadToolBars( const TQDomElement &e )
 {
     TQDomElement n = e.firstChild().toElement();
     TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() );
-    QDesignerToolBar *tb = 0;
+    TQDesignerToolBar *tb = 0;
     while ( !n.isNull() ) {
 	if ( n.tagName() == "toolbar" ) {
-	    Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt();
-	    tb = new QDesignerToolBar( mw, dock );
+	    TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt();
+	    tb = new TQDesignerToolBar( mw, dock );
 	    TQDomElement n2 = n.firstChild().toElement();
 	    while ( !n2.isNull() ) {
 		if ( n2.tagName() == "action" ) {
@@ -3181,17 +3182,17 @@ void Resource::loadToolBars( const TQDomElement &e )
 			tb->addAction( a );
 		    }
 		} else if ( n2.tagName() == "separator" ) {
-		    TQAction *a = new QSeparatorAction( 0 );
+		    TQAction *a = new TQSeparatorAction( 0 );
 		    a->addTo( tb );
 		    tb->addAction( a );
 		} else if ( n2.tagName() == "widget" ) {
 		    TQWidget *w = (TQWidget*)createObject( n2, tb );
-		    QDesignerAction *a = new QDesignerAction( w, tb );
+		    TQDesignerAction *a = new TQDesignerAction( w, TQT_TQOBJECT(tb) );
 		    a->addTo( tb );
 		    tb->addAction( a );
 		    tb->installEventFilters( w );
 		} else if ( n2.tagName() == "property" ) {
-		    setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() );
+		    setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() );
 		}
 		n2 = n2.nextSibling().toElement();
 	    }
@@ -3205,16 +3206,16 @@ void Resource::loadMenuBar( const TQDomElement &e )
     TQDomElement n = e.firstChild().toElement();
     TQMainWindow *mw = (TQMainWindow*)formwindow->mainContainer();
     MenuBarEditor *mb = new MenuBarEditor( formwindow, mw );
-    MetaDataBase::addEntry( mb );
+    MetaDataBase::addEntry( TQT_TQOBJECT(mb) );
     while ( !n.isNull() ) {
 	if ( n.tagName() == "item" ) {
 	    PopupMenuEditor * popup = new PopupMenuEditor( formwindow, mw );
 	    loadPopupMenu( popup, n );
 	    popup->setName( n.attribute( "name" ) );
 	    mb->insertItem( n.attribute( "text" ), popup );
-	    MetaDataBase::addEntry( popup );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(popup) );
 	} else if ( n.tagName() == "property" ) {
-	    setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() );
+	    setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() );
 	} else if ( n.tagName() == "separator" ) {
 	    mb->insertSeparator();
 	}
@@ -3224,7 +3225,7 @@ void Resource::loadMenuBar( const TQDomElement &e )
 
 void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e )
 {
-    MetaDataBase::addEntry( p );
+    MetaDataBase::addEntry( TQT_TQOBJECT(p) );
     TQDomElement n = e.firstChild().toElement();
     TQAction *a = 0;
     while ( !n.isNull() ) {
@@ -3234,7 +3235,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e )
 		p->insert( a );
 	}
 	if ( n.tagName() == "item" ) {
-	    PopupMenuEditorItem *i = p->at( p->find( a ) );
+	    PopupMenuEditorItem *i = p->at( p->tqfind( a ) );
 	    if ( i ) {
 		TQString name = n.attribute( "name" );
 		formwindow->unify( i, name, TRUE );
@@ -3243,7 +3244,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e )
 		loadPopupMenu( i->subMenu(), n );
 	    }
 	} else if ( n.tagName() == "separator" ) {
-	    a = new QSeparatorAction( 0 );
+	    a = new TQSeparatorAction( 0 );
 	    p->insert( a );
 	}
 	n = n.nextSibling().toElement();
@@ -3265,7 +3266,7 @@ bool Resource::saveFormCode( FormFile *formfile, LanguageInterface * /*langIface
 void Resource::loadExtraSource( FormFile *formfile, const TQString &currFileName,
 				LanguageInterface *langIface, bool hasFunctions )
 {
-    TQString lang = "Qt Script";
+    TQString lang = "TQt Script";
     if ( MainWindow::self )
 	lang = MainWindow::self->currProject()->language();
     LanguageInterface *iface = langIface;
@@ -3309,7 +3310,7 @@ void Resource::loadExtraSource( FormFile *formfile, const TQString &currFileName
 					      (TQObject*)formfile,
 					      (*fit).name,
 					      (*fit).name,
-					      TQString::null );
+					      TQString() );
 	} else {
 	    TQString access = (*fit).access;
 	    if ( access.isEmpty() )
diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h
index 4d448644..0617d977 100644
--- a/kdevdesigner/designer/resource.h
+++ b/kdevdesigner/designer/resource.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -44,7 +44,7 @@ class TQPalette;
 class FormWindow;
 class MainWindow;
 class TQDomElement;
-class QDesignerGridLayout;
+class TQDesignerGridLayout;
 class TQListViewItem;
 class TQMainWindow;
 struct LanguageInterface;
@@ -77,7 +77,7 @@ public:
 
     bool save( const TQString& filename, bool formCodeOnly = FALSE);
     bool save( TQIODevice* );
-    void paste( const TQString &cb, TQWidget *parent );
+    void paste( const TQString &cb, TQWidget *tqparent );
 
     static void saveImageData( const TQImage &img, TQTextStream &ts, int indent );
     static void loadCustomWidgets( const TQDomElement &e, Resource *r );
@@ -86,7 +86,7 @@ public:
     static bool saveFormCode( FormFile *formfile, LanguageInterface *langIface );
 
 private:
-    void saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent );
+    void saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent );
     void saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent );
     void saveObjectProperties( TQObject *w, TQTextStream &ts, int indent );
     void saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type t, TQTextStream &ts, int indent );
@@ -111,8 +111,8 @@ private:
     void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent );
     void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent );
 
-    TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
-    TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o );
+    TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 );
+    TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o );
     void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
     void createColumn( const TQDomElement &e, TQWidget *widget );
     void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);
@@ -125,7 +125,7 @@ private:
     void loadTabOrder( const TQDomElement &e );
     void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap );
     void loadActions( const TQDomElement &n );
-    void loadChildAction( TQObject *parent, const TQDomElement &e );
+    void loadChildAction( TQObject *tqparent, const TQDomElement &e );
     void loadToolBars( const TQDomElement &n );
     void loadMenuBar( const TQDomElement &n );
     void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e );
diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui
index c55343ad..ae93f58c 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui
+++ b/kdevdesigner/designer/richtextfontdialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>RichTextFontDialog</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+                <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
                     <item>
                         <property name="text">
                             <string>default</string>
@@ -77,7 +77,7 @@
                         <cstring>fontCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -88,7 +88,7 @@
                         <cstring>fontCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -109,14 +109,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <cstring>colorButton</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="2">
                     <item>
                         <property name="text">
                             <string>0</string>
@@ -183,7 +183,7 @@
                         <enum>AtTop</enum>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="2" column="1">
+                <widget class="TQToolButton" row="2" column="1">
                     <property name="name">
                         <cstring>colorButton</cstring>
                     </property>
@@ -195,7 +195,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -227,7 +227,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -248,7 +248,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
                 <cstring>Layout15</cstring>
             </property>
@@ -272,14 +272,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -287,7 +287,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -334,14 +334,14 @@
     <variable>QColor color</variable>
     <variable>QString size</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>selectColor()</slot>
     <slot>accept()</slot>
     <slot>reject()</slot>
-    <slot returnType="QString">getSize()</slot>
-    <slot returnType="QString">getColor()</slot>
-    <slot returnType="QString">getFont()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot returnType="TQString">getSize()</slot>
+    <slot returnType="TQString">getColor()</slot>
+    <slot returnType="TQString">getFont()</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h
index d270b7d9..263b5f90 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui.h
+++ b/kdevdesigner/designer/richtextfontdialog.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -11,12 +11,12 @@
 void RichTextFontDialog::init()
 {
     TQFontDatabase *db = new TQFontDatabase();
-    fontCombo->insertStringList( db->families() );
+    fontCombo->insertStringList( db->tqfamilies() );
 }
 
 void RichTextFontDialog::selectColor()
 {
-    color = QColorDialog::getColor( "", this );   
+    color = TQColorDialog::getColor( "", this );   
     if( color.isValid() )
 	colorButton->setPaletteBackgroundColor( color );
 }
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index eef86747..42b1f665 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,8 +35,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
-    : TQWidget( parent )
+SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s )
+    : TQWidget( tqparent )
 {
     active = TRUE;
     setBackgroundMode( active ? PaletteText : PaletteDark );
@@ -44,7 +44,7 @@ SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     widget = 0;
     dir =d ;
     setMouseTracking( FALSE );
-    formWindow = parent;
+    formWindow = tqparent;
     sel = s;
     updateCursor();
 }
@@ -98,7 +98,7 @@ void SizeHandle::setWidget( TQWidget *w )
 
 void SizeHandle::paintEvent( TQPaintEvent * )
 {
-    if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget )
+    if ( ( (FormWindow*)tqparentWidget() )->currentWidget() != widget )
 	return;
     TQPainter p( this );
     p.setPen( blue );
@@ -107,7 +107,7 @@ void SizeHandle::paintEvent( TQPaintEvent * )
 
 void SizeHandle::mousePressEvent( TQMouseEvent *e )
 {
-    if ( !widget || e->button() != LeftButton || !active )
+    if ( !widget || e->button() != Qt::LeftButton || !active )
 	return;
     oldPressPos = e->pos();
     geom = origGeom = TQRect( widget->pos(), widget->size() );
@@ -115,13 +115,13 @@ void SizeHandle::mousePressEvent( TQMouseEvent *e )
 
 void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( !widget || ( e->state() & LeftButton ) != LeftButton || !active )
+    if ( !widget || ( e->state() & Qt::LeftButton ) != Qt::LeftButton || !active )
 	return;
     TQPoint rp = mapFromGlobal( e->globalPos() );
     TQPoint d = oldPressPos - rp;
     oldPressPos = rp;
-    TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() );
-    TQRect pr = widget->parentWidget()->rect();
+    TQPoint checkPos = widget->tqparentWidget()->mapFromGlobal( e->globalPos() );
+    TQRect pr = widget->tqparentWidget()->rect();
 
     // ##### move code around a bit to reduce duplicated code here
     switch ( dir ) {
@@ -213,7 +213,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     sel->updateGeometry();
     oldPressPos += ( p - pos() );
 
-    formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
+    formWindow->sizePreview()->setText( i18n( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) );
     formWindow->sizePreview()->adjustSize();
     TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
 	      formWindow->sizePreview()->size() );
@@ -221,55 +221,55 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     formWindow->sizePreview()->setGeometry( lg );
     formWindow->sizePreview()->show();
     formWindow->sizePreview()->raise();
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow->updateChildSelections( widget );
 }
 
 void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if ( e->button() != LeftButton || !active )
+    if ( e->button() != Qt::LeftButton || !active )
 	return;
 
     formWindow->sizePreview()->hide();
-    if ( geom != widget->geometry() )
+    if ( geom != widget->tqgeometry() )
 	formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ),
 								     formWindow,
 								     widget, origGeom,
-								     widget->geometry() ) );
-    formWindow->emitUpdateProperties( widget );
+								     widget->tqgeometry() ) );
+    formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) );
 }
 
 void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
 {
-    int minw = QMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
-    minw = QMAX( minw, 2 * formWindow->grid().x() );
-    int minh = QMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
-    minh = QMAX( minh, 2 * formWindow->grid().y() );
-    if ( QMAX( minw, width ) > w->maximumWidth() ||
-	 QMAX( minh, height ) > w->maximumHeight() )
+    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+    minw = TQMAX( minw, 2 * formWindow->grid().x() );
+    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+    minh = TQMAX( minh, 2 * formWindow->grid().y() );
+    if ( TQMAX( minw, width ) > w->maximumWidth() ||
+	 TQMAX( minh, height ) > w->maximumHeight() )
 	return;
     if ( width < minw && x != w->x() )
 	x -= minw - width;
     if ( height < minh && y != w->y() )
 	y -= minh - height;
-    w->setGeometry( x, y, QMAX( minw, width ), QMAX( minh, height ) );
+    w->setGeometry( x, y, TQMAX( minw, width ), TQMAX( minh, height ) );
 }
 
 void SizeHandle::tryResize( TQWidget *w, int width, int height )
 {
-    int minw = QMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
-    minw = QMAX( minw, 16 );
-    int minh = QMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
-    minh = QMAX( minh, 16 );
-    w->resize( QMAX( minw, width ), QMAX( minh, height ) );
+    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+    minw = TQMAX( minw, 16 );
+    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+    minh = TQMAX( minh, 16 );
+    w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
 }
 
 // ------------------------------------------------------------------------
 
-WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict )
+WidgetSelection::WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict )
     : selectionDict( selDict )
 {
-    formWindow = parent;
+    formWindow = tqparent;
     for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
 	handles.insert( i, new SizeHandle( formWindow, (SizeHandle::Direction)i, this ) );
     }
@@ -287,7 +287,7 @@ void WidgetSelection::setWidget( TQWidget *w, bool updateDict )
     }
 
     wid = w;
-    bool active = !wid->parentWidget() || WidgetFactory::layoutType( wid->parentWidget() ) == WidgetFactory::NoLayout;
+    bool active = !wid->tqparentWidget() || WidgetFactory::tqlayoutType( wid->tqparentWidget() ) == WidgetFactory::NoLayout;
     for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
 	SizeHandle *h = handles[ i ];
 	if ( h ) {
@@ -308,10 +308,10 @@ bool WidgetSelection::isUsed() const
 
 void WidgetSelection::updateGeometry()
 {
-    if ( !wid || !wid->parentWidget() )
+    if ( !wid || !wid->tqparentWidget() )
 	return;
 
-    TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() );
+    TQPoint p = wid->tqparentWidget()->mapToGlobal( wid->pos() );
     p = formWindow->mapFromGlobal( p );
     TQRect r( p, wid->size() );
 
diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h
index 0e5f1a9e..ee089de3 100644
--- a/kdevdesigner/designer/sizehandle.h
+++ b/kdevdesigner/designer/sizehandle.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,14 +36,15 @@ class FormWindow;
 class WidgetSelection;
 class TQPaintEvent;
 
-class SizeHandle : public QWidget
+class SizeHandle : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left };
 
-    SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s );
+    SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s );
     void setWidget( TQWidget *w );
     void setActive( bool a );
     void updateCursor();
@@ -74,7 +75,7 @@ private:
 class WidgetSelection
 {
 public:
-    WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict );
+    WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict );
 
     void setWidget( TQWidget *w, bool updateDict = TRUE );
     bool isUsed() const;
diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp
index f5915664..863abaab 100644
--- a/kdevdesigner/designer/sourceeditor.cpp
+++ b/kdevdesigner/designer/sourceeditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,14 +40,14 @@
 #include <tqtextstream.h>
 #include "kdevdesigner_part.h"
 
-SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
-    : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
+SourceEditor::SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface )
+    : TQVBox( tqparent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
 {
     iFace->addRef();
     lIface->addRef();
     editor = iFace->editor( MainWindow::self->areEditorsReadOnly(),
 			    this, MainWindow::self->designerInterface() );
-    iFace->onBreakPointChange( MainWindow::self, TQT_SLOT( breakPointsChanged() ) );
+    iFace->onBreakPointChange( TQT_TQOBJECT(MainWindow::self), TQT_SLOT( breakPointsChanged() ) );
     resize( 600, 400 );
     setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
 }
@@ -77,7 +77,7 @@ void SourceEditor::setObject( TQObject *o, Project *p )
 	formWindow()->formFile()->setCodeEdited( FALSE );
 	formWindow()->formFile()->setEditor( 0 );
     }
-    if ( ::qt_cast<FormWindow*>(o) )
+    if ( ::tqqt_cast<FormWindow*>(o) )
 	( (FormWindow*)o )->formFile()->setCodeEdited( TRUE );
     save();
     bool changed = FALSE;
@@ -104,7 +104,7 @@ void SourceEditor::setObject( TQObject *o, Project *p )
 	if ( formWindow()->isFake() )
 	    iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) );
 	else
-	    iFace->setContext( formWindow()->mainContainer() );
+	    iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) );
     } else {
 	iFace->setContext( 0 );
     }
@@ -119,9 +119,9 @@ TQString SourceEditor::sourceOfObject( TQObject *o, const TQString &,
     TQString txt;
     if ( !o )
 	return txt;
-    if ( ::qt_cast<FormWindow*>(o) )
+    if ( ::tqqt_cast<FormWindow*>(o) )
 	txt = ( (FormWindow*)o )->formFile()->code();
-    else if ( ::qt_cast<SourceFile*>(o) )
+    else if ( ::tqqt_cast<SourceFile*>(o) )
 	txt = ( (SourceFile*)o )->text();
     return txt;
 }
@@ -133,7 +133,7 @@ void SourceEditor::setFunction( const TQString &func, const TQString &clss )
 
 void SourceEditor::setClass( const TQString &clss )
 {
-    iFace->scrollTo( clss, TQString::null );
+    iFace->scrollTo( clss, TQString() );
 }
 
 void SourceEditor::closeEvent( TQCloseEvent *e )
@@ -235,7 +235,7 @@ void SourceEditor::resetContext()
 	if ( formWindow()->isFake() )
 	    iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) );
 	else
-	    iFace->setContext( formWindow()->mainContainer() );
+	    iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) );
     } else {
 	iFace->setContext( 0 );
     }
@@ -307,14 +307,14 @@ bool SourceEditor::saveAs()
 
 SourceFile *SourceEditor::sourceFile() const
 {
-    if ( !::qt_cast<SourceFile*>((TQObject *)obj) )
+    if ( !::tqqt_cast<SourceFile*>((TQObject *)obj) )
 	return 0;
     return (SourceFile*)(TQObject*)obj;
 }
 
 FormWindow *SourceEditor::formWindow() const
 {
-    if ( !::qt_cast<FormWindow*>((TQObject *)obj) )
+    if ( !::tqqt_cast<FormWindow*>((TQObject *)obj) )
 	return 0;
     return (FormWindow*)(TQObject*)obj;
 }
diff --git a/kdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h
index 3383da24..e8d4cfb8 100644
--- a/kdevdesigner/designer/sourceeditor.h
+++ b/kdevdesigner/designer/sourceeditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,18 +37,19 @@ struct LanguageInterface;
 class Project;
 class SourceFile;
 
-class SourceEditor : public QVBox
+class SourceEditor : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface );
+    SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface );
     ~SourceEditor();
 
     void setObject( TQObject *fw, Project *p );
     TQObject *object() const { return obj; }
     Project *project() const { return pro; }
-    void setFunction( const TQString &func, const TQString &clss = TQString::null );
+    void setFunction( const TQString &func, const TQString &clss = TQString() );
     void setClass( const TQString &clss );
     void save();
     bool saveAs();
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index 8e103e85..5b21afa5 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -122,7 +122,7 @@ bool SourceFile::saveAs( bool ignoreModified )
     TQString old = filename;
     TQString initFn = pro->makeAbsolute( filename );
     if ( ignoreModified ) {
-	TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
+	TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
 	initFn = TQFileInfo( initFn ).fileName();
 	initFn.prepend( dir + "/" );
     }
@@ -138,12 +138,12 @@ bool SourceFile::saveAs( bool ignoreModified )
     pro->setModified( TRUE );
     timeStamp.setFileName( pro->makeAbsolute( filename ) );
     if ( ed )
-	ed->setCaption( i18n( "Edit %1" ).arg( filename ) );
+	ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) );
     setModified( TRUE );
     if ( pro->isDummy() ) {
-	TQObject *o = ed->parent();
+	TQObject *o = ed->tqparent();
 	while ( o && !o->isA( "MainWindow" ) )
-	    o = o->parent();
+	    o = o->tqparent();
 	if ( o )
 	    ((MainWindow *)o)->addRecentlyOpenedFile( fn );
     }
@@ -187,10 +187,10 @@ TQString SourceFile::createUnnamedFileName( const TQString &extension )
 	extensionCounter = new TQMap<TQString, int>;
     int count = -1;
     TQMap<TQString, int>::Iterator it;
-    if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) {
+    if ( ( it = extensionCounter->tqfind( extension ) ) != extensionCounter->end() ) {
 	count = *it;
 	++count;
-	extensionCounter->replace( extension, count );
+	extensionCounter->tqreplace( extension, count );
     } else {
 	count = 1;
 	extensionCounter->insert( extension, count );
@@ -220,7 +220,7 @@ bool SourceFile::closeEvent()
 	ed->save();
 
     switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ),
-				   i18n( "Save changes to '%1'?" ).arg( filename ),
+				   i18n( "Save changes to '%1'?" ).tqarg( filename ),
 				   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
     case 0: // save
 	if ( !save() )
@@ -263,9 +263,9 @@ void SourceFile::checkTimeStamp()
     if ( timeStamp.isUpToDate() )
 	return;
     timeStamp.update();
-    if ( TQMessageBox::information( MainWindow::self, i18n( "Qt Designer" ),
-				   i18n( "File '%1' has been changed outside Qt Designer.\n"
-				       "Do you want to reload it?" ).arg( filename ),
+    if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
+				   i18n( "File '%1' has been changed outside TQt Designer.\n"
+				       "Do you want to reload it?" ).tqarg( filename ),
 				   i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
 	load();
 	if ( ed )
@@ -279,7 +279,7 @@ bool SourceFile::checkFileName( bool allowBreak )
     if ( sf )
 	TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
 			      i18n( "The project already contains a source file with \n"
-				  "filename '%1'. Please choose a new filename." ).arg( filename ) );
+				  "filename '%1'. Please choose a new filename." ).tqarg( filename ) );
     while ( sf ) {
 	LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
 	TQString filter;
diff --git a/kdevdesigner/designer/sourcefile.h b/kdevdesigner/designer/sourcefile.h
index 79083c83..139bbf22 100644
--- a/kdevdesigner/designer/sourcefile.h
+++ b/kdevdesigner/designer/sourcefile.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,9 +34,10 @@ struct DesignerSourceFile;
 class SourceEditor;
 class Project;
 
-class SourceFile : public QObject
+class SourceFile : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SourceFile( const TQString &fn, bool temp, Project *p );
diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui
index 1301a20a..150989d0 100644
--- a/kdevdesigner/designer/startdialog.ui
+++ b/kdevdesigner/designer/startdialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>StartDialogBase</cstring>
     </property>
@@ -61,11 +61,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget8</cstring>
                 </property>
@@ -82,7 +82,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QIconView" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>templateView</cstring>
                         </property>
@@ -98,7 +98,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -117,7 +117,7 @@
                     </property>
                 </hbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget9</cstring>
                 </property>
@@ -134,7 +134,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QIconView" row="0" column="0">
+                    <widget class="TQIconView" row="0" column="0">
                         <property name="name">
                             <cstring>recentView</cstring>
                         </property>
@@ -151,7 +151,7 @@
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>fileInfoLabel</cstring>
                         </property>
@@ -170,7 +170,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>checkShowInFuture</cstring>
             </property>
@@ -178,7 +178,7 @@
                 <string>&amp;Do not show this dialog in the future</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -192,7 +192,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -216,14 +216,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -240,7 +240,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -273,27 +273,27 @@
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>doubleClicked(QIconViewItem*)</signal>
+        <signal>doubleClicked(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>returnPressed(QIconViewItem*)</signal>
+        <signal>returnPressed(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>doubleClicked(QIconViewItem*)</signal>
+        <signal>doubleClicked(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>onItem(QIconViewItem*)</signal>
+        <signal>onItem(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
-        <slot>recentItemChanged(QIconViewItem*)</slot>
+        <slot>recentItemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
@@ -303,22 +303,22 @@
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>returnPressed(QIconViewItem*)</signal>
+        <signal>returnPressed(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>selectionChanged(QIconViewItem*)</signal>
+        <signal>selectionChanged(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
-        <slot>recentItemChanged(QIconViewItem*)</slot>
+        <slot>recentItemChanged(TQIconViewItem*)</slot>
     </connection>
 </connections>
-<slots>
-    <slot>recentItemChanged( QIconViewItem * )</slot>
+<Q_SLOTS>
+    <slot>recentItemChanged( TQIconViewItem * )</slot>
     <slot>clearFileInfo()</slot>
     <slot>accept()</slot>
     <slot>reject()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index e5bf7752..a85310be 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -26,8 +26,8 @@
 
 #include <klocale.h>
 
-FileDialog::FileDialog( const TQString &dir, TQWidget *parent )
-    : TQFileDialog( dir, TQString::null, parent )
+FileDialog::FileDialog( const TQString &dir, TQWidget *tqparent )
+    : TQFileDialog( dir, TQString(), tqparent )
 {
 }
 
@@ -37,8 +37,8 @@ void FileDialog::accept()
 }
 
 
-StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath )
-    : StartDialogBase( parent, 0 )
+StartDialog::StartDialog( TQWidget *tqparent, const TQString &templatePath )
+    : StartDialogBase( tqparent, 0 )
 {
     newForm = new NewForm( templateView, templatePath );
     recentFiles.clear();
@@ -108,7 +108,7 @@ void StartDialog::recentItemChanged( TQIconViewItem *item )
     }
     TQDateTime dt( f.lastModified() );
     TQString date( dt.toString( "MMMM dd hh:mm" ));
-    msg = TQString( "%1 (%2 %3)  %4" ).arg(msg).arg(s).arg(unit).arg(date);
+    msg = TQString( "%1 (%2 %3)  %4" ).tqarg(msg).tqarg(s).tqarg(unit).tqarg(date);
     fileInfoLabel->setText( msg );
 }
 
@@ -163,12 +163,12 @@ void StartDialog::initFileOpen()
     fd->setSizeGripEnabled ( FALSE );
     tabLayout->addWidget( fd );
 
-    QPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(),
+    TQPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(),
 						   MainWindow::self->pluginDirectory() );
     TQStringList filterlist;
     filterlist << i18n( "Designer Files (*.ui *.pro)" );
-    filterlist << i18n( "Qt User-Interface Files (*.ui)" );
-    filterlist << i18n( "QMAKE Project Files (*.pro)" );
+    filterlist << i18n( "TQt User-Interface Files (*.ui)" );
+    filterlist << i18n( "TQMAKE Project Files (*.pro)" );
 
     TQStringList list = manager.featureList();
     for ( TQStringList::Iterator it2 = list.begin(); it2 != list.end(); ++it2 )
diff --git a/kdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h
index e17592b3..2b5c1866 100644
--- a/kdevdesigner/designer/startdialogimpl.h
+++ b/kdevdesigner/designer/startdialogimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,12 +37,13 @@
 #include "newformimpl.h"
 #include "startdialog.h"
 
-class FileDialog : public QFileDialog
+class FileDialog : public TQFileDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FileDialog( const TQString &dir, TQWidget *parent );
+    FileDialog( const TQString &dir, TQWidget *tqparent );
 
 protected slots:
     void accept();
@@ -55,9 +56,10 @@ signals:
 class StartDialog : public StartDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    StartDialog( TQWidget *parent, const TQString &templatePath );
+    StartDialog( TQWidget *tqparent, const TQString &templatePath );
     void setRecentlyFiles( TQStringList& );
     void setRecentlyProjects( TQStringList& );
     bool showDialogInFuture() const { return showInFuture; }
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index 45c425b4..a217fbe0 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,10 +38,10 @@
 #include <tqdragobject.h>
 #include <tqstyle.h>
 
-StyledButton::StyledButton(TQWidget* parent, const char* name)
-    : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
+StyledButton::StyledButton(TQWidget* tqparent, const char* name)
+    : TQButton( tqparent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
 {
-    setMinimumSize( minimumSizeHint() );
+    setMinimumSize( tqminimumSizeHint() );
     setAcceptDrops( TRUE );
 
     connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -49,12 +49,12 @@ StyledButton::StyledButton(TQWidget* parent, const char* name)
     setEditor( ColorEditor );
 }
 
-StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f )
-    : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 )
+StyledButton::StyledButton( const TQBrush& b, TQWidget* tqparent, const char* name, WFlags f )
+    : TQButton( tqparent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 )
 {
     col = b.color();
     pix = b.pixmap();
-    setMinimumSize( minimumSizeHint() );
+    setMinimumSize( tqminimumSizeHint() );
 }
 
 StyledButton::~StyledButton()
@@ -117,12 +117,12 @@ void StyledButton::setScale( bool on )
     scalePixmap();
 }
 
-TQSize StyledButton::sizeHint() const
+TQSize StyledButton::tqsizeHint() const
 {
     return TQSize( 50, 25 );
 }
 
-TQSize StyledButton::minimumSizeHint() const
+TQSize StyledButton::tqminimumSizeHint() const
 {
     return TQSize( 50, 25 );
 }
@@ -151,25 +151,25 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
 
 void StyledButton::drawButton( TQPainter *paint )
 {
-    style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
+    tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
 			  isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
     drawButtonLabel(paint);
 
     if (hasFocus())
-	style().drawPrimitive(TQStyle::PE_FocusRect, paint,
-			      style().subRect(TQStyle::SR_PushButtonFocusRect, this),
-			      colorGroup(), TQStyle::Style_Default);
+	tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
+			      tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
+			      tqcolorGroup(), TQStyle::Style_Default);
 }
 
 void StyledButton::drawButtonLabel( TQPainter *paint )
 {
     TQColor pen = isEnabled() ?
-		 hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
-		 : palette().disabled().buttonText();
+		 hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText()
+		 : tqpalette().disabled().buttonText();
     paint->setPen( pen );
 
     if(!isEnabled()) {
-	paint->setBrush( TQBrush( colorGroup().button() ) );
+	paint->setBrush( TQBrush( tqcolorGroup().button() ) );
     }
     else if ( edit == PixmapEditor && spix ) {
 	paint->setBrush( TQBrush( col, *spix ) );
@@ -184,7 +184,7 @@ void StyledButton::onEditor()
 {
     switch (edit) {
     case ColorEditor: {
-	TQColor c = QColorDialog::getColor( palette().active().background(), this );
+	TQColor c = TQColorDialog::getColor( tqpalette().active().background(), this );
 	if ( c.isValid() ) {
 	    setColor( c );
 	    emit changed();
@@ -216,7 +216,7 @@ void StyledButton::mousePressEvent(TQMouseEvent* e)
 void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 {
     TQButton::mouseMoveEvent( e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mousePressed )
 	return;
     if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -243,7 +243,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 {
     setFocus();
@@ -258,7 +258,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 void StyledButton::dragLeaveEvent( TQDragLeaveEvent * )
 {
     if ( hasFocus() )
-	parentWidget()->setFocus();
+	tqparentWidget()->setFocus();
 }
 
 void StyledButton::dragMoveEvent( TQDragMoveEvent *e )
@@ -292,4 +292,4 @@ void StyledButton::dropEvent( TQDropEvent *e )
 	e->ignore();
     }
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h
index ffed5917..90f35dfe 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/kdevdesigner/designer/styledbutton.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,22 +34,23 @@ class TQColor;
 class TQBrush;
 class FormWindow;
 
-class StyledButton : public QButton
+class StyledButton : public TQButton
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
-    Q_PROPERTY( EditorType editor READ editor WRITE setEditor )
-    Q_PROPERTY( bool scale READ scale WRITE setScale )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( EditorType editor READ editor WRITE setEditor )
+    TQ_PROPERTY( bool scale READ scale WRITE setScale )
 
     Q_ENUMS( EditorType )
 
 public:
     enum EditorType { ColorEditor, PixmapEditor };
 
-    StyledButton( TQWidget* parent = 0, const char* name = 0 );
-    StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    StyledButton( TQWidget* tqparent = 0, const char* name = 0 );
+    StyledButton( const TQBrush& b, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
     ~StyledButton();
 
     void setEditor( EditorType );
@@ -64,8 +65,8 @@ public:
     void setScale( bool );
     bool scale() const;
 
-    TQSize sizeHint() const;
-    TQSize minimumSizeHint() const;
+    TQSize tqsizeHint() const;
+    TQSize tqminimumSizeHint() const;
 
     void setFormWindow( FormWindow *fw ) { formWindow = fw; }
 
@@ -78,12 +79,12 @@ signals:
 protected:
     void mousePressEvent(TQMouseEvent*);
     void mouseMoveEvent(TQMouseEvent*);
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent ( TQDragEnterEvent * );
     void dragMoveEvent ( TQDragMoveEvent * );
     void dragLeaveEvent ( TQDragLeaveEvent * );
     void dropEvent ( TQDropEvent * );
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
     void drawButton( TQPainter* );
     void drawButtonLabel( TQPainter* );
     void resizeEvent( TQResizeEvent* );
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp
index 76443305..baa6a9f5 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.cpp
+++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp
@@ -2,15 +2,15 @@
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -18,7 +18,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,27 +32,27 @@
 
 
 SyntaxHighlighter_HTML::SyntaxHighlighter_HTML()
-    : QTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 )
+    : TQTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 )
 {
-    TQFont f( qApp->font() );
+    TQFont f( tqApp->font() );
 
-    addFormat(Standard, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Text)));
-    addFormat(Keyword, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Dark)));
-    addFormat(Attribute, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Link)));
-    addFormat(AttribValue, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited)));
+    addFormat(Standard, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Text)));
+    addFormat(Keyword, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Dark)));
+    addFormat(Attribute, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Link)));
+    addFormat(AttribValue, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited)));
 }
 
 SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML()
 {
 }
 
-void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string, int, bool invalidate )
+void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate )
 {
 
-    QTextFormat *formatStandard = format( Standard );
-    QTextFormat *formatKeyword = format( Keyword );
-    QTextFormat *formatAttribute = format( Attribute );
-    QTextFormat *formatAttribValue = format( AttribValue );
+    TQTextFormat *formatStandard = format( Standard );
+    TQTextFormat *formatKeyword = format( Keyword );
+    TQTextFormat *formatAttribute = format( Attribute );
+    TQTextFormat *formatAttribValue = format( AttribValue );
 
     const int StateStandard  = 0;
     const int StateTag       = 1;
@@ -131,9 +131,9 @@ void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string
     string->setEndState( state );
     string->setFirstPreProcess( FALSE );
 
-    if ( invalidate && string->next() &&
+    if ( tqinvalidate && string->next() &&
 	 !string->next()->firstPreProcess() && string->next()->endState() != -1 ) {
-	QTextParagraph *p = string->next();
+	TQTextParagraph *p = string->next();
 	while ( p ) {
 	    if ( p->endState() == -1 )
 		return;
@@ -143,18 +143,18 @@ void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string
     }
 }
 
-QTextFormat *SyntaxHighlighter_HTML::format( int id )
+TQTextFormat *SyntaxHighlighter_HTML::format( int id )
 {
     if ( lastFormatId == id  && lastFormat )
 	return lastFormat;
 
-    QTextFormat *f = formats[ id ];
+    TQTextFormat *f = formats[ id ];
     lastFormat = f ? f : formats[ 0 ];
     lastFormatId = id;
     return lastFormat;
 }
 
-void SyntaxHighlighter_HTML::addFormat( int id, QTextFormat *f )
+void SyntaxHighlighter_HTML::addFormat( int id, TQTextFormat *f )
 {
     formats.insert( id, f );
 }
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h
index 4a842ff5..607359f0 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.h
+++ b/kdevdesigner/designer/syntaxhighlighter_html.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 #ifndef SYNTAXHIGHLIGHTER_HTML_H
 #define SYNTAXHIGHLIGHTER_HTML_H
 
-#include <./private/qrichtext_p.h>
+#include <./private/tqrichtext_p.h>
 
-class SyntaxHighlighter_HTML : public QTextPreProcessor
+class SyntaxHighlighter_HTML : public TQTextPreProcessor
 {
 public:
 
@@ -42,15 +42,15 @@ public:
 
     SyntaxHighlighter_HTML();
     virtual ~SyntaxHighlighter_HTML();
-    void process( QTextDocument *doc, QTextParagraph *string, int start, bool invalidate = TRUE );
-    QTextFormat *format( int id );
+    void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE );
+    TQTextFormat *format( int id );
 
 private:
-    void addFormat( int id, QTextFormat *f );
+    void addFormat( int id, TQTextFormat *f );
 
-    QTextFormat *lastFormat;
+    TQTextFormat *lastFormat;
     int lastFormatId;
-    TQIntDict<QTextFormat> formats;
+    TQIntDict<TQTextFormat> formats;
 
 };
 
diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui
index a6f10312..96a3df6e 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/kdevdesigner/designer/tableeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TableEditorBase</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTable" row="0" column="0">
+        <widget class="TQTable" row="0" column="0">
             <property name="name">
                 <cstring>table</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout11</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -102,14 +102,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -140,7 +140,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -156,11 +156,11 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="1">
+        <widget class="TQTabWidget" row="0" column="1">
             <property name="name">
                 <cstring>TabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>columns_tab</cstring>
                 </property>
@@ -187,14 +187,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QListBox" row="0" column="0" rowspan="6" colspan="1">
+                    <widget class="TQListBox" row="0" column="0" rowspan="6" colspan="1">
                         <property name="name">
                             <cstring>listColumns</cstring>
                         </property>
@@ -209,14 +209,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>buttonColumnUp</cstring>
                         </property>
@@ -233,7 +233,7 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column of the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>buttonColumnDown</cstring>
                         </property>
@@ -250,7 +250,7 @@
                             <string>&lt;b&gt;Move the selected item down.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column of the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>buttonDeleteColumn</cstring>
                         </property>
@@ -258,7 +258,7 @@
                             <string>&amp;Delete Column</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>buttonNewColumn</cstring>
                         </property>
@@ -266,7 +266,7 @@
                             <string>&amp;New Column</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout6</cstring>
                         </property>
@@ -280,7 +280,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>labelTable</cstring>
                                 </property>
@@ -288,7 +288,7 @@
                                     <string>Table:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="3" column="1">
+                            <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
                                     <cstring>Layout2</cstring>
                                 </property>
@@ -302,7 +302,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>labelColumnPixmap</cstring>
                                         </property>
@@ -310,11 +310,11 @@
                                             <string>Label4</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonDeleteColPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -333,11 +333,11 @@
                                             <string>&lt;b&gt;Delete the selected item's pixmap.&lt;/b&gt;&lt;p&gt;The pixmap in the current column of the selected item will be deleted.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonChooseColPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -355,7 +355,7 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -366,7 +366,7 @@
                                     <cstring>editColumnText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>Label2</cstring>
                                 </property>
@@ -377,7 +377,7 @@
                                     <cstring>itemChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>labelFields</cstring>
                                 </property>
@@ -393,7 +393,7 @@
                                     <cstring>editColumnText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="1" column="1">
+                            <widget class="TQComboBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>comboFields</cstring>
                                 </property>
@@ -401,7 +401,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="1">
+                            <widget class="TQLabel" row="0" column="1">
                                 <property name="name">
                                     <cstring>labelTableValue</cstring>
                                 </property>
@@ -413,7 +413,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>rows_tab</cstring>
                 </property>
@@ -440,14 +440,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>buttonRowUp</cstring>
                         </property>
@@ -464,12 +464,12 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column of the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="0" column="0" rowspan="6" colspan="1">
+                    <widget class="TQListBox" row="0" column="0" rowspan="6" colspan="1">
                         <property name="name">
                             <cstring>listRows</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>buttonRowDown</cstring>
                         </property>
@@ -496,14 +496,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>buttonNewRow</cstring>
                         </property>
@@ -511,7 +511,7 @@
                             <string>&amp;New Row</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>buttonDeleteRow</cstring>
                         </property>
@@ -519,7 +519,7 @@
                             <string>&amp;Delete Row</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout7_2</cstring>
                         </property>
@@ -533,7 +533,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2_3</cstring>
                                 </property>
@@ -544,7 +544,7 @@
                                     <cstring>editRowText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>Label2_2</cstring>
                                 </property>
@@ -555,7 +555,7 @@
                                     <cstring>itemChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="1" column="1">
+                            <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
                                     <cstring>Layout2_2</cstring>
                                 </property>
@@ -569,7 +569,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>labelRowPixmap</cstring>
                                         </property>
@@ -577,11 +577,11 @@
                                             <string>Label4</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonDeleteRowPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -600,11 +600,11 @@
                                             <string>&lt;b&gt;Delete the selected item's pixmap.&lt;/b&gt;&lt;p&gt;The pixmap in the current column of the selected item will be deleted.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonChooseRowPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -649,21 +649,21 @@
     </connection>
     <connection>
         <sender>listColumns</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>listColumns</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>editColumnText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>columnTextChanged(const QString&amp;)</slot>
+        <slot>columnTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonNewColumn</sender>
@@ -691,21 +691,21 @@
     </connection>
     <connection>
         <sender>comboFields</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentFieldChanged(const QString&amp;)</slot>
+        <slot>currentFieldChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>listRows</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentRowChanged(QListBoxItem*)</slot>
+        <slot>currentRowChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>listRows</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentRowChanged(QListBoxItem*)</slot>
+        <slot>currentRowChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>buttonNewRow</sender>
@@ -745,9 +745,9 @@
     </connection>
     <connection>
         <sender>editRowText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>rowTextChanged(const QString&amp;)</slot>
+        <slot>rowTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonCancel</sender>
@@ -794,18 +794,18 @@
     <tabstop>buttonHelp</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qtable.h</include>
+    <include location="global" impldecl="in implementation">tqtable.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">applyClicked()</slot>
     <slot access="protected">chooseRowPixmapClicked()</slot>
-    <slot access="protected">columnTextChanged( const QString &amp; )</slot>
+    <slot access="protected">columnTextChanged( const TQString &amp; )</slot>
     <slot access="protected">columnUpClicked()</slot>
-    <slot access="protected">currentColumnChanged( QListBoxItem * )</slot>
-    <slot access="protected">currentFieldChanged( const QString &amp; )</slot>
-    <slot access="protected">currentRowChanged( QListBoxItem * )</slot>
+    <slot access="protected">currentColumnChanged( TQListBoxItem * )</slot>
+    <slot access="protected">currentFieldChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentRowChanged( TQListBoxItem * )</slot>
     <slot access="protected">deleteColPixmapClicked()</slot>
     <slot access="protected">deleteColumnClicked()</slot>
     <slot access="protected">deleteRowClicked()</slot>
@@ -815,14 +815,14 @@
     <slot access="protected">chooseColPixmapClicked()</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">rowDownClicked()</slot>
-    <slot access="protected">rowTextChanged( const QString &amp; )</slot>
+    <slot access="protected">rowTextChanged( const TQString &amp; )</slot>
     <slot access="protected">rowUpClicked()</slot>
     <slot access="protected">columnDownClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index d6ebba6c..b95f6bd2 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/kdevdesigner/designer/tableeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -25,7 +25,7 @@
 **********************************************************************/
 
 #include "tableeditorimpl.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include "formwindow.h"
@@ -46,20 +46,20 @@
 
 #include <klocale.h>
 
-TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
-    : TableEditorBase( parent, name, modal, fl ),
-#ifndef QT_NO_TABLE
+TableEditor::TableEditor( TQWidget* tqparent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
+    : TableEditorBase( tqparent, name, modal, fl ),
+#ifndef TQT_NO_TABLE
     editTable( (TQTable*)editWidget ),
 #endif
     formWindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     labelColumnPixmap->setText( "" );
     labelRowPixmap->setText( "" );
 
-#ifndef QT_NO_SQL
-    if ( !::qt_cast<TQDataTable*>(editTable) )
+#ifndef TQT_NO_SQL
+    if ( !::tqqt_cast<TQDataTable*>(editTable) )
 #endif
     {
 	labelFields->hide();
@@ -67,8 +67,8 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	labelTable->hide();
 	labelTableValue->hide();
     }
-#ifndef QT_NO_SQL
-    if ( ::qt_cast<TQDataTable*>(editTable) ) {
+#ifndef TQT_NO_SQL
+    if ( ::tqqt_cast<TQDataTable*>(editTable) ) {
 	// ## why does this behave weird?
 	//	TabWidget->removePage( rows_tab );
 	//	rows_tab->hide();
@@ -76,8 +76,8 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	TabWidget->setTabEnabled( rows_tab, FALSE );
     }
 
-    if ( formWindow->project() && ::qt_cast<TQDataTable*>(editTable) ) {
-	TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList();
+    if ( formWindow->project() && ::tqqt_cast<TQDataTable*>(editTable) ) {
+	TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(editTable), "database" ).toStringList();
 	if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) {
 	    TQStringList fields;
 	    fields << "<no field>";
@@ -121,7 +121,7 @@ void TableEditor::columnTextChanged( const TQString &s )
     listColumns->blockSignals( TRUE );
     listColumns->changeItem( s, listColumns->currentItem() );
     listColumns->blockSignals( FALSE );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( table->horizontalHeader()->iconSet( listColumns->currentItem() ) )
 	table->horizontalHeader()->setLabel( listColumns->currentItem(),
 					     *table->horizontalHeader()->iconSet( listColumns->currentItem() ), s );
@@ -158,13 +158,13 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i )
 	labelColumnPixmap->setText( "" );
     editColumnText->blockSignals( FALSE );
 
-#ifndef QT_NO_SQL
-    if ( ::qt_cast<TQDataTable*>(editTable) ) {
-	TQString s = *fieldMap.find( listColumns->index( i ) );
+#ifndef TQT_NO_SQL
+    if ( ::tqqt_cast<TQDataTable*>(editTable) ) {
+	TQString s = *fieldMap.tqfind( listColumns->index( i ) );
 	if ( s.isEmpty() )
 	    comboFields->setCurrentItem( 0 );
-	else if ( comboFields->listBox()->findItem( s ) )
-	    comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) );
+	else if ( comboFields->listBox()->tqfindItem( s ) )
+	    comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) );
 	else
 	    comboFields->lineEdit()->setText( s );
     }
@@ -201,7 +201,7 @@ void TableEditor::deleteColumnClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() - 1 );
     delete listColumns->item( listColumns->currentItem() );
     readColumns();
@@ -216,7 +216,7 @@ void TableEditor::deleteRowClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() - 1 );
     delete listRows->item( listRows->currentItem() );
     readRows();
@@ -229,22 +229,22 @@ void TableEditor::deleteRowClicked()
 
 void TableEditor::newColumnClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numCols() - 1; ++i )
 	m.insert( table->horizontalHeader()->label( i ), TRUE );
     int n = table->numCols() - 1;
     TQString t = TQString::number( n );
-    while ( m.find( t ) != m.end() )
+    while ( m.tqfind( t ) != m.end() )
 	t = TQString::number( ++n );
     table->horizontalHeader()->setLabel( table->numCols() - 1, t );
     listColumns->insertItem( t );
     TQListBoxItem *item = listColumns->item( listColumns->count() - 1 );
     listColumns->setCurrentItem( item );
     listColumns->setSelected( item, TRUE );
-#ifndef QT_NO_SQL
-    if ( ::qt_cast<TQDataTable*>(editTable) ) {
+#ifndef TQT_NO_SQL
+    if ( ::tqqt_cast<TQDataTable*>(editTable) ) {
 	comboFields->setFocus();
     } else
 #endif
@@ -257,14 +257,14 @@ void TableEditor::newColumnClicked()
 
 void TableEditor::newRowClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numRows() - 1; ++i )
 	m.insert( table->verticalHeader()->label( i ), TRUE );
     int n = table->numRows() - 1;
     TQString t = TQString::number( n );
-    while ( m.find( t ) != m.end() )
+    while ( m.tqfind( t ) != m.end() )
 	t = TQString::number( ++n );
     table->verticalHeader()->setLabel( table->numRows() - 1, t );
     listRows->insertItem( t );
@@ -298,7 +298,7 @@ void TableEditor::rowTextChanged( const TQString &s )
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     listRows->changeItem( s, listRows->currentItem() );
     if ( table->verticalHeader()->iconSet( listRows->currentItem() ) )
 	table->verticalHeader()->setLabel( listRows->currentItem(),
@@ -327,13 +327,13 @@ void TableEditor::applyClicked()
     TQValueList<PopulateTableCommand::Column> cols;
 
     int i = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
 	if ( table->horizontalHeader()->iconSet( i ) )
 	    col.pix = table->horizontalHeader()->iconSet( i )->pixmap();
-	col.field = *fieldMap.find( i );
+	col.field = *fieldMap.tqfind( i );
 	cols.append( col );
     }
     for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
@@ -343,7 +343,7 @@ void TableEditor::applyClicked()
 	    row.pix = table->verticalHeader()->iconSet( i )->pixmap();
 	rows.append( row );
     }
-    PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).arg( editTable->name() ),
+    PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).tqarg( editTable->name() ),
 							  formWindow, editTable, rows, cols );
     cmd->execute();
     formWindow->commandHistory()->addCommand( cmd );
@@ -363,7 +363,7 @@ void TableEditor::chooseRowPixmapClicked()
     if ( pix.isNull() )
 	return;
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), pix, table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( pix, listRows->currentText(), listRows->currentItem() );
 #endif
@@ -373,7 +373,7 @@ void TableEditor::deleteRowPixmapClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), TQPixmap(), table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( listRows->currentText(), listRows->currentItem() );
 #endif
@@ -391,7 +391,7 @@ void TableEditor::chooseColPixmapClicked()
 
     if ( pix.isNull() )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), pix, table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( pix, listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -401,7 +401,7 @@ void TableEditor::deleteColPixmapClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), TQPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -409,10 +409,10 @@ void TableEditor::deleteColPixmapClicked()
 
 void TableEditor::readFromTable()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQHeader *cols = editTable->horizontalHeader();
     table->setNumCols( cols->count() );
-    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable );
+    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) );
     for ( int i = 0; i < cols->count(); ++i ) {
 	if ( editTable->horizontalHeader()->iconSet( i ) ) {
 	    table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ),
@@ -423,7 +423,7 @@ void TableEditor::readFromTable()
 	    table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) );
 	    listColumns->insertItem( editTable->horizontalHeader()->label( i ) );
 	}
-	TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) );
+	TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) );
 	fieldMap.insert( i, cf );
     }
 
@@ -456,7 +456,7 @@ void TableEditor::readFromTable()
 void TableEditor::readColumns()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->horizontalHeader()->setLabel( j, *i->pixmap(), i->text() );
@@ -469,7 +469,7 @@ void TableEditor::readColumns()
 void TableEditor::readRows()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->verticalHeader()->setLabel( j, *i->pixmap(), i->text() );
diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h
index c3d9990a..b437f4ce 100644
--- a/kdevdesigner/designer/tableeditorimpl.h
+++ b/kdevdesigner/designer/tableeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,9 +37,10 @@ class FormWindow;
 class TableEditor : public TableEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
+    TableEditor( TQWidget* tqparent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
 		 const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~TableEditor();
 
diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp
index 703b4e58..eb80c1cd 100644
--- a/kdevdesigner/designer/timestamp.cpp
+++ b/kdevdesigner/designer/timestamp.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,8 +30,8 @@
 
 class TQTimer;
 
-TimeStamp::TimeStamp( TQObject *parent, const TQString &f )
-    : TQObject( parent ), filename( f ), autoCheck( FALSE )
+TimeStamp::TimeStamp( TQObject *tqparent, const TQString &f )
+    : TQObject( tqparent ), filename( f ), autoCheck( FALSE )
 {
     timer = new TQTimer( this );
     connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) );
diff --git a/kdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h
index 849a76f8..2c41b62a 100644
--- a/kdevdesigner/designer/timestamp.h
+++ b/kdevdesigner/designer/timestamp.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,12 +31,13 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
-class TimeStamp : public QObject
+class TimeStamp : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TimeStamp( TQObject *parent, const TQString &f );
+    TimeStamp( TQObject *tqparent, const TQString &f );
 
     void setFileName( const TQString &f );
     TQString fileName() const;
diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui
index a38954af..ec75c8d5 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/kdevdesigner/designer/variabledialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>VariableDialogBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
             <column>
                 <property name="text">
                     <string>Variable</string>
@@ -89,7 +89,7 @@
                 <enum>LastColumn</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="3">
+        <widget class="TQPushButton" row="1" column="3">
             <property name="name">
                 <cstring>deleteButton</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>&amp;Delete</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>propBox</cstring>
             </property>
@@ -114,7 +114,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <cstring>accessCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <cstring>varName</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>public</string>
@@ -163,7 +163,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>addButton</cstring>
             </property>
@@ -181,14 +181,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="3">
+        <widget class="TQPushButton" row="3" column="3">
             <property name="name">
                 <cstring>cancelButton</cstring>
             </property>
@@ -196,7 +196,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>okButton</cstring>
             </property>
@@ -214,7 +214,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
@@ -262,15 +262,15 @@
     </connection>
     <connection>
         <sender>varView</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>VariableDialogBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>varView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>VariableDialogBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -282,13 +282,13 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>addVariable()</slot>
     <slot>deleteVariable()</slot>
     <slot>accessChanged()</slot>
     <slot>nameChanged()</slot>
     <slot>okClicked()</slot>
-    <slot>currentItemChanged( QListViewItem * i )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>currentItemChanged( TQListViewItem * i )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp
index 19af5e6c..bd0ef745 100644
--- a/kdevdesigner/designer/variabledialogimpl.cpp
+++ b/kdevdesigner/designer/variabledialogimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,11 +40,11 @@
 #include <klocale.h>
 
 
-VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent )
-    : VariableDialogBase( parent ), formWindow( fw )
+VariableDialog::VariableDialog( FormWindow *fw, TQWidget *tqparent )
+    : VariableDialogBase( tqparent ), formWindow( fw )
 {
     varView->setSorting( -1 );
-    TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formWindow );
+    TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Variable>::Iterator it = varLst.begin();
     for ( ; it != varLst.end(); ++it ) {
 	TQListViewItem *i = new TQListViewItem( varView );
@@ -64,7 +64,7 @@ VariableDialog::~VariableDialog()
 
 void VariableDialog::setCurrentItem( TQString text )
 {
-    TQListViewItem *i = varView->findItem( text, 0 );
+    TQListViewItem *i = varView->tqfindItem( text, 0 );
     if ( i )
 	varView->setCurrentItem( i );
 }
diff --git a/kdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h
index 5b2775e1..88cb439e 100644
--- a/kdevdesigner/designer/variabledialogimpl.h
+++ b/kdevdesigner/designer/variabledialogimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,8 +35,9 @@ class TQListView;
 class VariableDialog : public VariableDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    VariableDialog( FormWindow *fw, TQWidget* parent = 0 );
+    VariableDialog( FormWindow *fw, TQWidget* tqparent = 0 );
     ~VariableDialog();
 
     void setCurrentItem( TQString text );
diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp
index 7568a98c..9547b049 100644
--- a/kdevdesigner/designer/widgetaction.cpp
+++ b/kdevdesigner/designer/widgetaction.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,7 +35,7 @@ static TQStyle *windowsStyle = 0;
 
 void WidgetAction::addedTo( TQWidget *w, TQWidget *container )
 {
-    if ( ::qt_cast<TQToolButton*>(w) && ::qt_cast<TQScrollView*>(container->parent()->parent()) ) {
+    if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->tqparent()->tqparent()) ) {
 	if ( !windowsStyle )
 	    windowsStyle = TQStyleFactory::create( "windows" );
 	w->setStyle( windowsStyle );
diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h
index fa3971c3..78c0270e 100644
--- a/kdevdesigner/designer/widgetaction.h
+++ b/kdevdesigner/designer/widgetaction.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,25 +29,26 @@
 
 #include <tqaction.h>
 
-class WidgetAction : public QAction
+class WidgetAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    WidgetAction( const TQString &grp, TQObject* parent,
+    WidgetAction( const TQString &grp, TQObject* tqparent,
 		  const char* name = 0, bool toggle = FALSE  )
-	: TQAction( parent, name, toggle ) { init( grp ); }
+	: TQAction( tqparent, name, toggle ) { init( grp ); }
     WidgetAction( const TQString &grp, const TQString& text,
 		  const TQIconSet& icon, const TQString& menuText, TQKeySequence accel,
-		  TQObject* parent, const char* name = 0, bool toggle = FALSE )
-	: TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); }
+		  TQObject* tqparent, const char* name = 0, bool toggle = FALSE )
+	: TQAction( text, icon, menuText, accel, tqparent, name, toggle ) { init( grp ); }
     WidgetAction( const TQString &grp, const TQString& text,
-		  const TQString& menuText, TQKeySequence accel, TQObject* parent,
+		  const TQString& menuText, TQKeySequence accel, TQObject* tqparent,
 		  const char* name = 0, bool toggle = FALSE )
-	: TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); }
+	: TQAction( text, menuText, accel, tqparent, name, toggle ) { init( grp ); }
     ~WidgetAction();
 
-#if !defined(Q_NO_USING_KEYWORD)
+#if !defined(TQ_NO_USING_KEYWORD)
     using TQAction::addedTo;
 #endif
     void addedTo( TQWidget *, TQWidget * );
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index a38e75af..43081cdd 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,14 +31,14 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 #include "propertyeditor.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "listboxeditorimpl.h"
 #include "listvieweditorimpl.h"
 #include "iconvieweditorimpl.h"
 #include "formwindow.h"
 #include "multilineeditorimpl.h"
 #include "../interfaces/widgetinterface.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include "tableeditorimpl.h"
 #endif
 #include "project.h"
@@ -54,10 +54,10 @@
 #include <tqpixmap.h>
 #include <tqgroupbox.h>
 #include <tqiconview.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqdatatable.h>
 #endif
 #include <tqdatetimeedit.h>
@@ -92,7 +92,7 @@
 #include <tqsplitter.h>
 #include <tqtoolbox.h>
 #include <tqsizegrip.h>
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 
@@ -107,15 +107,15 @@ FormWindow *find_formwindow( TQWidget *w )
     if ( !w )
 	return 0;
     for (;;) {
-	if ( ::qt_cast<FormWindow*>(w) )
+	if ( ::tqqt_cast<FormWindow*>(w) )
 	    return (FormWindow*)w;
-	if ( !w->parentWidget() )
+	if ( !w->tqparentWidget() )
 	    return 0;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 }
 
-void QLayoutWidget::paintEvent( TQPaintEvent* )
+void TQLayoutWidget::paintEvent( TQPaintEvent* )
 {
     TQPainter p ( this );
     p.setPen( red );
@@ -123,54 +123,54 @@ void QLayoutWidget::paintEvent( TQPaintEvent* )
 }
 
 
-QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name )
-    : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
+TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *tqparent, const char *name )
+    : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
 {
     tabBar()->setAcceptDrops( TRUE );
     tabBar()->installEventFilter( this );
 }
 
-int QDesignerTabWidget::currentPage() const
+int TQDesignerTabWidget::currentPage() const
 {
     return tabBar()->currentTab();
 }
 
-void QDesignerTabWidget::setCurrentPage( int i )
+void TQDesignerTabWidget::setCurrentPage( int i )
 {
     tabBar()->setCurrentTab( i );
 }
 
-TQString QDesignerTabWidget::pageTitle() const
+TQString TQDesignerTabWidget::pageTitle() const
 {
     return ((TQTabWidget*)this)->tabLabel( TQTabWidget::currentPage() );
 }
 
-void QDesignerTabWidget::setPageTitle( const TQString& title )
+void TQDesignerTabWidget::setPageTitle( const TQString& title )
 {
     changeTab( TQTabWidget::currentPage(), title );
 }
 
-void QDesignerTabWidget::setPageName( const TQCString& name )
+void TQDesignerTabWidget::setPageName( const TQCString& name )
 {
     if ( TQTabWidget::currentPage() )
 	TQTabWidget::currentPage()->setName( name );
 }
 
-TQCString QDesignerTabWidget::pageName() const
+TQCString TQDesignerTabWidget::pageName() const
 {
     if ( !TQTabWidget::currentPage() )
 	return 0;
     return TQTabWidget::currentPage()->name();
 }
 
-int QDesignerTabWidget::count() const
+int TQDesignerTabWidget::count() const
 {
     return tabBar()->count();
 }
 
-bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
+bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( o != tabBar() ) return FALSE;
+    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return FALSE;
 
     switch ( e->type() ) {
     case TQEvent::MouseButtonPress: {
@@ -218,7 +218,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 	int index = 0;
 	TQRect rect;
 	for ( ; index < tabBar()->count(); index++ ) {
-	    if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) {
+	    if ( tabBar()->tabAt( index )->rect().tqcontains( de->pos() ) ) {
 		rect = tabBar()->tabAt( index )->rect();
 		break;
 	    }
@@ -227,7 +227,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 	if ( index == tabBar()->count() -1 ) {
 	    TQRect rect2 = rect;
 	    rect2.setLeft( rect2.left() + rect2.width() / 2 );
-	    if ( rect2.contains( de->pos() ) )
+	    if ( rect2.tqcontains( de->pos() ) )
 		index++;
 	}
 
@@ -255,20 +255,20 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 
 		int newIndex = 0;
 		for ( ; newIndex < tabBar()->count(); newIndex++ ) {
-		    if ( tabBar()->tabAt( newIndex )->rect().contains( de->pos() ) )
+		    if ( tabBar()->tabAt( newIndex )->rect().tqcontains( de->pos() ) )
 			break;
 		}
 
 		if ( newIndex == tabBar()->count() -1 ) {
 		    TQRect rect2 = tabBar()->tabAt( newIndex )->rect();
 		    rect2.setLeft( rect2.left() + rect2.width() / 2 );
-		    if ( rect2.contains( de->pos() ) )
+		    if ( rect2.tqcontains( de->pos() ) )
 			newIndex++;
 		}
 
 		int oldIndex = 0;
 		for ( ; oldIndex < tabBar()->count(); oldIndex++ ) {
-		    if ( tabBar()->tabAt( oldIndex )->rect().contains( pressPoint ) )
+		    if ( tabBar()->tabAt( oldIndex )->rect().tqcontains( pressPoint ) )
 			break;
 		}
 
@@ -290,23 +290,23 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 }
 
 
-QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name )
-    : TQWidgetStack( parent, name )
+TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *name )
+    : TQWidgetStack( tqparent, name )
 {
-    prev = new TQToolButton( Qt::LeftArrow, this, "designer_wizardstack_button" );
+    prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
     prev->setAutoRaise( TRUE );
     prev->setAutoRepeat( TRUE );
-    prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
-    next = new TQToolButton( Qt::RightArrow, this, "designer_wizardstack_button" );
+    prev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+    next = new TQToolButton( TQt::RightArrow, this, "designer_wizardstack_button" );
     next->setAutoRaise( TRUE );
     next->setAutoRepeat( TRUE );
-    next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+    next->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
     connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) );
     connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) );
     updateButtons();
 }
 
-void QDesignerWidgetStack::updateButtons()
+void TQDesignerWidgetStack::updateButtons()
 {
     prev->setGeometry( width() - 31, 1, 15, 15 );
     next->setGeometry( width() - 16, 1, 15, 15 );
@@ -316,23 +316,23 @@ void QDesignerWidgetStack::updateButtons()
     next->raise();
 }
 
-void QDesignerWidgetStack::prevPage()
+void TQDesignerWidgetStack::prevPage()
 {
     setCurrentPage( currentPage() - 1 );
 }
 
-void QDesignerWidgetStack::nextPage()
+void TQDesignerWidgetStack::nextPage()
 {
     setCurrentPage( currentPage() + 1 );
 }
 
-int QDesignerWidgetStack::currentPage() const
+int TQDesignerWidgetStack::currentPage() const
 {
-    QDesignerWidgetStack* that = (QDesignerWidgetStack*) this;
-    return that->pages.find( visibleWidget() );
+    TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this;
+    return that->pages.tqfind( visibleWidget() );
 }
 
-void QDesignerWidgetStack::setCurrentPage( int i )
+void TQDesignerWidgetStack::setCurrentPage( int i )
 {
     // help next/prev page commands
     if ( i < 0 )
@@ -346,34 +346,34 @@ void QDesignerWidgetStack::setCurrentPage( int i )
     updateButtons();
 }
 
-TQCString QDesignerWidgetStack::pageName() const
+TQCString TQDesignerWidgetStack::pageName() const
 {
     if ( !visibleWidget() )
 	return 0;
     return visibleWidget()->name();
 }
 
-void QDesignerWidgetStack::setPageName( const TQCString& name )
+void TQDesignerWidgetStack::setPageName( const TQCString& name )
 {
     if ( visibleWidget() )
 	visibleWidget()->setName( name );
 }
 
-int QDesignerWidgetStack::count() const
+int TQDesignerWidgetStack::count() const
 {
     return pages.count();
 }
 
-TQWidget* QDesignerWidgetStack::page( int i ) const
+TQWidget* TQDesignerWidgetStack::page( int i ) const
 {
     if ( i < 0 || i >= count() )
 	return 0;
-    QDesignerWidgetStack* that = (QDesignerWidgetStack*) this;
+    TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this;
     return that->pages.at( i );
 }
 
 
-int QDesignerWidgetStack::insertPage( TQWidget *p, int i )
+int TQDesignerWidgetStack::insertPage( TQWidget *p, int i )
 {
     if ( i < 0 )
 	pages.append( p );
@@ -384,12 +384,12 @@ int QDesignerWidgetStack::insertPage( TQWidget *p, int i )
     raiseWidget( p );
     TQApplication::sendPostedEvents();
     updateButtons();
-    return pages.find( p );
+    return pages.tqfind( p );
 }
 
-int QDesignerWidgetStack::removePage( TQWidget *p )
+int TQDesignerWidgetStack::removePage( TQWidget *p )
 {
-    int i = pages.find( p );
+    int i = pages.tqfind( p );
     pages.remove( p );
     removeWidget( p );
     setCurrentPage( 0 );
@@ -398,7 +398,7 @@ int QDesignerWidgetStack::removePage( TQWidget *p )
 }
 
 
-int QDesignerWizard::currentPageNum() const
+int TQDesignerWizard::currentPageNum() const
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == currentPage() )
@@ -411,7 +411,7 @@ int QDesignerWizard::currentPageNum() const
 
 
 
-void QDesignerWizard::setCurrentPage( int i )
+void TQDesignerWizard::setCurrentPage( int i )
 {
     if ( i < currentPageNum() ) {
 	while ( i < currentPageNum() ) {
@@ -429,30 +429,30 @@ void QDesignerWizard::setCurrentPage( int i )
     }
 }
 
-TQString QDesignerWizard::pageTitle() const
+TQString TQDesignerWizard::pageTitle() const
 {
     return title( currentPage() );
 }
 
-void QDesignerWizard::setPageTitle( const TQString& title )
+void TQDesignerWizard::setPageTitle( const TQString& title )
 {
     setTitle( currentPage(), title );
 }
 
-void QDesignerWizard::setPageName( const TQCString& name )
+void TQDesignerWizard::setPageName( const TQCString& name )
 {
     if ( TQWizard::currentPage() )
 	TQWizard::currentPage()->setName( name );
 }
 
-TQCString QDesignerWizard::pageName() const
+TQCString TQDesignerWizard::pageName() const
 {
     if ( !TQWizard::currentPage() )
 	return 0;
     return TQWizard::currentPage()->name();
 }
 
-int QDesignerWizard::pageNum( TQWidget *p )
+int TQDesignerWizard::pageNum( TQWidget *p )
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == p )
@@ -461,23 +461,23 @@ int QDesignerWizard::pageNum( TQWidget *p )
     return -1;
 }
 
-void QDesignerWizard::addPage( TQWidget *p, const TQString &t )
+void TQDesignerWizard::addPage( TQWidget *p, const TQString &t )
 {
     TQWizard::addPage( p, t );
-    if ( removedPages.find( p ) )
+    if ( removedPages.tqfind( p ) )
 	removedPages.remove( p );
 }
 
-void QDesignerWizard::removePage( TQWidget *p )
+void TQDesignerWizard::removePage( TQWidget *p )
 {
     TQWizard::removePage( p );
     removedPages.insert( p, p );
 }
 
-void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index )
+void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index )
 {
     TQWizard::insertPage( p, t, index );
-    if ( removedPages.find( p ) )
+    if ( removedPages.tqfind( p ) )
 	removedPages.remove( p );
 }
 
@@ -486,10 +486,10 @@ TQMap< int, TQStringList > *changedProperties = 0;
 
 /*!
   \class WidgetFactory widgetfactory.h
-  \brief Set of static functions for creating widgets, layouts and do other stuff
+  \brief Set of static functions for creating widgets, tqlayouts and do other stuff
 
   The widget factory offers functions to create widgets, create and
-  delete layouts find out other details - all based on the
+  delete tqlayouts find out other details - all based on the
   WidgetDatabase's data. So the functions that use ids use the same
   ids as in the WidgetDatabase.
 */
@@ -498,16 +498,16 @@ TQMap< int, TQStringList > *changedProperties = 0;
 void WidgetFactory::saveDefaultProperties( TQObject *w, int id )
 {
     TQMap< TQString, TQVariant> propMap;
-    TQStrList lst = w->metaObject()->propertyNames( TRUE );
+    TQStrList lst = w->tqmetaObject()->propertyNames( TRUE );
     for ( uint i = 0; i < lst.count(); ++i ) {
 	TQVariant var = w->property( lst.at( i ) );
 	if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 )
 	    var = TQVariant( TQPixmap() );
 	else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 )
 	    var = TQVariant( TQIconSet() );
-	propMap.replace( lst.at( i ), var );
+	propMap.tqreplace( lst.at( i ), var );
     }
-    defaultProperties->replace( id, propMap );
+    defaultProperties->tqreplace( id, propMap );
 }
 
 void WidgetFactory::saveChangedProperties( TQObject *w, int id )
@@ -517,12 +517,12 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id )
 }
 
 /*!  Creates a widget of the type which is registered as \a id as
-  child of \a parent. The \a name is optional. If \a init is TRUE, the
+  child of \a tqparent. The \a name is optional. If \a init is TRUE, the
   widget is initialized with some defaults, else the plain widget is
   created.
 */
 
-TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient )
+TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient )
 {
     TQString n = WidgetDatabase::className( id );
     if ( n.isEmpty() )
@@ -536,97 +536,97 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
     TQWidget *w = 0;
     TQString str = WidgetDatabase::createWidgetName( id );
     const char *s = str.latin1();
-    w = createWidget( n, parent, name ? name : s, init, r, orient );
-    if ( ::qt_cast<TQScrollView*>(w) )
+    w = createWidget( n, tqparent, name ? name : s, init, r, orient );
+    if ( ::tqqt_cast<TQScrollView*>(w) )
 	( (TQScrollView*)w )->disableSizeHintCaching();
     if ( !w && WidgetDatabase::isCustomWidget( id ) )
-	w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) );
+	w = createCustomWidget( tqparent, name ? name : s, MetaDataBase::customWidget( id ) );
     if ( !w )
 	return 0;
-    MetaDataBase::addEntry( w );
+    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 
-    if ( !defaultProperties->contains( id ) )
-	saveDefaultProperties( w, id );
-    if ( !changedProperties->contains( id ) )
-	saveChangedProperties( w, id );
+    if ( !defaultProperties->tqcontains( id ) )
+	saveDefaultProperties( TQT_TQOBJECT(w), id );
+    if ( !changedProperties->tqcontains( id ) )
+	saveChangedProperties( TQT_TQOBJECT(w), id );
 
     return w;
 }
 
-/*!  Creates a layout on the widget \a widget of the type \a type
+/*!  Creates a tqlayout on the widget \a widget of the type \a type
   which can be \c HBox, \c VBox or \c Grid.
 */
 
-TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type )
+TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, LayoutType type )
 {
     int spacing = MainWindow::self->currentLayoutDefaultSpacing();
     int margin = 0;
 
-    int metaspacing = MetaDataBase::spacing( widget );
-    int metamargin = MetaDataBase::margin( widget );
+    int metaspacing = MetaDataBase::spacing( TQT_TQOBJECT(widget) );
+    int metamargin = MetaDataBase::margin( TQT_TQOBJECT(widget) );
 
-    if ( ::qt_cast<QLayoutWidget*>(widget) &&
-	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	   widget && ::qt_cast<FormWindow*>(widget->parentWidget()) ) )
+    if ( ::tqqt_cast<TQLayoutWidget*>(widget) &&
+	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
+	   widget && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
-    if ( !layout && ::qt_cast<TQTabWidget*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) )
 	widget = ((TQTabWidget*)widget)->currentPage();
 
-    if ( !layout && ::qt_cast<TQWizard*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQWizard*>(widget) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !layout && ::qt_cast<TQMainWindow*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQMainWindow*>(widget) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
 
-    if ( !layout && ::qt_cast<TQWidgetStack*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQWidgetStack*>(widget) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    if ( !layout && ::qt_cast<TQToolBox*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQToolBox*>(widget) )
 	widget = ((TQToolBox*)widget)->currentItem();
 
-    MetaDataBase::addEntry( widget );
+    MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
 
     TQLayout *l = 0;
     int align = 0;
-    if ( !layout && ::qt_cast<TQGroupBox*>(widget) ) {
+    if ( !tqlayout && ::tqqt_cast<TQGroupBox*>(widget) ) {
 	TQGroupBox *gb = (TQGroupBox*)widget;
 	gb->setColumnLayout( 0, Qt::Vertical );
-	layout = gb->layout();
-	layout->setMargin( 0 );
-	layout->setSpacing( 0 );
+	tqlayout = gb->tqlayout();
+	tqlayout->setMargin( 0 );
+	tqlayout->setSpacing( 0 );
 	switch ( type ) {
 	case HBox:
-	    l = new TQHBoxLayout( layout );
+	    l = new TQHBoxLayout( tqlayout );
 	    break;
 	case VBox:
-	    l = new TQVBoxLayout( layout );
+	    l = new TQVBoxLayout( tqlayout );
 	    break;
 	case Grid:
-	    l = new QDesignerGridLayout( layout );
+	    l = new TQDesignerGridLayout( tqlayout );
 	    break;
 	default:
 	    return 0;
 	}
-	align = Qt::AlignTop;
-	MetaDataBase::setMargin( gb, metamargin );
-	MetaDataBase::setSpacing( gb, metaspacing );
+	align = TQt::AlignTop;
+	MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin );
+	MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing );
     } else {
-	if ( layout ) {
+	if ( tqlayout ) {
 	    switch ( type ) {
 	    case HBox:
-		l = new TQHBoxLayout( layout );
+		l = new TQHBoxLayout( tqlayout );
 		break;
 	    case VBox:
-		l = new TQVBoxLayout( layout );
+		l = new TQVBoxLayout( tqlayout );
 		break;
 	    case Grid:
-		l = new QDesignerGridLayout( layout );
+		l = new TQDesignerGridLayout( tqlayout );
 		break;
 	    default:
 		return 0;
 	    }
-	    MetaDataBase::addEntry( l );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    l->setSpacing( spacing );
 	    l->setMargin( margin );
 	} else {
@@ -638,23 +638,23 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou
 		l = new TQVBoxLayout( widget );
 		break;
 	    case Grid:
-		l = new QDesignerGridLayout( widget );
+		l = new TQDesignerGridLayout( widget );
 		break;
 	    default:
 		return 0;
 	    }
-	    MetaDataBase::addEntry( l );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    if ( widget ) {
-		MetaDataBase::setMargin( widget, metamargin );
-		MetaDataBase::setSpacing( widget, metaspacing );
+		MetaDataBase::setMargin( TQT_TQOBJECT(widget), metamargin );
+		MetaDataBase::setSpacing( TQT_TQOBJECT(widget), metaspacing );
 	    } else {
 		l->setMargin( margin );
 		l->setSpacing( spacing );
 	    }
 	}
     }
-    l->setAlignment( align );
-    MetaDataBase::addEntry( l );
+    l->tqsetAlignment( align );
+    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
     return l;
 }
 
@@ -663,44 +663,44 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
     if ( !widget )
 	return;
 
-    if ( ::qt_cast<TQTabWidget*>(widget) )
+    if ( ::tqqt_cast<TQTabWidget*>(widget) )
 	widget = ((TQTabWidget*)widget)->currentPage();
-    if ( ::qt_cast<TQWizard*>(widget) )
+    if ( ::tqqt_cast<TQWizard*>(widget) )
 	widget = ((TQWizard*)widget)->currentPage();
-    if ( ::qt_cast<TQMainWindow*>(widget) )
+    if ( ::tqqt_cast<TQMainWindow*>(widget) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
-    if ( ::qt_cast<TQWidgetStack*>(widget) )
+    if ( ::tqqt_cast<TQWidgetStack*>(widget) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
-    if ( ::qt_cast<TQToolBox*>(widget) )
+    if ( ::tqqt_cast<TQToolBox*>(widget) )
 	widget = ((TQToolBox*)widget)->currentItem();
-    delete widget->layout();
+    delete widget->tqlayout();
 }
 
 /*!  Factory functions for creating a widget of the type \a className
-  as child of \a parent with the name \a name.
+  as child of \a tqparent with the name \a name.
 
   If \a init is TRUE, some initial default properties are set. This
   has to be in sync with the initChangedProperties() function!
 */
 
-TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
+TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init,
 				      const TQRect *r, Qt::Orientation orient )
 {
     if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
 	TQPushButton *b = 0;
 	if ( init ) {
-	    b = new QDesignerPushButton( parent, name );
-	    b->setText( TQString::fromLatin1( name ) );
+	    b = new TQDesignerPushButton( tqparent, name );
+	    b->setText( TQString::tqfromLatin1( name ) );
 	} else {
-	    b = new QDesignerPushButton( parent, name );
+	    b = new TQDesignerPushButton( tqparent, name );
 	}
 	TQWidget *w = find_formwindow( b );
-	b->setAutoDefault( w && ::qt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
+	b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
 	return b;
     } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    QDesignerToolButton *tb = new QDesignerToolButton( parent, name );
-	    if ( ::qt_cast<TQToolBox*>(widgetOfContainer(parent))) {
+	    TQDesignerToolButton *tb = new TQDesignerToolButton( tqparent, name );
+	    if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) {
 		tb->setUsesTextLabel(TRUE);
 		tb->setTextLabel("...");
 		tb->setAutoRaise(TRUE);
@@ -710,32 +710,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    }
 	    return tb;
 	}
-	return new QDesignerToolButton( parent, name );
+	return new TQDesignerToolButton( tqparent, name );
     } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
-	    cb->setText( TQString::fromLatin1( name ) );
+	    TQDesignerCheckBox *cb = new TQDesignerCheckBox( tqparent, name );
+	    cb->setText( TQString::tqfromLatin1( name ) );
 	    return cb;
 	}
-	return new QDesignerCheckBox( parent, name );
+	return new TQDesignerCheckBox( tqparent, name );
     } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
-	    rb->setText( TQString::fromLatin1( name ) );
+	    TQDesignerRadioButton *rb = new TQDesignerRadioButton( tqparent, name );
+	    rb->setText( TQString::tqfromLatin1( name ) );
 	    return rb;
 	}
-	return new QDesignerRadioButton( parent, name );
+	return new TQDesignerRadioButton( tqparent, name );
     } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
 	if ( init )
-	    return new TQGroupBox( TQString::fromLatin1( name ), parent, name );
-	return new TQGroupBox( parent, name );
+	    return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name );
+	return new TQGroupBox( tqparent, name );
     } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
 	if ( init )
-	    return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
-	return new TQButtonGroup( parent, name );
+	    return new TQButtonGroup( TQString::tqfromLatin1( name ), tqparent, name );
+	return new TQButtonGroup( tqparent, name );
     } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
-#if !defined(QT_NO_ICONVIEW)
-	TQIconView* iv = new TQIconView( parent, name );
+#if !defined(TQT_NO_ICONVIEW)
+	TQIconView* iv = new TQIconView( tqparent, name );
 	if ( init )
 	    (void) new TQIconViewItem( iv, i18n( "New Item" ) );
 	return iv;
@@ -743,33 +743,33 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	return 0;
 #endif
     } else if ( className == TQTABLE_OBJECT_NAME_STRING ) {
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
 	if ( init )
-	    return new TQTable( 3, 3, parent, name );
-	return new TQTable( parent, name );
+	    return new TQTable( 3, 3, tqparent, name );
+	return new TQTable( tqparent, name );
 #else
 	return 0;
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     } else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
-	return new TQDataTable( parent, name );
-#endif //QT_NO_SQL
+	return new TQDataTable( tqparent, name );
+#endif //TQT_NO_SQL
     } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) {
-	return new QDateEdit( parent, name );
+	return new TQDateEdit( tqparent, name );
     } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) {
-	return new QTimeEdit( parent, name );
+	return new TQTimeEdit( tqparent, name );
     } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) {
-	return new QDateTimeEdit( parent, name );
+	return new TQDateTimeEdit( tqparent, name );
     }
     else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) {
-	TQListBox* lb = new TQListBox( parent, name );
+	TQListBox* lb = new TQListBox( tqparent, name );
 	if ( init ) {
 	    lb->insertItem( i18n( "New Item" ) );
 	    lb->setCurrentItem( 0 );
 	}
 	return lb;
     } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) {
-	TQListView *lv = new TQListView( parent, name );
+	TQListView *lv = new TQListView( tqparent, name );
 	lv->setSorting( -1 );
 	if ( init ) {
 	    lv->addColumn( i18n( "Column 1" ) );
@@ -777,109 +777,109 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	}
 	return lv;
     } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING )
-	return new TQLineEdit( parent, name );
+	return new TQLineEdit( tqparent, name );
     else if ( className == TQSPINBOX_OBJECT_NAME_STRING )
-	return new TQSpinBox( parent, name );
+	return new TQSpinBox( tqparent, name );
     else if ( className == TQSPLITTER_OBJECT_NAME_STRING )
-	return new TQSplitter( parent, name );
+	return new TQSplitter( tqparent, name );
     else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
-	return new TQMultiLineEdit( parent, name );
+	return new TQMultiLineEdit( tqparent, name );
     else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING )
-	return new TQTextEdit( parent, name );
+	return new TQTextEdit( tqparent, name );
     else if ( className == TQLABEL_OBJECT_NAME_STRING  || className == "TextLabel" ) {
-	QDesignerLabel *l = new QDesignerLabel( parent, name );
+	TQDesignerLabel *l = new TQDesignerLabel( tqparent, name );
 	if ( init ) {
-	    l->setText( TQString::fromLatin1( name ) );
-	    MetaDataBase::addEntry( l );
-	    MetaDataBase::setPropertyChanged( l, "text", TRUE );
+	    l->setText( TQString::tqfromLatin1( name ) );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE );
 	}
 	return l;
     } else if ( className == "PixmapLabel" ) {
-	QDesignerLabel *l = new QDesignerLabel( parent, name );
+	TQDesignerLabel *l = new TQDesignerLabel( tqparent, name );
 	if ( init ) {
 	    l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) );
 	    l->setScaledContents( TRUE );
-	    MetaDataBase::addEntry( l );
-	    MetaDataBase::setPropertyChanged( l, "pixmap", TRUE );
-	    MetaDataBase::setPropertyChanged( l, "scaledContents", TRUE );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "pixmap", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "scaledContents", TRUE );
 	}
 	return l;
     } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
-	return new QLayoutWidget( parent, name );
+	return new TQLayoutWidget( tqparent, name );
     else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
-	TQTabWidget *tw = new QDesignerTabWidget( parent, name );
+	TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name );
 	if ( init ) {
-	    FormWindow *fw = find_formwindow( parent );
-	    TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
+	    FormWindow *fw = find_formwindow( tqparent );
+	    TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
 	    tw->addTab( w, i18n("Tab 1") );
-	    MetaDataBase::addEntry( w );
-	    w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+	    w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
 	    tw->addTab( w, i18n("Tab 2") );
-	    MetaDataBase::addEntry( tw );
-	    MetaDataBase::addEntry( w );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(tw) );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	}
 	return tw;
     } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
-	QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name );
+	TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name );
 	if ( init ) {
-	    FormWindow *fw = find_formwindow( parent );
-	    TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
+	    FormWindow *fw = find_formwindow( tqparent );
+	    TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
 	    ws->insertPage( w );
-	    MetaDataBase::addEntry( w );
-	    MetaDataBase::addEntry( ws );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(ws) );
 	}
 	return ws;
     } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) {
-	return new TQComboBox( FALSE, parent, name );
+	return new TQComboBox( FALSE, tqparent, name );
     } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
-	if ( parent &&
-	     ( ::qt_cast<FormWindow*>(parent) ||
-	       ::qt_cast<TQWizard*>(parent) ||
-	       ::qt_cast<TQTabWidget*>(parent) ||
-	       ::qt_cast<TQWidgetStack*>(parent) ||
-	       ::qt_cast<TQToolBox*>(parent) ||
-	       ::qt_cast<TQMainWindow*>(parent) ) ) {
-	    FormWindow *fw = find_formwindow( parent );
+	if ( tqparent &&
+	     ( ::tqqt_cast<FormWindow*>(tqparent) ||
+	       ::tqqt_cast<TQWizard*>(tqparent) ||
+	       ::tqqt_cast<TQTabWidget*>(tqparent) ||
+	       ::tqqt_cast<TQWidgetStack*>(tqparent) ||
+	       ::tqqt_cast<TQToolBox*>(tqparent) ||
+	       ::tqqt_cast<TQMainWindow*>(tqparent) ) ) {
+	    FormWindow *fw = find_formwindow( tqparent );
 	    if ( fw ) {
-		QDesignerWidget *dw = new QDesignerWidget( fw, parent, name );
-		MetaDataBase::addEntry( dw );
+		TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name );
+		MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 		return dw;
 	    }
 	}
-	return new TQWidget( parent, name );
+	return new TQWidget( tqparent, name );
     } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
 	TQDialog *dia = 0;
-	if ( ::qt_cast<FormWindow*>(parent) )
-	    dia = new QDesignerDialog( (FormWindow*)parent, parent, name );
+	if ( ::tqqt_cast<FormWindow*>(tqparent) )
+	    dia = new TQDesignerDialog( (FormWindow*)tqparent, tqparent, name );
 	else
-	    dia = new TQDialog( parent, name );
-#if defined(QT_NON_COMMERCIAL)
-	if ( ::qt_cast<MainWindow*>(parent) )
+	    dia = new TQDialog( tqparent, name );
+#if defined(TQT_NON_COMMERCIAL)
+	if ( ::tqqt_cast<MainWindow*>(tqparent) )
 #else
-	if ( parent )
+	if ( tqparent )
 #endif
-	    dia->reparent( parent, TQPoint( 0, 0 ), TRUE );
+	    dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return dia;
     } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
-	TQWizard *wiz = new QDesignerWizard( parent, name );
-#if defined(QT_NON_COMMERCIAL)
-	if ( ::qt_cast<MainWindow*>(parent) )
+	TQWizard *wiz = new TQDesignerWizard( tqparent, name );
+#if defined(TQT_NON_COMMERCIAL)
+	if ( ::tqqt_cast<MainWindow*>(tqparent) )
 #else
-	if ( parent )
+	if ( tqparent )
 #endif
-	    wiz->reparent( parent, TQPoint( 0, 0 ), TRUE );
-	if ( init && ::qt_cast<FormWindow*>(parent) ) {
-	    QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" );
-	    MetaDataBase::addEntry( dw );
+	    wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
+	if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) {
+	    TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 	    wiz->addPage( dw, i18n( "Page" ) );
 	    TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) );
 	}
 	return wiz;
     } else if ( className == "Spacer" ) {
-	Spacer *s = new Spacer( parent, name );
-	MetaDataBase::addEntry( s );
-	MetaDataBase::setPropertyChanged( s, "orientation", TRUE );
-	MetaDataBase::setPropertyChanged( s, "sizeType", TRUE );
+	Spacer *s = new Spacer( tqparent, name );
+	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "sizeType", TRUE );
 	if ( !r )
 	    return s;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
@@ -890,49 +890,49 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    s->setOrientation( Qt::Horizontal );
 	return s;
     } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING )
-	return new TQLCDNumber( parent, name );
+	return new TQLCDNumber( tqparent, name );
     else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING )
-	return new TQProgressBar( parent, name );
+	return new TQProgressBar( tqparent, name );
     else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING )
-	return new TQTextView( parent, name );
+	return new TQTextView( tqparent, name );
     else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING )
-	return new TQTextBrowser( parent, name );
+	return new TQTextBrowser( tqparent, name );
     else if ( className == TQDIAL_OBJECT_NAME_STRING )
-	return new TQDial( parent, name );
+	return new TQDial( tqparent, name );
     else if ( className == TQSLIDER_OBJECT_NAME_STRING ) {
-	TQSlider *s = new TQSlider( parent, name );
+	TQSlider *s = new TQSlider( tqparent, name );
 	if ( !r )
 	    return s;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
 	    s->setOrientation( orient );
 	else if ( r->width() > r->height() )
 	    s->setOrientation( Qt::Horizontal );
-	MetaDataBase::addEntry( s );
-	MetaDataBase::setPropertyChanged( s, "orientation", TRUE );
+	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
 	return s;
     } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) {
-	TQScrollBar *s = new TQScrollBar( parent, name );
+	TQScrollBar *s = new TQScrollBar( tqparent, name );
 	if ( !r )
 	    return s;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
 	    s->setOrientation( orient );
 	else if ( r->width() > r->height() )
 	    s->setOrientation( Qt::Horizontal );
-	MetaDataBase::addEntry( s );
-	MetaDataBase::setPropertyChanged( s, "orientation", TRUE );
+	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
 	return s;
     } else if ( className == TQFRAME_OBJECT_NAME_STRING ) {
 	if ( !init )
-	    return new TQFrame( parent, name );
-	TQFrame *f = new TQFrame( parent, name );
+	    return new TQFrame( tqparent, name );
+	TQFrame *f = new TQFrame( tqparent, name );
 	f->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
 	return f;
     } else if ( className == "Line" ) {
-	Line *l = new Line( parent, name );
-	MetaDataBase::addEntry( l );
-	MetaDataBase::setPropertyChanged( l, "orientation", TRUE );
-	MetaDataBase::setPropertyChanged( l, "frameShadow", TRUE );
-	MetaDataBase::setPropertyChanged( l, "frameShape", TRUE );
+	Line *l = new Line( tqparent, name );
+	MetaDataBase::addEntry( TQT_TQOBJECT(l) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "orientation", TRUE );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShadow", TRUE );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShape", TRUE );
 	if ( !r )
 	    return l;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
@@ -941,40 +941,40 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    l->setOrientation( Qt::Vertical );
 	return l;
     } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
-	TQMainWindow *mw = new TQMainWindow( parent, name, 0 );
-	mw->setDockEnabled( Qt::DockMinimized, FALSE );
-	QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" );
+	TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 );
+	mw->setDockEnabled( TQt::DockMinimized, FALSE );
+	TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, mw, "central widget" );
 	mw->setDockMenuEnabled( FALSE );
-	MetaDataBase::addEntry( dw );
+	MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 	mw->setCentralWidget( dw );
 	(void)mw->statusBar();
 	dw->show();
 	return mw;
     } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
 	if ( !init )
-	    return new QDesignerToolBox( parent, name );
-	TQToolBox *tb = new QDesignerToolBox( parent, name );
-	FormWindow *fw = find_formwindow( parent );
-	TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) :
+	    return new TQDesignerToolBox( tqparent, name );
+	TQToolBox *tb = new TQDesignerToolBox( tqparent, name );
+	FormWindow *fw = find_formwindow( tqparent );
+	TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) :
 		     new TQWidget( tb, "page1" );
 	tb->addItem( w, i18n("Page 1") );
-	MetaDataBase::addEntry( w );
-	w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" );
+	MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+	w = fw ? new TQDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" );
 	tb->addItem( w, i18n("Page 2") );
-	MetaDataBase::addEntry( tb );
-	MetaDataBase::addEntry( w );
+	MetaDataBase::addEntry( TQT_TQOBJECT(tb) );
+	MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	return tb;
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
-	TQWidget *w = new QDesignerDataBrowser( parent, name );
-	if ( parent )
-	    w->reparent( parent, TQPoint( 0, 0 ), TRUE );
+	TQWidget *w = new TQDesignerDataBrowser( tqparent, name );
+	if ( tqparent )
+	    w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return w;
     } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
-	TQWidget *w = new QDesignerDataView( parent, name );
-	if ( parent )
-	    w->reparent( parent, TQPoint( 0, 0 ), TRUE );
+	TQWidget *w = new TQDesignerDataView( tqparent, name );
+	if ( tqparent )
+	    w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return w;
     }
 #endif
@@ -984,63 +984,63 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     if ( !iface )
 	return 0;
 
-    TQWidget *w = iface->create( className, parent, name );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+    TQWidget *w = iface->create( className, tqparent, name );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) {
-	QWidgetContainerInterfacePrivate *iface2 = 0;
-	iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+	TQWidgetContainerInterfacePrivate *iface2 = 0;
+	iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
 	if ( iface2 ) {
 	    iface2->addPage( className, w, "Page", -1 );
 	    iface2->release();
 	}
     }
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     iface->release();
     return w;
 }
 
 
 
-/*!  Find out which type the layout of the widget is. Returns \c HBox,
-  \c VBox, \c Grid or \c NoLayout.  \a layout points to this
-  TQWidget::layout() of \a w or to 0 after the function call.
+/*!  Find out which type the tqlayout of the widget is. Returns \c HBox,
+  \c VBox, \c Grid or \c NoLayout.  \a tqlayout points to this
+  TQWidget::tqlayout() of \a w or to 0 after the function call.
 */
 
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout )
 {
-    layout = 0;
+    tqlayout = 0;
 
-    if ( ::qt_cast<TQTabWidget*>(w) )
+    if ( ::tqqt_cast<TQTabWidget*>(w) )
 	w = ((TQTabWidget*)w)->currentPage();
-    if ( ::qt_cast<TQWizard*>(w) )
+    if ( ::tqqt_cast<TQWizard*>(w) )
 	w = ((TQWizard*)w)->currentPage();
-    if ( ::qt_cast<TQMainWindow*>(w) )
+    if ( ::tqqt_cast<TQMainWindow*>(w) )
 	w = ((TQMainWindow*)w)->centralWidget();
-    if ( ::qt_cast<TQWidgetStack*>(w) )
+    if ( ::tqqt_cast<TQWidgetStack*>(w) )
 	w = ((TQWidgetStack*)w)->visibleWidget();
-    if ( ::qt_cast<TQToolBox*>(w) )
+    if ( ::tqqt_cast<TQToolBox*>(w) )
 	w = ((TQToolBox*)w)->currentItem();
 
-    if ( ::qt_cast<TQSplitter*>(w) )
-	return ( (TQSplitter*)w )->orientation() == Horizontal ? HBox : VBox;
+    if ( ::tqqt_cast<TQSplitter*>(w) )
+	return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox;
 
-    if ( !w || !w->layout() )
+    if ( !w || !w->tqlayout() )
 	return NoLayout;
-    TQLayout *lay = w->layout();
+    TQLayout *lay = w->tqlayout();
 
-    if ( ::qt_cast<TQGroupBox*>(w) ) {
-	TQObjectList *l = lay->queryList( TQLAYOUT_OBJECT_NAME_STRING );
+    if ( ::tqqt_cast<TQGroupBox*>(w) ) {
+	TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
 	if ( l && l->first() )
 	    lay = (TQLayout*)l->first();
 	delete l;
     }
-    layout = lay;
+    tqlayout = lay;
 
-    if ( ::qt_cast<TQHBoxLayout*>(lay) )
+    if ( ::tqqt_cast<TQHBoxLayout*>(lay) )
 	return HBox;
-    else if ( ::qt_cast<TQVBoxLayout*>(lay) )
+    else if ( ::tqqt_cast<TQVBoxLayout*>(lay) )
 	return VBox;
-    else if ( ::qt_cast<TQGridLayout*>(lay) )
+    else if ( ::tqqt_cast<TQGridLayout*>(lay) )
 	return Grid;
     return NoLayout;
 }
@@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
 {
-    if ( ::qt_cast<TQHBoxLayout*>(layout) )
+    if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) )
 	return HBox;
-    else if ( ::qt_cast<TQVBoxLayout*>(layout) )
+    else if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout) )
 	return VBox;
-    else if ( ::qt_cast<TQGridLayout*>(layout) )
+    else if ( ::tqqt_cast<TQGridLayout*>(tqlayout) )
 	return Grid;
     return NoLayout;
 }
@@ -1062,25 +1062,25 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w )
 {
     TQLayout *l = 0;
-    return layoutType( w, l );
+    return tqlayoutType( w, l );
 }
 
 
-TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
+TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout )
 {
-    TQObject *o = layout;
+    TQObject *o = TQT_TQOBJECT(tqlayout);
     while ( o ) {
 	if ( o->isWidgetType() )
 	    return (TQWidget*)o;
-	o = o->parent();
+	o = o->tqparent();
     }
     return 0;
 }
 
-/*!  Returns the widget into which children should be inserted when \a
+/*!  Returns the widget into which tqchildren should be inserted when \a
   w is a container known to the designer.
 
   Usually that is \a w itself, sometimes it is different (e.g. a
@@ -1093,25 +1093,25 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
 {
     if ( !w )
 	return w;
-    if ( ::qt_cast<TQTabWidget*>(w) )
+    if ( ::tqqt_cast<TQTabWidget*>(w) )
 	return ((TQTabWidget*)w)->currentPage();
-    if ( ::qt_cast<TQWizard*>(w) )
+    if ( ::tqqt_cast<TQWizard*>(w) )
 	return ((TQWizard*)w)->currentPage();
-    if ( ::qt_cast<TQWidgetStack*>(w) )
+    if ( ::tqqt_cast<TQWidgetStack*>(w) )
 	return ((TQWidgetStack*)w)->visibleWidget();
-    if ( ::qt_cast<TQToolBox*>(w) )
+    if ( ::tqqt_cast<TQToolBox*>(w) )
 	return ((TQToolBox*)w)->currentItem();
-    if ( ::qt_cast<TQMainWindow*>(w) )
+    if ( ::tqqt_cast<TQMainWindow*>(w) )
 	return ((TQMainWindow*)w)->centralWidget();
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     if ( !WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) )
 	return w;
     WidgetInterface *iface = 0;
     widgetManager()->queryInterface( classNameOf( w ), &iface );
     if ( !iface )
 	return w;
-    QWidgetContainerInterfacePrivate *iface2 = 0;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+    TQWidgetContainerInterfacePrivate *iface2 = 0;
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
     if ( !iface2 )
 	return w;
     TQWidget *c = iface2->containerOfWidget( w->className(), w );
@@ -1119,32 +1119,32 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
     iface->release();
     if ( c )
 	return c;
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     return w;
 }
 
 /*!  Returns the actual designer widget of the container \a w. This is
-  normally \a w itself, but might be a parent or grand parent of \a w
+  normally \a w itself, but might be a tqparent or grand tqparent of \a w
   (e.g. when working with a tabwidget and \a w is the container which
-  contains and layouts childs, but the actual widget known to the
-  designer is the tabwidget which is the parent of \a w. So this
+  contains and tqlayouts childs, but the actual widget known to the
+  designer is the tabwidget which is the tqparent of \a w. So this
   function returns the tabwidget then.)
 */
 
 TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w )
 {
-    if ( w && ::qt_cast<TQWidgetStack*>(w->parentWidget()) )
-	w = w->parentWidget();
-    if ( w->parentWidget() && w->parentWidget()->parentWidget() &&
-	 w->parentWidget()->parentWidget()->parentWidget() &&
-	 ::qt_cast<TQToolBox*>(w->parentWidget()->parentWidget()->parentWidget()) )
-	return w->parentWidget()->parentWidget()->parentWidget();
+    if ( w && ::tqqt_cast<TQWidgetStack*>(w->tqparentWidget()) )
+	w = w->tqparentWidget();
+    if ( w->tqparentWidget() && w->tqparentWidget()->tqparentWidget() &&
+	 w->tqparentWidget()->tqparentWidget()->tqparentWidget() &&
+	 ::tqqt_cast<TQToolBox*>(w->tqparentWidget()->tqparentWidget()->tqparentWidget()) )
+	return w->tqparentWidget()->tqparentWidget()->tqparentWidget();
     while ( w ) {
-	int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) );
+	int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) );
 	if ( WidgetDatabase::isContainer( id ) ||
-	     w && ::qt_cast<FormWindow*>(w->parentWidget()) )
+	     w && ::tqqt_cast<FormWindow*>(w->tqparentWidget()) )
 	    return w;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     return w;
 }
@@ -1165,38 +1165,38 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
     if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things
 	return ( lastWasAPassiveInteractor = TRUE );
 
-    if ( ::qt_cast<TQTabBar*>(o) )
+    if ( ::tqqt_cast<TQTabBar*>(o) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQSizeGrip*>(o) )
+    else if ( ::tqqt_cast<TQSizeGrip*>(o) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQButton*>(o) &&
-	      ( ::qt_cast<TQTabBar*>(o->parent()) || ::qt_cast<TQToolBox*>(o->parent()) ) )
+    else if ( ::tqqt_cast<TQButton*>(o) &&
+	      ( ::tqqt_cast<TQTabBar*>(o->tqparent()) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQPushButton*>(o) && ::qt_cast<TQWizard*>(o->parent()) )
+    else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->tqparent()) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQMenuBar*>(o) && ::qt_cast<TQMainWindow*>(o->parent()) )
+    else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->tqparent()) )
 	return ( lastWasAPassiveInteractor = TRUE );
-//    else if ( ::qt_cast<QDockWindowHandle*>(o) )
-    else if ( o->inherits( "QDockWindowHandle" ) )
+//    else if ( ::tqqt_cast<TQDockWindowHandle*>(o) )
+    else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) )
 	return ( lastWasAPassiveInteractor = TRUE );
-//    else if ( ::qt_cast<QHideDock*>(o) )
-    else if ( o->inherits( "QHideDock" ) )
+//    else if ( ::tqqt_cast<TQHideDock*>(o) )
+    else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) )
 	return ( lastWasAPassiveInteractor = TRUE );
     else if ( qstrcmp( o->name(), "designer_wizardstack_button" ) == 0 )
 	return ( lastWasAPassiveInteractor = TRUE );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     if ( !o->isWidgetType() )
 	return ( lastWasAPassiveInteractor = FALSE );
     WidgetInterface *iface = 0;
     TQWidget *w = (TQWidget*)o;
-    while ( !iface && w && !::qt_cast<FormWindow*>(w) ) {
+    while ( !iface && w && !::tqqt_cast<FormWindow*>(w) ) {
 	widgetManager()->queryInterface( classNameOf( w ), &iface );
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     if ( !iface )
 	return ( lastWasAPassiveInteractor = FALSE );
-    QWidgetContainerInterfacePrivate *iface2 = 0;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+    TQWidgetContainerInterfacePrivate *iface2 = 0;
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
     if ( !iface2 )
 	return ( lastWasAPassiveInteractor = FALSE );
     TQWidget *fw = MainWindow::self->isAFormWindowChild( (TQWidget*)o );
@@ -1208,7 +1208,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
     lastWasAPassiveInteractor = iface2->isPassiveInteractor( dw->className(), (TQWidget*)o );
     iface2->release();
     iface->release();
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     return lastWasAPassiveInteractor;
 }
 
@@ -1222,78 +1222,78 @@ const char* WidgetFactory::classNameOf( TQObject* o )
 	return o->className();
     if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className())))
         return o->className();
-    else if ( ::qt_cast<QDesignerTabWidget*>(o) )
-	return "TQTabWidget";
-    else if ( ::qt_cast<QDesignerWidgetStack*>(o) )
-	return "TQWidgetStack";
-    else if ( ::qt_cast<TQWidgetStack*>(o) )
-	return "QWeDoNotWantToBreakTabWidget";
-    else if ( ::qt_cast<QDesignerDialog*>(o) )
-	return "TQDialog";
-    else if ( ::qt_cast<QDesignerWidget*>(o) )
-	return "TQWidget";
+    else if ( ::tqqt_cast<TQDesignerTabWidget*>(o) )
+	return TQTABWIDGET_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerWidgetStack*>(o) )
+	return TQWIDGETSTACK_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQWidgetStack*>(o) )
+	return "TQWeDoNotWantToBreakTabWidget";
+    else if ( ::tqqt_cast<TQDesignerDialog*>(o) )
+	return TQDIALOG_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerWidget*>(o) )
+	return TQWIDGET_OBJECT_NAME_STRING;
     else if ( o->inherits( "CustomWidget" ) )
 	return ( (CustomWidget*)o )->realClassName().latin1();
-    else if ( ::qt_cast<QDesignerLabel*>(o) )
-	return "TQLabel";
-    else if ( ::qt_cast<QDesignerWizard*>(o) )
-	return "TQWizard";
-    else if ( ::qt_cast<QDesignerPushButton*>(o) )
-	return "TQPushButton";
-    else if ( ::qt_cast<QDesignerToolButton*>(o) )
-	return "TQToolButton";
-    else if ( ::qt_cast<QDesignerRadioButton*>(o) )
-	return "TQRadioButton";
-    else if ( ::qt_cast<QDesignerCheckBox*>(o) )
-	return "TQCheckBox";
-    else if ( ::qt_cast<MenuBarEditor*>(o) )
-	return "TQMenuBar";
-    else if ( ::qt_cast<QDesignerToolBar*>(o) )
-	return "TQToolBar";
-    else if ( ::qt_cast<QDesignerAction*>(o) )
-	return "TQAction";
-    else if ( ::qt_cast<QDesignerActionGroup*>(o) )
-	return "TQActionGroup";
-    else if ( ::qt_cast<PopupMenuEditor*>(o) )
-	return "TQPopupMenu";
-    else if ( ::qt_cast<QDesignerToolBox*>(o) )
-	return "TQToolBox";
-#ifndef QT_NO_SQL
-    else if ( ::qt_cast<QDesignerDataBrowser*>(o) )
-	return "TQDataBrowser";
-    else if ( ::qt_cast<QDesignerDataView*>(o) )
-	return "TQDataView";
+    else if ( ::tqqt_cast<TQDesignerLabel*>(o) )
+	return TQLABEL_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerWizard*>(o) )
+	return TQWIZARD_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerPushButton*>(o) )
+	return TQPUSHBUTTON_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerToolButton*>(o) )
+	return TQTOOLBUTTON_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerRadioButton*>(o) )
+	return TQRADIOBUTTON_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerCheckBox*>(o) )
+	return TQCHECKBOX_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<MenuBarEditor*>(o) )
+	return TQMENUBAR_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	return TQTOOLBAR_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerAction*>(o) )
+	return TQACTION_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerActionGroup*>(o) )
+	return TQACTIONGROUP_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<PopupMenuEditor*>(o) )
+	return TQPOPUPMENU_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerToolBox*>(o) )
+	return TQTOOLBOX_OBJECT_NAME_STRING;
+#ifndef TQT_NO_SQL
+    else if ( ::tqqt_cast<TQDesignerDataBrowser*>(o) )
+	return TQDATABROWSER_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerDataView*>(o) )
+	return TQDATAVIEW_OBJECT_NAME_STRING;
 #endif
     return o->className();
 }
 
 TQString WidgetFactory::defaultSignal( TQObject *w )
 {
-    if ( ::qt_cast<TQRadioButton*>(w) || ::qt_cast<TQCheckBox*>(w) )
+    if ( ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQCheckBox*>(w) )
 	return "toggled";
-    else if ( ::qt_cast<TQButton*>(w) || ::qt_cast<TQButtonGroup*>(w) )
+    else if ( ::tqqt_cast<TQButton*>(w) || ::tqqt_cast<TQButtonGroup*>(w) )
 	return "clicked";
-    else if ( ::qt_cast<TQTextBrowser*>(w) )
+    else if ( ::tqqt_cast<TQTextBrowser*>(w) )
 	return "linkClicked";
-    else if ( ::qt_cast<TQLineEdit*>(w) || ::qt_cast<TQTextEdit*>(w) )
+    else if ( ::tqqt_cast<TQLineEdit*>(w) || ::tqqt_cast<TQTextEdit*>(w) )
 	return "textChanged";
-    else if ( ::qt_cast<TQListView*>(w) || ::qt_cast<TQIconView*>(w) ||
-	      ::qt_cast<TQListBox*>(w) || ::qt_cast<TQTable*>(w) )
+    else if ( ::tqqt_cast<TQListView*>(w) || ::tqqt_cast<TQIconView*>(w) ||
+	      ::tqqt_cast<TQListBox*>(w) || ::tqqt_cast<TQTable*>(w) )
 	return "selectionChanged";
-    else if ( ::qt_cast<TQTabWidget*>(w) )
+    else if ( ::tqqt_cast<TQTabWidget*>(w) )
 	return "selected";
-    else if ( ::qt_cast<TQToolBox*>(w) )
+    else if ( ::tqqt_cast<TQToolBox*>(w) )
 	return "currentChanged";
-    else if ( ::qt_cast<TQWidgetStack*>(w) )
+    else if ( ::tqqt_cast<TQWidgetStack*>(w) )
 	return "aboutToShow";
-    else if ( ::qt_cast<TQSpinBox*>(w) || ::qt_cast<TQSlider*>(w) ||
-	      ::qt_cast<TQScrollBar*>(w) || ::qt_cast<QDateEdit*>(w) ||
-	      ::qt_cast<QTimeEdit*>(w) || ::qt_cast<QDateTimeEdit*>(w) ||
-	      ::qt_cast<TQDial*>(w) )
+    else if ( ::tqqt_cast<TQSpinBox*>(w) || ::tqqt_cast<TQSlider*>(w) ||
+	      ::tqqt_cast<TQScrollBar*>(w) || ::tqqt_cast<TQDateEdit*>(w) ||
+	      ::tqqt_cast<TQTimeEdit*>(w) || ::tqqt_cast<TQDateTimeEdit*>(w) ||
+	      ::tqqt_cast<TQDial*>(w) )
 	return "valueChanged";
-    else if ( ::qt_cast<TQComboBox*>(w) )
+    else if ( ::tqqt_cast<TQComboBox*>(w) )
 	return "activated";
-    return TQString::null;
+    return TQString();
 }
 
 /*!  As some properties are set by default when creating a widget this
@@ -1307,14 +1307,14 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	 MainWindow::self->currProject()->fakeFormFileFor( o ) )
 	return;
     MetaDataBase::setPropertyChanged( o, "name", TRUE );
-    if ( !::qt_cast<QDesignerToolBar*>(o) && !::qt_cast<MenuBarEditor*>(o) )
+    if ( !::tqqt_cast<TQDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) )
 	MetaDataBase::setPropertyChanged( o, "geometry", TRUE );
 
-    if ( ::qt_cast<TQPushButton*>(o) ||
-	 ::qt_cast<TQRadioButton*>(o) ||
-	 ::qt_cast<TQCheckBox*>(o) ||
-	 ::qt_cast<TQToolButton*>(o) ) {
-	if (::qt_cast<TQToolButton*>(o) && ::qt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) {
+    if ( ::tqqt_cast<TQPushButton*>(o) ||
+	 ::tqqt_cast<TQRadioButton*>(o) ||
+	 ::tqqt_cast<TQCheckBox*>(o) ||
+	 ::tqqt_cast<TQToolButton*>(o) ) {
+	if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) {
 	    MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE );
 	    MetaDataBase::setPropertyChanged( o, "textLabel", TRUE );
 	    MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE );
@@ -1323,29 +1323,29 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	    MetaDataBase::setPropertyChanged( o, "text", TRUE );
 	}
     }
-    else if ( ::qt_cast<TQGroupBox*>(o) )
+    else if ( ::tqqt_cast<TQGroupBox*>(o) )
 	MetaDataBase::setPropertyChanged( o, "title", TRUE );
     else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
 	MetaDataBase::setPropertyChanged( o, "frameShadow", TRUE );
 	MetaDataBase::setPropertyChanged( o, "frameShape", TRUE );
-    } else if ( ::qt_cast<TQTabWidget*>(o) || ::qt_cast<TQWizard*>(o) ) {
+    } else if ( ::tqqt_cast<TQTabWidget*>(o) || ::tqqt_cast<TQWizard*>(o) ) {
 	MetaDataBase::setPropertyChanged( o, "pageTitle", TRUE );
 	MetaDataBase::setPropertyChanged( o, "pageName", TRUE );
 	MetaDataBase::setPropertyChanged( o, "currentPage", TRUE );
-    } else if ( ::qt_cast<TQWidgetStack*>(o) ) {
+    } else if ( ::tqqt_cast<TQWidgetStack*>(o) ) {
 	MetaDataBase::setPropertyChanged( o, "currentPage", TRUE );
 	MetaDataBase::setPropertyChanged( o, "pageName", TRUE );
-    } else if ( ::qt_cast<TQToolBox*>(o) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(o) ) {
 	MetaDataBase::setPropertyChanged( o, "currentIndex", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemName", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemLabel", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemIconSet", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE );
-#ifndef QT_NO_TABLE
-    } else if ( ::qt_cast<TQTable*>(o) ) {
-#  ifndef QT_NO_SQL
-        if (!::qt_cast<TQDataTable*>(o) )
+#ifndef TQT_NO_TABLE
+    } else if ( ::tqqt_cast<TQTable*>(o) ) {
+#  ifndef TQT_NO_SQL
+        if (!::tqqt_cast<TQDataTable*>(o) )
 #  endif
         {
             MetaDataBase::setPropertyChanged( o, "numRows", TRUE );
@@ -1357,11 +1357,11 @@ void WidgetFactory::initChangedProperties( TQObject *o )
             }
         }
 #endif
-    } else if ( ::qt_cast<TQSplitter*>(o)  ) {
+    } else if ( ::tqqt_cast<TQSplitter*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "orientation", TRUE );
-    } else if ( ::qt_cast<QDesignerToolBar*>(o)  ) {
+    } else if ( ::tqqt_cast<TQDesignerToolBar*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "label", TRUE );
-    } else if ( ::qt_cast<MenuBarEditor*>(o)  ) {
+    } else if ( ::tqqt_cast<MenuBarEditor*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "itemName", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemNumber", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemText", TRUE );
@@ -1372,17 +1372,17 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget )
 {
     TQString className = WidgetDatabase::className( id );
 
-    if ( className.contains( "ListBox" ) )
+    if ( className.tqcontains( "ListBox" ) )
 	return TRUE;
-    if ( className.contains( "ComboBox" ) )
+    if ( className.tqcontains( "ComboBox" ) )
 	return TRUE;
-    if ( className.contains( "ListView" ) )
+    if ( className.tqcontains( "ListView" ) )
 	return TRUE;
-    if ( className.contains( "IconView" ) )
+    if ( className.tqcontains( "IconView" ) )
 	return TRUE;
     if ( className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
 	return TRUE;
-    if ( ::qt_cast<TQTable*>(editorWidget) != 0 )
+    if ( ::tqqt_cast<TQTable*>(editorWidget) != 0 )
 	return TRUE;
 
     return FALSE;
@@ -1392,66 +1392,66 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget )
 {
     TQString className = WidgetDatabase::className( id );
 
-    if ( className.contains( "ListBox" ) || className.contains( "ListView" ) ||
-	 className.contains( "IconView" )  || className.contains( "ComboBox" ) ||
-	 ::qt_cast<TQTable*>(editorWidget) != 0 )
+    if ( className.tqcontains( "ListBox" ) || className.tqcontains( "ListView" ) ||
+	 className.tqcontains( "IconView" )  || className.tqcontains( "ComboBox" ) ||
+	 ::tqqt_cast<TQTable*>(editorWidget) != 0 )
 	return TRUE;
 
     return FALSE;
 }
 
-void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
+void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
 {
     TQString className = WidgetDatabase::className( id );
 
-    if ( className.contains( "ListBox" ) ) {
-	if ( !::qt_cast<TQListBox*>(editWidget) )
+    if ( className.tqcontains( "ListBox" ) ) {
+	if ( !::tqqt_cast<TQListBox*>(editWidget) )
 	    return;
-	ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw );
+	ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
     }
 
-    if ( className.contains( "ComboBox" ) ) {
-	if ( !::qt_cast<TQComboBox*>(editWidget) )
+    if ( className.tqcontains( "ComboBox" ) ) {
+	if ( !::tqqt_cast<TQComboBox*>(editWidget) )
 	    return;
 	TQComboBox *cb = (TQComboBox*)editWidget;
-	ListBoxEditor *e = new ListBoxEditor( parent, cb->listBox(), fw );
+	ListBoxEditor *e = new ListBoxEditor( tqparent, cb->listBox(), fw );
 	e->exec();
 	delete e;
 	cb->update();
 	return;
     }
 
-    if ( className.contains( "ListView" ) ) {
-	if ( !::qt_cast<TQListView*>(editWidget) )
+    if ( className.tqcontains( "ListView" ) ) {
+	if ( !::tqqt_cast<TQListView*>(editWidget) )
 	    return;
 	TQListView *lv = (TQListView*)editWidget;
-	ListViewEditor *e = new ListViewEditor( parent, lv, fw );
+	ListViewEditor *e = new ListViewEditor( tqparent, lv, fw );
 	e->exec();
 	delete e;
 	return;
     }
 
-    if ( className.contains( "IconView" ) ) {
-	if ( !::qt_cast<TQIconView*>(editWidget) )
+    if ( className.tqcontains( "IconView" ) ) {
+	if ( !::tqqt_cast<TQIconView*>(editWidget) )
 	    return;
-	IconViewEditor *e = new IconViewEditor( parent, editWidget, fw );
+	IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
     }
 
     if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING ) {
-	MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw );
+	MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
     }
-#ifndef QT_NO_TABLE
-    if (::qt_cast<TQTable*>(editWidget) != 0) {
-	TableEditor *e = new TableEditor( parent, editWidget, fw );
+#ifndef TQT_NO_TABLE
+    if (::tqqt_cast<TQTable*>(editWidget) != 0) {
+	TableEditor *e = new TableEditor( tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
@@ -1463,14 +1463,14 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
 {
     if ( propName == "name" || propName == "geometry" )
 	return FALSE;
-    TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) );
-    return l.findIndex( propName ) == -1;
+    TQStringList l = *changedProperties->tqfind( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) );
+    return l.tqfindIndex( propName ) == -1;
 }
 
 bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
-							findProperty( propName, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
+							tqfindProperty( propName, TRUE ), TRUE );
     if (!p )
 	return FALSE;
     return p->reset( w );
@@ -1479,27 +1479,27 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
 {
     if ( propName == "wordwrap" ) {
-	int v = defaultValue( w, "alignment" ).toInt();
+	int v = defaultValue( w, "tqalignment" ).toInt();
 	return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
     } else if ( propName == "toolTip" || propName == "whatsThis" ) {
-	return TQVariant( TQString::fromLatin1( "" ) );
+	return TQVariant( TQString::tqfromLatin1( "" ) );
     } else if ( w->inherits( "CustomWidget" ) ) {
 	return TQVariant();
     } else if ( propName == "frameworkCode" ) {
 	return TQVariant( TRUE, 0 );
-    } else if ( propName == "layoutMargin" || propName == "layoutSpacing" ) {
+    } else if ( propName == "tqlayoutMargin" || propName == "tqlayoutSpacing" ) {
 	return TQVariant( -1 );
     }
 
-    return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName );
+    return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName );
 }
 
 TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->metaObject()->
-			     property( w->metaObject()->findProperty( propName, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->
+			     property( w->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE );
     if ( !p ) {
-	int v = defaultValue( w, "alignment" ).toInt();
+	int v = defaultValue( w, "tqalignment" ).toInt();
 	if ( propName == "hAlign" ) {
 	    if ( ( v & AlignAuto ) == AlignAuto )
 		return "AlignAuto";
@@ -1521,35 +1521,35 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam
 	} else if ( propName == "resizeMode" ) {
 	    return "Auto";
 	}
-	return TQString::null;
+	return TQString();
 
     }
     return p->valueToKey( defaultValue( w, propName ).toInt() );
 }
 
-TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w )
+TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w )
 {
     if ( !w )
 	return 0;
-    return new CustomWidget( parent, name, w );
+    return new CustomWidget( tqparent, name, w );
 }
 
 TQVariant WidgetFactory::property( TQObject *w, const char *name )
 {
-    int id = w->metaObject()->findProperty( name, TRUE );
-    const TQMetaProperty* p = w->metaObject()->property( id, TRUE );
+    int id = w->tqmetaObject()->tqfindProperty( name, TRUE );
+    const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE );
     if ( !p || !p->isValid() )
 	return MetaDataBase::fakeProperty( w, name );
     return w->property( name );
 }
 
-void QDesignerLabel::updateBuddy()
+void TQDesignerLabel::updateBuddy()
 {
 
     if ( myBuddy.isEmpty() )
 	return;
 
-    TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
+    TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
     if ( !l || !l->first() ) {
 	delete l;
 	return;
@@ -1560,7 +1560,7 @@ void QDesignerLabel::updateBuddy()
 }
 
 
-void QDesignerWidget::resizeEvent( TQResizeEvent* e)
+void TQDesignerWidget::resizeEvent( TQResizeEvent* e)
 {
     if ( need_frame ) {
 	TQPainter p(this);
@@ -1569,7 +1569,7 @@ void QDesignerWidget::resizeEvent( TQResizeEvent* e)
     }
 }
 
-void QDesignerWidget::paintEvent( TQPaintEvent *e )
+void TQDesignerWidget::paintEvent( TQPaintEvent *e )
 {
     if ( need_frame ) {
 	TQPainter p(this);
@@ -1579,17 +1579,17 @@ void QDesignerWidget::paintEvent( TQPaintEvent *e )
     formwindow->paintGrid( this, e );
 }
 
-void QDesignerDialog::paintEvent( TQPaintEvent *e )
+void TQDesignerDialog::paintEvent( TQPaintEvent *e )
 {
     formwindow->paintGrid( this, e );
 }
 
-TQSizePolicy QLayoutWidget::sizePolicy() const
+TQSizePolicy TQLayoutWidget::sizePolicy() const
 {
     return sp;
 }
 
-bool QLayoutWidget::event( TQEvent *e )
+bool TQLayoutWidget::event( TQEvent *e )
 {
     if ( e && ( e->type() == TQEvent::ChildInserted ||
 		e->type() == TQEvent::ChildRemoved ||
@@ -1600,14 +1600,14 @@ bool QLayoutWidget::event( TQEvent *e )
 }
 
 /*
-  This function must be called on QLayoutWidget creation and whenever
-  the QLayoutWidget's parent layout changes (e.g., from a QHBoxLayout
-  to a TQVBoxLayout), because of the (illogical) way layouting works.
+  This function must be called on TQLayoutWidget creation and whenever
+  the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
+  to a TQVBoxLayout), because of the (illogical) way tqlayouting works.
 */
-void QLayoutWidget::updateSizePolicy()
+void TQLayoutWidget::updateSizePolicy()
 {
-    if ( !children() || children()->count() == 0 ) {
-	sp = TQWidget::sizePolicy();
+    if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
+	sp = TQWidget::tqsizePolicy();
 	return;
     }
 
@@ -1624,24 +1624,24 @@ void QLayoutWidget::updateSizePolicy()
     int ht = (int) TQSizePolicy::Preferred;
     int vt = (int) TQSizePolicy::Preferred;
 
-    if ( layout() ) {
+    if ( tqlayout() ) {
 	/*
-	  parentLayout is set to the parent layout if there is one and if it is
-	  top level, in which case layouting is illogical.
+	  tqparentLayout is set to the tqparent tqlayout if there is one and if it is
+	  top level, in which case tqlayouting is illogical.
 	*/
-	TQLayout *parentLayout = 0;
-	if ( parent() && parent()->isWidgetType() ) {
-	    parentLayout = ((TQWidget *)parent())->layout();
-	    if ( parentLayout &&
-		 ::qt_cast<QLayoutWidget*>(parentLayout->mainWidget()) )
-		parentLayout = 0;
+	TQLayout *tqparentLayout = 0;
+	if ( tqparent() && tqparent()->isWidgetType() ) {
+	    tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
+	    if ( tqparentLayout &&
+		 ::tqqt_cast<TQLayoutWidget*>(tqparentLayout->mainWidget()) )
+		tqparentLayout = 0;
 	}
 
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
-	if ( ::qt_cast<TQVBoxLayout*>(layout()) ) {
-	    if ( ::qt_cast<TQHBoxLayout*>(parentLayout) )
+	if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) {
+	    if ( ::tqqt_cast<TQHBoxLayout*>(tqparentLayout) )
 		vt = TQSizePolicy::Minimum;
 	    else
 		vt = TQSizePolicy::Fixed;
@@ -1652,17 +1652,17 @@ void QLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( !w->sizePolicy().mayGrowHorizontally() )
+		if ( !w->tqsizePolicy().mayGrowHorizontally() )
 		    ht &= ~TQSizePolicy::Minimum;
-		if ( !w->sizePolicy().mayShrinkHorizontally() )
+		if ( !w->tqsizePolicy().mayShrinkHorizontally() )
 		    ht &= ~TQSizePolicy::Maximum;
-		if ( w->sizePolicy().mayGrowVertically() )
+		if ( w->tqsizePolicy().mayGrowVertically() )
 		    vt |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkVertically() )
+		if ( w->tqsizePolicy().mayShrinkVertically() )
 		    vt |= TQSizePolicy::Maximum;
 	    }
-	} else if ( ::qt_cast<TQHBoxLayout*>(layout()) ) {
-	    if ( ::qt_cast<TQVBoxLayout*>(parentLayout) )
+	} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
+	    if ( ::tqqt_cast<TQVBoxLayout*>(tqparentLayout) )
 		ht = TQSizePolicy::Minimum;
 	    else
 		ht = TQSizePolicy::Fixed;
@@ -1673,22 +1673,22 @@ void QLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( w->sizePolicy().mayGrowHorizontally() )
+		if ( w->tqsizePolicy().mayGrowHorizontally() )
 		    ht |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkHorizontally() )
+		if ( w->tqsizePolicy().mayShrinkHorizontally() )
 		    ht |= TQSizePolicy::Maximum;
-		if ( !w->sizePolicy().mayGrowVertically() )
+		if ( !w->tqsizePolicy().mayGrowVertically() )
 		    vt &= ~TQSizePolicy::Minimum;
-		if ( !w->sizePolicy().mayShrinkVertically() )
+		if ( !w->tqsizePolicy().mayShrinkVertically() )
 		    vt &= ~TQSizePolicy::Maximum;
 	    }
-	} else if ( ::qt_cast<TQGridLayout*>(layout()) ) {
+	} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
-	    if ( parentLayout ) {
-		if ( ::qt_cast<TQVBoxLayout*>(parentLayout) )
+	    if ( tqparentLayout ) {
+		if ( ::tqqt_cast<TQVBoxLayout*>(tqparentLayout) )
 		    ht = TQSizePolicy::Minimum;
-		else if ( ::qt_cast<TQHBoxLayout*>(parentLayout) )
+		else if ( ::tqqt_cast<TQHBoxLayout*>(tqparentLayout) )
 		    vt = TQSizePolicy::Minimum;
 	    }
 
@@ -1698,22 +1698,30 @@ void QLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( w->sizePolicy().mayGrowHorizontally() )
+		if ( w->tqsizePolicy().mayGrowHorizontally() )
 		    ht |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkHorizontally() )
+		if ( w->tqsizePolicy().mayShrinkHorizontally() )
 		    ht |= TQSizePolicy::Maximum;
-		if ( w->sizePolicy().mayGrowVertically() )
+		if ( w->tqsizePolicy().mayGrowVertically() )
 		    vt |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkVertically() )
+		if ( w->tqsizePolicy().mayShrinkVertically() )
 		    vt |= TQSizePolicy::Maximum;
 	    }
 	}
-	if ( layout()->expanding() & TQSizePolicy::Horizontally )
+#ifdef USE_QT4
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
+#else // USE_QT4
+	if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
+#endif // USE_QT4
 	    ht = TQSizePolicy::Expanding;
-	if ( layout()->expanding() & TQSizePolicy::Vertically )
+#ifdef USE_QT4
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
+#else // USE_QT4
+	if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
+#endif // USE_QT4
 	    vt = TQSizePolicy::Expanding;
 
-	layout()->invalidate();
+	tqlayout()->tqinvalidate();
     }
 
     sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
@@ -1722,13 +1730,13 @@ void QLayoutWidget::updateSizePolicy()
 
 void CustomWidget::paintEvent( TQPaintEvent *e )
 {
-    if ( ::qt_cast<FormWindow*>(parentWidget()) ) {
-	( (FormWindow*)parentWidget() )->paintGrid( this, e );
+    if ( ::tqqt_cast<FormWindow*>(tqparentWidget()) ) {
+	( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
-	p.fillRect( rect(), colorGroup().dark() );
-	p.setPen( colorGroup().light() );
-	p.drawText( 2, 2, width() - 4, height() - 4, Qt::AlignAuto | Qt::AlignTop, cusw->className );
+	p.fillRect( rect(), tqcolorGroup().dark() );
+	p.setPen( tqcolorGroup().light() );
+	p.drawText( 2, 2, width() - 4, height() - 4, TQt::AlignAuto | TQt::AlignTop, cusw->className );
 	p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2,
 		      ( height() - cusw->pixmap->height() ) / 2,
 		      *cusw->pixmap );
@@ -1740,48 +1748,48 @@ CustomWidgetFactory::CustomWidgetFactory()
 {
 }
 
-TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const
+TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const
 {
     MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) );
     if ( !w )
 	return 0;
-    return WidgetFactory::createCustomWidget( parent, name, w );
+    return WidgetFactory::createCustomWidget( tqparent, name, w );
 }
 
 
-QDesignerToolBox::QDesignerToolBox( TQWidget *parent, const char *name )
-    : TQToolBox( parent, name )
+TQDesignerToolBox::TQDesignerToolBox( TQWidget *tqparent, const char *name )
+    : TQToolBox( tqparent, name )
 {
 }
 
-TQString QDesignerToolBox::itemLabel() const
+TQString TQDesignerToolBox::itemLabel() const
 {
     return TQToolBox::itemLabel( currentIndex() );
 }
 
-void QDesignerToolBox::setItemLabel( const TQString &l )
+void TQDesignerToolBox::setItemLabel( const TQString &l )
 {
     TQToolBox::setItemLabel( currentIndex(), l );
 }
 
-TQCString QDesignerToolBox::itemName() const
+TQCString TQDesignerToolBox::itemName() const
 {
     return currentItem() ? currentItem()->name() : 0;
 }
 
-void QDesignerToolBox::setItemName( const TQCString &n )
+void TQDesignerToolBox::setItemName( const TQCString &n )
 {
     if (currentItem())
 	currentItem()->setName( n );
 }
 
 
-Qt::BackgroundMode QDesignerToolBox::itemBackgroundMode() const
+TQt::BackgroundMode TQDesignerToolBox::itemBackgroundMode() const
 {
     return (item(0) ? item(0)->backgroundMode() : PaletteBackground);
 }
 
-void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
+void TQDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
 {
     for (int i = 0; i < count(); ++i) {
 	TQWidget *w = item(i);
@@ -1790,7 +1798,7 @@ void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
     }
 }
 
-void QDesignerToolBox::itemInserted( int index )
+void TQDesignerToolBox::itemInserted( int index )
 {
     if (count() > 1)
 	item(index)->setBackgroundMode(item(index>0?0:1)->backgroundMode());
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index d3d315fc..17f5133b 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,15 +56,15 @@ class TQWidget;
 class TQLayout;
 class FormWindow;
 
-class CustomWidgetFactory : public QWidgetFactory
+class CustomWidgetFactory : public TQWidgetFactory
 {
 public:
     CustomWidgetFactory();
-    TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
+    TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const;
 
 };
 
-class WidgetFactory : public Qt
+class WidgetFactory : public TQt
 {
     friend class CustomWidgetFactory;
 
@@ -76,15 +76,15 @@ public:
 	NoLayout
     };
 
-    static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE,
+    static TQWidget *create( int id, TQWidget *tqparent, const char *name = 0, bool init = TRUE,
 			    const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal );
-    static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
+    static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
     static void deleteLayout( TQWidget *widget );
 
-    static LayoutType layoutType( TQWidget *w );
-    static LayoutType layoutType( TQWidget *w, TQLayout *&layout );
-    static LayoutType layoutType( TQLayout *layout );
-    static TQWidget *layoutParent( TQLayout *layout );
+    static LayoutType tqlayoutType( TQWidget *w );
+    static LayoutType tqlayoutType( TQWidget *w, TQLayout *&tqlayout );
+    static LayoutType tqlayoutType( TQLayout *tqlayout );
+    static TQWidget *tqlayoutParent( TQLayout *tqlayout );
 
     static TQWidget* containerOfWidget( TQWidget *w );
     static TQWidget* widgetOfContainer( TQWidget *w );
@@ -96,7 +96,7 @@ public:
 
     static bool hasSpecialEditor( int id, TQObject *editorWidget );
     static bool hasItems( int id, TQObject *editorWidget );
-    static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
     static bool canResetProperty( TQObject *w, const TQString &propName );
     static bool resetProperty( TQObject *w, const TQString &propName );
@@ -110,23 +110,24 @@ public:
     static TQString defaultSignal( TQObject *w );
 
 private:
-    static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
+    static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init,
 				  const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal );
-    static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w );
+    static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w );
 
     static TQGuardedPtr<TQObject> *lastPassiveInteractor;
     static bool lastWasAPassiveInteractor;
 };
 
 
-class QDesignerTabWidget : public QTabWidget
+class TQDesignerTabWidget : public TQTabWidget
 {
     Q_OBJECT
-    Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+  TQ_OBJECT
+    TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
-    QDesignerTabWidget( TQWidget *parent, const char *name );
+    TQDesignerTabWidget( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -148,13 +149,14 @@ private:
      bool mousePressed;
 };
 
-class QDesignerWidgetStack : public QWidgetStack
+class TQDesignerWidgetStack : public TQWidgetStack
 {
     Q_OBJECT
-    Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+  TQ_OBJECT
+    TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
-    QDesignerWidgetStack( TQWidget *parent, const char *name );
+    TQDesignerWidgetStack( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -191,17 +193,18 @@ private:
 
 };
 
-class QDesignerWizard : public QWizard
+class TQDesignerWizard : public TQWizard
 {
     Q_OBJECT
-    Q_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
-    Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+  TQ_OBJECT
+    TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+    TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
-    QDesignerWizard( TQWidget *parent, const char *name ) 
-        : TQWizard( parent, name ), modal(FALSE) {}
+    TQDesignerWizard( TQWidget *tqparent, const char *name ) 
+        : TQWizard( tqparent, name ), modal(FALSE) {}
 
     int currentPageNum() const;
     void setCurrentPage( int i );
@@ -213,7 +216,7 @@ public:
     void addPage( TQWidget *p, const TQString & );
     void removePage( TQWidget *p );
     void insertPage( TQWidget *p, const TQString &t, int index );
-    bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); }
+    bool isPageRemoved( TQWidget *p ) { return (removedPages.tqfind( p ) != 0); }
 
     bool isModal() const { return modal; }
     void setModal(bool b) { modal = b; }
@@ -224,7 +227,7 @@ private:
     struct Page
     {
 	Page( TQWidget *a, const TQString &b ) : p( a ), t( b ) {}
-	Page() : p( 0 ), t( TQString::null ) {}
+	Page() : p( 0 ), t( TQString() ) {}
 	TQWidget *p;
 	TQString t;
     };
@@ -233,12 +236,13 @@ private:
 
 };
 
-class QLayoutWidget : public QWidget
+class TQLayoutWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {}
+    TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( sizePolicy() ) {}
 
     TQSizePolicy sizePolicy() const;
     void updateSizePolicy();
@@ -251,24 +255,25 @@ protected:
 };
 
 
-class CustomWidget : public QWidget
+class CustomWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
-	: TQWidget( parent, name ), cusw( cw ) {
-	    alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
-	    setSizePolicy( cw->sizePolicy );
+    CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw )
+	: TQWidget( tqparent, name ), cusw( cw ) {
+	    alwaysExpand = tqparentWidget() && tqparentWidget()->inherits( "FormWindow" );
+	    tqsetSizePolicy( cw->sizePolicy );
 	    if ( !alwaysExpand )
 		setBackgroundMode( PaletteDark );
     }
 
-    TQSize sizeHint() const {
-	TQSize sh = cusw->sizeHint;
+    TQSize tqsizeHint() const {
+	TQSize sh = cusw->tqsizeHint;
 	if ( sh.isValid() )
 	    return sh;
-	return TQWidget::sizeHint();
+	return TQWidget::tqsizeHint();
     }
 
     TQString realClassName() { return cusw->className; }
@@ -283,41 +288,43 @@ protected:
 };
 
 
-class Line : public QFrame
+class Line : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_OVERRIDE( int frameWidth DESIGNABLE false )
-    Q_OVERRIDE( Shape frameShape DESIGNABLE false )
-    Q_OVERRIDE( TQRect frameRect DESIGNABLE false )
-    Q_OVERRIDE( TQRect contentsRect DESIGNABLE false )
+    TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
+    TQ_OVERRIDE( int frameWidth DESIGNABLE false )
+    TQ_OVERRIDE( Shape frameShape DESIGNABLE false )
+    TQ_OVERRIDE( TQRect frameRect DESIGNABLE false )
+    TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false )
 public:
-    Line( TQWidget *parent, const char *name )
-	: TQFrame( parent, name, WMouseNoMask ) {
+    Line( TQWidget *tqparent, const char *name )
+	: TQFrame( tqparent, name, WMouseNoMask ) {
 	    setFrameStyle( HLine | Sunken );
     }
 
-    void setOrientation( Orientation orient ) {
-	if ( orient == Horizontal )
+    void setOrientation( Qt::Orientation orient ) {
+	if ( orient ==Qt::Horizontal )
 	    setFrameShape( HLine );
 	else
 	    setFrameShape( VLine );
     }
-    Orientation orientation() const {
-	return frameShape() == HLine ? Horizontal : Vertical;
+    Qt::Orientation orientation() const {
+	return frameShape() == HLine ?Qt::Horizontal :Qt::Vertical;
     }
 };
 
-class QDesignerLabel : public QLabel
+class TQDesignerLabel : public TQLabel
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
+    TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
 
 public:
-    QDesignerLabel( TQWidget *parent = 0, const char *name = 0 )
-	: TQLabel( parent, name ) { myBuddy = 0; }
+    TQDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 )
+	: TQLabel( tqparent, name ) { myBuddy = 0; }
 
     void setBuddyWidget( const TQCString &b ) {
 	myBuddy = b;
@@ -341,14 +348,15 @@ private:
 
 };
 
-class QDesignerWidget : public QWidget
+class TQDesignerWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name )
-	: TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) {
-	    need_frame = parent && parent->inherits("QDesignerWidgetStack" );
+    TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {
+	    need_frame = tqparent && tqparent->inherits("TQDesignerWidgetStack" );
     }
 
 protected:
@@ -361,14 +369,15 @@ private:
 
 };
 
-class QDesignerDialog : public QDialog
+class TQDesignerDialog : public TQDialog
 {
     Q_OBJECT
-    Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+  TQ_OBJECT
+    TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
-    QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name )
-	: TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
+    TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
 
     bool isModal() const { return modal; }
     void setModal(bool b) { modal = b; }
@@ -382,110 +391,115 @@ private:
 
 };
 
-class QDesignerToolButton : public QToolButton
+class TQDesignerToolButton : public TQToolButton
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerToolButton( TQWidget *parent, const char *name )
-	: TQToolButton( parent, name ) {}
+    TQDesignerToolButton( TQWidget *tqparent, const char *name )
+	: TQToolButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 };
 
-class QDesignerRadioButton : public QRadioButton
+class TQDesignerRadioButton : public TQRadioButton
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerRadioButton( TQWidget *parent, const char *name )
-	: TQRadioButton( parent, name ) {}
+    TQDesignerRadioButton( TQWidget *tqparent, const char *name )
+	: TQRadioButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 
 };
 
-class QDesignerPushButton : public QPushButton
+class TQDesignerPushButton : public TQPushButton
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerPushButton( TQWidget *parent, const char *name )
-	: TQPushButton( parent, name ) {}
+    TQDesignerPushButton( TQWidget *tqparent, const char *name )
+	: TQPushButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 
 };
 
-class QDesignerCheckBox : public QCheckBox
+class TQDesignerCheckBox : public TQCheckBox
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerCheckBox( TQWidget *parent, const char *name )
-	: TQCheckBox( parent, name ) {}
+    TQDesignerCheckBox( TQWidget *tqparent, const char *name )
+	: TQCheckBox( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 
 };
 
-class QDesignerToolBox : public QToolBox
+class TQDesignerToolBox : public TQToolBox
 {
     Q_OBJECT
-    Q_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
-    Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
+  TQ_OBJECT
+    TQ_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
+    TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
 
 public:
-    QDesignerToolBox( TQWidget *parent, const char *name );
+    TQDesignerToolBox( TQWidget *tqparent, const char *name );
 
     TQString itemLabel() const;
     void setItemLabel( const TQString &l );
diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui
index 45450be2..745115ca 100644
--- a/kdevdesigner/designer/wizardeditor.ui
+++ b/kdevdesigner/designer/wizardeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>WizardEditorBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout19</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout14</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <property name="spacing">
                             <number>2</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>pagesLabel</cstring>
                             </property>
@@ -86,14 +86,14 @@
                                 <string>Wizard pages:</string>
                             </property>
                         </widget>
-                        <widget class="QListBox">
+                        <widget class="TQListBox">
                             <property name="name">
                                 <cstring>listBox</cstring>
                             </property>
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout18</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonAdd</cstring>
                             </property>
@@ -115,7 +115,7 @@
                                 <string>A&amp;dd</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonRemove</cstring>
                             </property>
@@ -133,14 +133,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonUp</cstring>
                             </property>
@@ -151,7 +151,7 @@
                                 <pixmap>"designer_s_up.png"</pixmap>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonDown</cstring>
                             </property>
@@ -166,7 +166,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -180,7 +180,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -201,14 +201,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -225,7 +225,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -239,7 +239,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -319,7 +319,7 @@
         <slot>cancelClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">addClicked()</slot>
@@ -332,11 +332,11 @@
     <slot access="protected">okClicked()</slot>
     <slot access="protected">removeClicked()</slot>
     <slot access="protected">upClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index 21e20c63..587f46d3 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/kdevdesigner/designer/wizardeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,8 +38,8 @@
 
 #include <klocale.h>
 
-WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
-    : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
+WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw )
+    : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     fillListBox();
@@ -130,7 +130,7 @@ void WizardEditor::addClicked()
     listBox->insertItem( i18n( "Page" ), index );
 
     // schedule add command
-    AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wizard->name() ),
+    AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wizard->name() ),
 							  formwindow, wizard, "Page", index, FALSE);
     commands.append( cmd );
 
@@ -149,7 +149,7 @@ void WizardEditor::removeClicked()
 
     // schedule remove command
     DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" )
-								.arg( listBox->text( index ) ).arg( wizard->name() ),
+								.tqarg( listBox->text( index ) ).tqarg( wizard->name() ),
 								formwindow, wizard, index, FALSE );
     commands.append( cmd );
 
@@ -169,8 +169,8 @@ void WizardEditor::upClicked()
     listBox->setCurrentItem( index2 );
 
     // schedule swap command
-    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 )
-							     .arg( wizard->name() ), formwindow, wizard, index1, index2);
+    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 )
+							     .tqarg( wizard->name() ), formwindow, wizard, index1, index2);
     commands.append( cmd );
 
     // update buttons
@@ -189,7 +189,7 @@ void WizardEditor::downClicked()
     listBox->setCurrentItem( index2 );
 
     // schedule swap command
-    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ).arg( wizard->name() ), formwindow, wizard, index2, index1);
+    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ).tqarg( wizard->name() ), formwindow, wizard, index2, index1);
     commands.append( cmd );
 
     // update buttons
@@ -215,9 +215,9 @@ void WizardEditor::itemHighlighted( int )
 void WizardEditor::itemSelected( int index )
 {
     if ( index < 0 ) return;
-    // Called when Qt::Key_Enter was pressed.
+    // Called when TQt::Key_Enter was pressed.
     // ListBoxRename has renamed the list item, so we only need to rename the page to the same name.
-    TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) );
+    TQString pn( i18n( "Rename page %1 of %2" ).tqarg( wizard->title( wizard->page( index ) ) ).tqarg( wizard->name() ) );
 	RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) );
 	commands.append( cmd );
 }
@@ -248,6 +248,6 @@ void WizardEditor::itemDropped( TQListBoxItem * i )
     int droppedItem = listBox->index( i );
 
     //qDebug( "Moving page %d -> %d", draggedItem, droppedItem );
-    MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
+    MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).tqarg( draggedItem ).tqarg( droppedItem ).tqarg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
     commands.append( cmd );
 }
diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h
index 9e2eff4d..94a9e900 100644
--- a/kdevdesigner/designer/wizardeditorimpl.h
+++ b/kdevdesigner/designer/wizardeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,9 +38,10 @@ class FormWindow;
 class WizardEditor : public WizardEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw );
+    WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw );
     ~WizardEditor();
 
 protected slots:
diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 9977c2ab..fe62a4ec 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/kdevdesigner/designer/workspace.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -53,8 +53,8 @@
 
 #include <klocale.h>
 
-WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p )
+    : TQListViewItem( tqparent )
 {
     init();
     project = p;
@@ -63,8 +63,8 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
     setExpandable( FALSE );
 }
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf )
+    : TQListViewItem( tqparent )
 {
     init();
     sourceFile = sf;
@@ -72,8 +72,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
     setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
 }
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p )
+    : TQListViewItem( tqparent )
 {
     init();
     object = o;
@@ -84,8 +84,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
 		      listView(), TQT_SLOT( update() ) );
 }
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type )
+    : TQListViewItem( tqparent )
 {
     init();
     formFile = ff;
@@ -115,16 +115,16 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 {
     TQColorGroup g( cg );
     g.setColor( TQColorGroup::Base, backgroundColor() );
-    g.setColor( TQColorGroup::Foreground, Qt::black );
+    g.setColor( TQColorGroup::Foreground, TQt::black );
 
     if ( type() == FormSourceType &&
 	 ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) &&
-	 parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project &&
-	 ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) {
-	g.setColor( TQColorGroup::Text, listView()->palette().disabled().color( TQColorGroup::Text) );
-	g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) );
+	 tqparent() && tqparent()->tqparent() && ( (WorkspaceItem*)tqparent()->tqparent() )->project &&
+	 ( (WorkspaceItem*)tqparent()->tqparent() )->project->isCpp() ) {
+	g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
+	g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
     } else {
-	g.setColor( TQColorGroup::Text, Qt::black );
+	g.setColor( TQColorGroup::Text, TQt::black );
     }
     p->save();
 
@@ -177,7 +177,7 @@ TQString WorkspaceItem::text( int column ) const
 	return project->qualifiedName( object );
     }
 
-    return TQString::null; // shut up compiler
+    return TQString(); // shut up compiler
 }
 
 void WorkspaceItem::fillCompletionList( TQStringList& completion )
@@ -252,8 +252,8 @@ TQString WorkspaceItem::key( int column, bool ) const
 TQColor WorkspaceItem::backgroundColor()
 {
     bool b = useOddColor;
-    if ( t == FormSourceType && parent() )
-	b = ( ( WorkspaceItem*)parent() )->useOddColor;
+    if ( t == FormSourceType && tqparent() )
+	b = ( ( WorkspaceItem*)tqparent() )->useOddColor;
     return b ? *backColor2 : *backColor1;
 }
 
@@ -270,8 +270,8 @@ void WorkspaceItem::setAutoOpen( bool b )
     autoOpen = b;
 }
 
-Workspace::Workspace( TQWidget *parent, MainWindow *mw )
-    : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+Workspace::Workspace( TQWidget *tqparent, MainWindow *mw )
+    : TQListView( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
 		 WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ),
 	project( 0 ), completionDirty( FALSE )
 {
@@ -284,7 +284,7 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw )
     header()->hide();
     setSorting( 0 );
     setResizePolicy( TQScrollView::Manual );
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     TQPalette p( palette() );
     p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
     (void)*selectedBack; // hack
@@ -419,9 +419,9 @@ void Workspace::update( FormFile* ff )
 {
     TQListViewItem* i = findItem( ff );
     if ( i ) {
-	i->repaint();
+	i->tqrepaint();
 	if ( (i = i->firstChild()) )
-	    i->repaint();
+	    i->tqrepaint();
     }
 }
 
@@ -499,7 +499,7 @@ void Workspace::closeAutoOpenItems()
     TQListViewItemIterator it( this );
     for ( ; it.current(); ++it ) {
 	WorkspaceItem* i = (WorkspaceItem*) it.current();
-	WorkspaceItem* ip = (WorkspaceItem*) i->parent();
+	WorkspaceItem* ip = (WorkspaceItem*) i->tqparent();
 	if ( i->type() == WorkspaceItem::FormSourceType ) {
 	    if ( !i->isSelected() && !ip->isSelected()
 		 && ip->isAutoOpen() ) {
@@ -523,7 +523,7 @@ void Workspace::itemDoubleClicked( TQListViewItem *i )
 
 void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& )
 {
-    if ( !i || button != LeftButton )
+    if ( !i || button != Qt::LeftButton )
 	return;
 
     closeAutoOpenItems();
@@ -640,7 +640,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
     case OPEN_SOURCE:
     case OPEN_FORM:
     case OPEN_FORM_SOURCE:
-	itemClicked( LeftButton, i, pos );
+	itemClicked( Qt::LeftButton, i, pos );
 	break;
     }
 }
@@ -648,12 +648,12 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
 bool Workspace::eventFilter( TQObject *o, TQEvent * e )
 {
     // Reggie, on what type of events do we have to execute updateBufferEdit()
-    if ( o ==bufferEdit && e->type() != TQEvent::ChildRemoved )
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(bufferEdit) && e->type() != TQEvent::ChildRemoved )
 	updateBufferEdit();
     return TQListView::eventFilter( o, e );
 }
 
-void Workspace::setBufferEdit( QCompletionEdit *edit )
+void Workspace::setBufferEdit( TQCompletionEdit *edit )
 {
     bufferEdit = edit;
     connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ),
@@ -681,7 +681,7 @@ void Workspace::bufferChosen( const TQString &buffer )
     if ( bufferEdit )
 	bufferEdit->setText( "" );
 
-    if ( MainWindow::self->projectFileNames().contains( buffer ) ) {
+    if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) {
 	MainWindow::self->setCurrentProjectByFilename( buffer );
 	return;
     }
@@ -689,7 +689,7 @@ void Workspace::bufferChosen( const TQString &buffer )
     TQListViewItemIterator it( this );
     while ( it.current() ) {
 	if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) {
-	    itemClicked( LeftButton, it.current(), TQPoint() );
+	    itemClicked( Qt::LeftButton, it.current(), TQPoint() );
 	    break;
 	}
 	++it;
diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h
index 344046f6..b32cd16a 100644
--- a/kdevdesigner/designer/workspace.h
+++ b/kdevdesigner/designer/workspace.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -39,18 +39,18 @@ class MainWindow;
 class Project;
 class SourceFile;
 class FormFile;
-class QCompletionEdit;
+class TQCompletionEdit;
 class SourceEditor;
 
-class WorkspaceItem : public QListViewItem
+class WorkspaceItem : public TQListViewItem
 {
 public:
     enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType };
 
-    WorkspaceItem( TQListView *parent, Project* p );
-    WorkspaceItem( TQListViewItem *parent, SourceFile* sf );
-    WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType );
-    WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p );
+    WorkspaceItem( TQListView *tqparent, Project* p );
+    WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf );
+    WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType );
+    WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p );
 
     void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
 
@@ -84,12 +84,13 @@ private:
     Type t;
 };
 
-class Workspace : public QListView
+class Workspace : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    Workspace( TQWidget *parent , MainWindow *mw );
+    Workspace( TQWidget *tqparent , MainWindow *mw );
 
     void setCurrentProject( Project *pro );
 
@@ -97,7 +98,7 @@ public:
     void contentsDragEnterEvent( TQDragEnterEvent *e );
     void contentsDragMoveEvent( TQDragMoveEvent *e );
 
-    void setBufferEdit( QCompletionEdit *edit );
+    void setBufferEdit( TQCompletionEdit *edit );
 
 public slots:
 
@@ -140,7 +141,7 @@ private:
     MainWindow *mainWindow;
     Project *project;
     WorkspaceItem *projectItem;
-    QCompletionEdit *bufferEdit;
+    TQCompletionEdit *bufferEdit;
     bool blockNewForms;
     void updateBufferEdit();
     bool completionDirty;
diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h
index 61c0cf51..ce5f844c 100644
--- a/kdevdesigner/interfaces/actioninterface.h
+++ b/kdevdesigner/interfaces/actioninterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,26 +27,26 @@
 #ifndef ACTIONINTERFACE_H
 #define ACTIONINTERFACE_H
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 
 class TQAction;
 class TQObject;
 
 // {bb206e09-84e5-4777-9fce-706babfab931}
 #ifndef IID_Action
-#define IID_Action QUuid( 0xbb206e09, 0x84e5, 0x4777, 0x9f, 0xce, 0x70, 0x6b, 0xab, 0xfa, 0xb9, 0x31 )
+#define IID_Action TQUuid( 0xbb206e09, 0x84e5, 0x4777, 0x9f, 0xce, 0x70, 0x6b, 0xab, 0xfa, 0xb9, 0x31 )
 #endif
 
-/*! To add actions to the Qt Designer menubars and toolbars, implement
+/*! To add actions to the TQt Designer menubars and toolbars, implement
   this interface. You have to implement the create(), group() and
   connectTo() functions.
 
   You also have to implement the function featureList() (\sa
-  QFeatureListInterface) to return the names of all actions
+  TQFeatureListInterface) to return the names of all actions
   which this interface provides.
 */
 
-class ActionInterface : public QFeatureListInterface
+class ActionInterface : public TQFeatureListInterface
 {
 public:
     enum Location {
@@ -55,12 +55,12 @@ public:
     };
 
     /*! This functions is called to create the action with the name \a
-      name. \a parent should be used as parent of the action.
+      name. \a tqparent should be used as tqparent of the action.
 
       In the implementation return the TQAction object for the action
       \a name.
     */
-    virtual TQAction* create( const TQString &name, TQObject* parent = 0 ) = 0;
+    virtual TQAction* create( const TQString &name, TQObject* tqparent = 0 ) = 0;
 
     /*! In the implementation of the interface return the name of the
       group of the action \a name.
@@ -72,7 +72,7 @@ public:
     virtual bool location( const TQString &name, Location l ) const = 0;
 
     /*! \internal */
-    virtual void connectTo( QUnknownInterface *appInterface ) = 0;
+    virtual void connectTo( TQUnknownInterface *appInterface ) = 0;
 };
 
 #endif
diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h
index 24915cb5..320f3d88 100644
--- a/kdevdesigner/interfaces/classbrowserinterface.h
+++ b/kdevdesigner/interfaces/classbrowserinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,20 +40,20 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqobject.h>
 class TQListView;
 
 // {4ede3c32-ae96-4b7a-9e38-9f1d93592391}
 #ifndef IID_ClassBrowser
-#define IID_ClassBrowser QUuid( 0x4ede3c32, 0xae96, 0x4b7a, 0x9e, 0x38, 0x9f, 0x1d, 0x93, 0x59, 0x23, 0x91 )
+#define IID_ClassBrowser TQUuid( 0x4ede3c32, 0xae96, 0x4b7a, 0x9e, 0x38, 0x9f, 0x1d, 0x93, 0x59, 0x23, 0x91 )
 #endif
 
-struct ClassBrowserInterface : public QUnknownInterface
+struct ClassBrowserInterface : public TQUnknownInterface
 {
     enum Type { Class, Function };
 
-    virtual TQListView *createClassBrowser( TQWidget *parent ) const = 0;
+    virtual TQListView *createClassBrowser( TQWidget *tqparent ) const = 0;
     virtual void update( const TQString &code ) const = 0;
     virtual void clear() const = 0;
 
diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h
index 6fbefe53..d7f0667b 100644
--- a/kdevdesigner/interfaces/designerinterface.h
+++ b/kdevdesigner/interfaces/designerinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqmap.h>
@@ -67,14 +67,14 @@ class TQSqlDatabase;
 
 // {0e661da-f45c-4830-af47-03ec53eb1633}
 #ifndef IID_Designer
-#define IID_Designer QUuid( 0xa0e661da, 0xf45c, 0x4830, 0xaf, 0x47, 0x3, 0xec, 0x53, 0xeb, 0x16, 0x33 )
+#define IID_Designer TQUuid( 0xa0e661da, 0xf45c, 0x4830, 0xaf, 0x47, 0x3, 0xec, 0x53, 0xeb, 0x16, 0x33 )
 #endif
 
-/*! These are the interfaces implemented by the Qt Designer which should
-  be used by plugins to access and use functionality of the Qt Designer.
+/*! These are the interfaces implemented by the TQt Designer which should
+  be used by plugins to access and use functionality of the TQt Designer.
 */
 
-struct DesignerInterface : public QUnknownInterface
+struct DesignerInterface : public TQUnknownInterface
 {
     virtual DesignerProject *currentProject() const = 0;
     virtual DesignerFormWindow *currentForm() const = 0;
@@ -180,7 +180,7 @@ struct DesignerFormWindow
     virtual bool isModified() const = 0;
     virtual void insertWidget( TQWidget * ) = 0;
     virtual void removeWidget( TQWidget * ) = 0;
-    virtual TQWidget *create( const char *className, TQWidget *parent, const char *name ) = 0;
+    virtual TQWidget *create( const char *className, TQWidget *tqparent, const char *name ) = 0;
     virtual TQWidgetList widgets() const = 0;
     virtual void undo() = 0;
     virtual void redo() = 0;
@@ -190,14 +190,14 @@ struct DesignerFormWindow
     virtual void adjustSize() = 0;
     virtual void editConnections() = 0;
     virtual void checkAccels() = 0;
-    virtual void layoutH() = 0;
-    virtual void layoutV() = 0;
-    virtual void layoutHSplit() = 0;
-    virtual void layoutVSplit() = 0;
-    virtual void layoutG() = 0;
-    virtual void layoutHContainer( TQWidget* w ) = 0;
-    virtual void layoutVContainer( TQWidget* w ) = 0;
-    virtual void layoutGContainer( TQWidget* w ) = 0;
+    virtual void tqlayoutH() = 0;
+    virtual void tqlayoutV() = 0;
+    virtual void tqlayoutHSplit() = 0;
+    virtual void tqlayoutVSplit() = 0;
+    virtual void tqlayoutG() = 0;
+    virtual void tqlayoutHContainer( TQWidget* w ) = 0;
+    virtual void tqlayoutVContainer( TQWidget* w ) = 0;
+    virtual void tqlayoutGContainer( TQWidget* w ) = 0;
     virtual void breakLayout() = 0;
     virtual void selectWidget( TQWidget * w ) = 0;
     virtual void selectAll() = 0;
@@ -209,7 +209,7 @@ struct DesignerFormWindow
     virtual void setCurrentWidget( TQWidget * ) = 0;
     virtual TQPtrList<TQAction> actionList() const = 0;
     virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
-				   TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0;
+				   TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) = 0;
     virtual void addAction( TQAction * ) = 0;
     virtual void removeAction( TQAction * ) = 0;
     virtual void preview() const = 0;
diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h
index 2cb1025e..02fa1bf4 100644
--- a/kdevdesigner/interfaces/editorinterface.h
+++ b/kdevdesigner/interfaces/editorinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
@@ -50,10 +50,10 @@ class TQObject;
 
 // {8668161a-6037-4220-86b6-ccaa20127df8}
 #ifndef IID_Editor
-#define IID_Editor QUuid( 0x8668161a, 0x6037, 0x4220, 0x86, 0xb6, 0xcc, 0xaa, 0x20, 0x12, 0x7d, 0xf8 )
+#define IID_Editor TQUuid( 0x8668161a, 0x6037, 0x4220, 0x86, 0xb6, 0xcc, 0xaa, 0x20, 0x12, 0x7d, 0xf8 )
 #endif
 
-struct EditorInterface : public QUnknownInterface
+struct EditorInterface : public TQUnknownInterface
 {
     enum Mode
     {
@@ -62,8 +62,8 @@ struct EditorInterface : public QUnknownInterface
     };
 
     virtual TQWidget *editor( bool readOnly,
-			     TQWidget *parent,
-			     QUnknownInterface *designerIface ) = 0;
+			     TQWidget *tqparent,
+			     TQUnknownInterface *designerIface ) = 0;
 
     virtual void setText( const TQString &txt ) = 0;
     virtual TQString text() const = 0;
@@ -75,8 +75,8 @@ struct EditorInterface : public QUnknownInterface
     virtual void copy() = 0;
     virtual void paste() = 0;
     virtual void selectAll() = 0;
-    virtual bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0;
-    virtual bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0;
+    virtual bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0;
+    virtual bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0;
     virtual void gotoLine( int line ) = 0;
     virtual void indent() = 0;
     virtual void scrollTo( const TQString &txt, const TQString &first ) = 0;
diff --git a/kdevdesigner/interfaces/filterinterface.h b/kdevdesigner/interfaces/filterinterface.h
index bb6b94b8..abca17b4 100644
--- a/kdevdesigner/interfaces/filterinterface.h
+++ b/kdevdesigner/interfaces/filterinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,26 +27,26 @@
 #ifndef FILTERINTERFACE_H
 #define FILTERINTERFACE_H
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 
 // {ea8cb381-59b5-44a8-bae5-9bea8295762a}
 #ifndef IID_ImportFilter
-#define IID_ImportFilter QUuid( 0xea8cb381, 0x59b5, 0x44a8, 0xba, 0xe5, 0x9b, 0xea, 0x82, 0x95, 0x76, 0x2a )
+#define IID_ImportFilter TQUuid( 0xea8cb381, 0x59b5, 0x44a8, 0xba, 0xe5, 0x9b, 0xea, 0x82, 0x95, 0x76, 0x2a )
 #endif
 
 /*! If you write a filter plugin to import dialogs or other user
-  interfaces from a different format than .ui into the Qt Designer,
+  interfaces from a different format than .ui into the TQt Designer,
   implement this interface in that plugin.
 
   You also have to implement the function featureList() (\sa
-  QFeatureListInterface) and return there all filters (names of it)
+  TQFeatureListInterface) and return there all filters (names of it)
   which this interface provides.
 */
 
-struct ImportFilterInterface : public QFeatureListInterface
+struct ImportFilterInterface : public TQFeatureListInterface
 {
-    /*! This function is called by Qt Designer to open the file \a
-      filename using the filter \a filter. Qt Designer expects to get
+    /*! This function is called by TQt Designer to open the file \a
+      filename using the filter \a filter. TQt Designer expects to get
       back one or more .ui files, which it can open then. In the
       implementation of the interface you have to return these
       filenames, which the filter created, in this function.*/
@@ -57,10 +57,10 @@ struct ImportFilterInterface : public QFeatureListInterface
 
 // {c32a07e0-b006-471e-afca-d227457a1280}
 #ifndef IID_ExportFilterInterface
-#define IID_ExportFilterInterface QUuid( 0xc32a07e0, 0xb006, 0x471e, 0xaf, 0xca, 0xd2, 0x27, 0x45, 0x7a, 0x12, 0x80 )
+#define IID_ExportFilterInterface TQUuid( 0xc32a07e0, 0xb006, 0x471e, 0xaf, 0xca, 0xd2, 0x27, 0x45, 0x7a, 0x12, 0x80 )
 #endif
 
-struct ExportFilterInterface : public QFeatureListInterface
+struct ExportFilterInterface : public TQFeatureListInterface
 {
 //    virtual TQStringList export( const TQString& filter, const TQString& filename ) = 0;
 };
diff --git a/kdevdesigner/interfaces/interpreterinterface.h b/kdevdesigner/interfaces/interpreterinterface.h
index 20648a38..fd6a86d3 100644
--- a/kdevdesigner/interfaces/interpreterinterface.h
+++ b/kdevdesigner/interfaces/interpreterinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,16 +40,16 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 
 class TQObject;
 
 // {11cad9ec-4e3c-418b-8e90-e1b8c0c1f48f}
 #ifndef IID_Interpreter
-#define IID_Interpreter QUuid( 0x11cad9ec, 0x4e3c, 0x418b, 0x8e, 0x90, 0xe1, 0xb8, 0xc0, 0xc1, 0xf4, 0x8f )
+#define IID_Interpreter TQUuid( 0x11cad9ec, 0x4e3c, 0x418b, 0x8e, 0x90, 0xe1, 0xb8, 0xc0, 0xc1, 0xf4, 0x8f )
 #endif
 
-struct InterpreterInterface : public QUnknownInterface
+struct InterpreterInterface : public TQUnknownInterface
 {
     virtual void setBreakPoints( TQObject *obj, const TQValueList<uint> &lst ) = 0;
 };
diff --git a/kdevdesigner/interfaces/languageinterface.h b/kdevdesigner/interfaces/languageinterface.h
index 4b12e5b9..31e9f013 100644
--- a/kdevdesigner/interfaces/languageinterface.h
+++ b/kdevdesigner/interfaces/languageinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
@@ -48,10 +48,10 @@
 
 // {f208499a-6f69-4883-9219-6e936e55a330}
 #ifndef IID_Language
-#define IID_Language QUuid( 0xf208499a, 0x6f69, 0x4883, 0x92, 0x19, 0x6e, 0x93, 0x6e, 0x55, 0xa3, 0x30 )
+#define IID_Language TQUuid( 0xf208499a, 0x6f69, 0x4883, 0x92, 0x19, 0x6e, 0x93, 0x6e, 0x55, 0xa3, 0x30 )
 #endif
 
-struct LanguageInterface : public QUnknownInterface
+struct LanguageInterface : public TQUnknownInterface
 {
     struct Function
     {
@@ -96,8 +96,8 @@ struct LanguageInterface : public QUnknownInterface
     virtual TQString createArguments( const TQString &cpp_signature ) = 0;
     virtual TQString createEmptyFunction() = 0;
     virtual TQStringList definitions() const = 0;
-    virtual TQStringList definitionEntries( const TQString &definition, QUnknownInterface *designerIface ) const = 0;
-    virtual void setDefinitionEntries( const TQString &definition, const TQStringList &entries, QUnknownInterface *designerIface ) = 0;
+    virtual TQStringList definitionEntries( const TQString &definition, TQUnknownInterface *designerIface ) const = 0;
+    virtual void setDefinitionEntries( const TQString &definition, const TQStringList &entries, TQUnknownInterface *designerIface ) = 0;
     virtual bool supports( Support s ) const = 0;
     virtual TQStringList fileFilterList() const = 0;
     virtual TQStringList fileExtensionList() const = 0;
diff --git a/kdevdesigner/interfaces/preferenceinterface.h b/kdevdesigner/interfaces/preferenceinterface.h
index 43f72019..ba972933 100644
--- a/kdevdesigner/interfaces/preferenceinterface.h
+++ b/kdevdesigner/interfaces/preferenceinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,16 +40,16 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqwidgetlist.h>
 #include <tqcstring.h>
 
 // {5c168ee7-4bee-469f-9995-6afdb04ce5a2}
 #ifndef IID_Preference
-#define IID_Preference QUuid( 0x5c168ee7, 0x4bee, 0x469f, 0x99, 0x95, 0x6a, 0xfd, 0xb0, 0x4c, 0xe5, 0xa2 )
+#define IID_Preference TQUuid( 0x5c168ee7, 0x4bee, 0x469f, 0x99, 0x95, 0x6a, 0xfd, 0xb0, 0x4c, 0xe5, 0xa2 )
 #endif
 
-struct PreferenceInterface : public QUnknownInterface
+struct PreferenceInterface : public TQUnknownInterface
 {
     struct Preference
     {
@@ -61,7 +61,7 @@ struct PreferenceInterface : public QUnknownInterface
     };
 
     virtual Preference *preference() = 0;
-    virtual void connectTo( QUnknownInterface *appInterface ) = 0;
+    virtual void connectTo( TQUnknownInterface *appInterface ) = 0;
     virtual void deletePreferenceObject( Preference * ) = 0;
 };
 
diff --git a/kdevdesigner/interfaces/projectsettingsiface.h b/kdevdesigner/interfaces/projectsettingsiface.h
index 9bbfc31c..d8d39097 100644
--- a/kdevdesigner/interfaces/projectsettingsiface.h
+++ b/kdevdesigner/interfaces/projectsettingsiface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,16 +40,16 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqwidgetlist.h>
 #include <tqcstring.h>
 
 // {d332785d-17fb-4894-84fe-50dbd0ad9512}
 #ifndef IID_ProjectSettings
-#define IID_ProjectSettings QUuid( 0xd332785d, 0x17fb, 0x4894, 0x84, 0xfe, 0x50, 0xdb, 0xd0, 0xad, 0x95, 0x12 )
+#define IID_ProjectSettings TQUuid( 0xd332785d, 0x17fb, 0x4894, 0x84, 0xfe, 0x50, 0xdb, 0xd0, 0xad, 0x95, 0x12 )
 #endif
 
-struct ProjectSettingsInterface : public QUnknownInterface
+struct ProjectSettingsInterface : public TQUnknownInterface
 {
     struct ProjectSettings
     {
@@ -62,7 +62,7 @@ struct ProjectSettingsInterface : public QUnknownInterface
 
     virtual ProjectSettings *projectSetting() = 0;
     virtual TQStringList projectSettings() const = 0;
-    virtual void connectTo( QUnknownInterface *appInterface ) = 0;
+    virtual void connectTo( TQUnknownInterface *appInterface ) = 0;
     virtual void deleteProjectSettingsObject( ProjectSettings * ) = 0;
 };
 
diff --git a/kdevdesigner/interfaces/sourcetemplateiface.h b/kdevdesigner/interfaces/sourcetemplateiface.h
index b9c58b8d..cc54f274 100644
--- a/kdevdesigner/interfaces/sourcetemplateiface.h
+++ b/kdevdesigner/interfaces/sourcetemplateiface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,15 +40,15 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include <tqstring.h>
 
 // {1b3446a4-1c71-424b-8789-1f34eb5697d8}
 #ifndef IID_SourceTemplate
-#define IID_SourceTemplate QUuid( 0x1b3446a4, 0x1c71, 0x424b, 0x87, 0x89, 0x1f, 0x34, 0xeb, 0x56, 0x97, 0xd8 )
+#define IID_SourceTemplate TQUuid( 0x1b3446a4, 0x1c71, 0x424b, 0x87, 0x89, 0x1f, 0x34, 0xeb, 0x56, 0x97, 0xd8 )
 #endif
 
-struct SourceTemplateInterface : public QFeatureListInterface
+struct SourceTemplateInterface : public TQFeatureListInterface
 {
     struct Source
     {
@@ -57,7 +57,7 @@ struct SourceTemplateInterface : public QFeatureListInterface
 	TQString filename;
 	TQString extension;
     };
-    virtual Source create( const TQString &templ, QUnknownInterface *appIface ) = 0;
+    virtual Source create( const TQString &templ, TQUnknownInterface *appIface ) = 0;
     virtual TQString language( const TQString &templ ) const = 0;
 
 };
diff --git a/kdevdesigner/interfaces/templatewizardiface.h b/kdevdesigner/interfaces/templatewizardiface.h
index 1e00740c..561b5264 100644
--- a/kdevdesigner/interfaces/templatewizardiface.h
+++ b/kdevdesigner/interfaces/templatewizardiface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,20 +40,20 @@
 //
 //
 
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 
 class TQWidget;
 struct DesignerFormWindow;
 
 // {983d3eab-fea3-49cc-97ad-d8cc89b7c17b}
 #ifndef IID_TemplateWizard
-#define IID_TemplateWizard QUuid( 0x983d3eab, 0xfea3, 0x49cc, 0x97, 0xad, 0xd8, 0xcc, 0x89, 0xb7, 0xc1, 0x7b )
+#define IID_TemplateWizard TQUuid( 0x983d3eab, 0xfea3, 0x49cc, 0x97, 0xad, 0xd8, 0xcc, 0x89, 0xb7, 0xc1, 0x7b )
 #endif
 
-class TemplateWizardInterface : public QFeatureListInterface
+class TemplateWizardInterface : public TQFeatureListInterface
 {
 public:
-    virtual void setup( const TQString &templ, TQWidget *widget, DesignerFormWindow *fw, QUnknownInterface *appIface ) = 0;
+    virtual void setup( const TQString &templ, TQWidget *widget, DesignerFormWindow *fw, TQUnknownInterface *appIface ) = 0;
 
 };
 
diff --git a/kdevdesigner/interfaces/widgetinterface.h b/kdevdesigner/interfaces/widgetinterface.h
index 9b6d8f8e..dea77857 100644
--- a/kdevdesigner/interfaces/widgetinterface.h
+++ b/kdevdesigner/interfaces/widgetinterface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 #ifndef WIDGETINTERFACE_H
 #define WIDGETINTERFACE_H
 
-#include <private/qwidgetinterface_p.h>
+#include <private/tqwidgetinterface_p.h>
 
-#define WidgetInterface QWidgetFactoryInterface
-#define IID_Widget IID_QWidgetFactory
+#define WidgetInterface TQWidgetFactoryInterface
+#define IID_Widget IID_TQWidgetFactory
 
 #endif
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp
index 53ce2ba8..ac4f8326 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.cpp
+++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp
@@ -2,15 +2,15 @@
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -18,7 +18,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,20 +32,20 @@
 //#include "yyreg.h"
 #include <tqmetaobject.h>
 
-LanguageInterfaceImpl::LanguageInterfaceImpl( QUnknownInterface *outer )
-    : parent( outer ), ref( 0 )
+LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer )
+    : tqparent( outer ), ref( 0 )
 {
 }
 
 ulong LanguageInterfaceImpl::addRef()
 {
-    return parent ? parent->addRef() : ref++;
+    return tqparent ? tqparent->addRef() : ref++;
 }
 
 ulong LanguageInterfaceImpl::release()
 {
-    if ( parent )
-	return parent->release();
+    if ( tqparent )
+	return tqparent->release();
     if ( !--ref ) {
 	delete this;
 	return 0;
@@ -53,25 +53,25 @@ ulong LanguageInterfaceImpl::release()
     return ref;
 }
 
-QRESULT LanguageInterfaceImpl::queryInterface( const QUuid &uuid, QUnknownInterface** iface )
+TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface )
 {
-    if ( parent )
-	return parent->queryInterface( uuid, iface );
+    if ( tqparent )
+	return tqparent->queryInterface( uuid, iface );
 
     *iface = 0;
-    if ( uuid == IID_QUnknown )
-	*iface = (QUnknownInterface*)this;
+    if ( uuid == IID_TQUnknown )
+	*iface = (TQUnknownInterface*)this;
     else if ( uuid == IID_Language )
 	*iface = (LanguageInterface*)this;
     else
-	return QE_NOINTERFACE;
+	return TQE_NOINTERFACE;
 
     (*iface)->addRef();
-    return QS_OK;
+    return TQS_OK;
 }
 
 
-class NormalizeObject : public QObject
+class NormalizeObject : public TQObject
 {
 public:
     NormalizeObject() : TQObject() {}
@@ -86,9 +86,9 @@ void LanguageInterfaceImpl::functions( const TQString &code, TQValueList<Functio
 	Function func;
 	func.name = (*it).prototype();
 	func.name.remove( 0, (*it).returnType().length() );
-	if ( func.name.find( "::" ) == -1 )
+	if ( func.name.tqfind( "::" ) == -1 )
 	    continue;
-	func.name.remove( (uint)0, func.name.find( "::" ) + 2 );
+	func.name.remove( (uint)0, func.name.tqfind( "::" ) + 2 );
 	func.body = (*it).body();
 	func.returnType = (*it).returnType();
 	func.start = (*it).functionStartLineNum();
@@ -111,10 +111,10 @@ TQStringList LanguageInterfaceImpl::definitions() const
     return lst;
 }
 
-TQStringList LanguageInterfaceImpl::definitionEntries( const TQString &definition, QUnknownInterface *designerIface ) const
+TQStringList LanguageInterfaceImpl::definitionEntries( const TQString &definition, TQUnknownInterface *designerIface ) const
 {
     DesignerInterface *iface = 0;
-    designerIface->queryInterface( IID_Designer, (QUnknownInterface**) &iface );
+    designerIface->queryInterface( IID_Designer, (TQUnknownInterface**) &iface );
     if ( !iface )
 	return TQStringList();
     DesignerFormWindow *fw = iface->currentForm();
@@ -134,10 +134,10 @@ TQStringList LanguageInterfaceImpl::definitionEntries( const TQString &definitio
     return lst;
 }
 
-void LanguageInterfaceImpl::setDefinitionEntries( const TQString &definition, const TQStringList &entries, QUnknownInterface *designerIface )
+void LanguageInterfaceImpl::setDefinitionEntries( const TQString &definition, const TQStringList &entries, TQUnknownInterface *designerIface )
 {
     DesignerInterface *iface = 0;
-    designerIface->queryInterface( IID_Designer, (QUnknownInterface**) &iface );
+    designerIface->queryInterface( IID_Designer, (TQUnknownInterface**) &iface );
     if ( !iface )
 	return;
     DesignerFormWindow *fw = iface->currentForm();
@@ -195,7 +195,7 @@ void LanguageInterfaceImpl::sourceProjectKeys( TQStringList &keys ) const
     keys << "HEADERS" << "SOURCES";
 }
 
- class CheckObject : public QObject
+ class CheckObject : public TQObject
 {
 public:
     CheckObject() {}
@@ -231,7 +231,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten
 TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const
 {
     TQStrList sigs;
-    sigs = obj->metaObject()->signalNames( TRUE );
+    sigs = obj->tqmetaObject()->signalNames( TRUE );
     sigs.remove( "destroyed()" );
     return sigs;
 }
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.h b/kdevdesigner/plugins/languageinterfaceimpl.h
index 2dd73465..56c675ae 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.h
+++ b/kdevdesigner/plugins/languageinterfaceimpl.h
@@ -2,15 +2,15 @@
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -18,7 +18,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -33,21 +33,21 @@
 class LanguageInterfaceImpl : public LanguageInterface
 {
 public:
-    LanguageInterfaceImpl( QUnknownInterface *outer = 0 );
+    LanguageInterfaceImpl( TQUnknownInterface *outer = 0 );
 
     ulong addRef();
     ulong release();
 
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
 
     void functions( const TQString &code, TQValueList<Function> *funcs ) const;
     void connections( const TQString &, TQValueList<Connection> * ) const {};
     TQString createFunctionStart( const TQString &className, const TQString &func,
 				 const TQString &returnType, const TQString &access );
     TQStringList definitions() const;
-    TQStringList definitionEntries( const TQString &definition, QUnknownInterface *designerIface ) const;
-    void setDefinitionEntries( const TQString &definition, const TQStringList &entries, QUnknownInterface *designerIface );
-    TQString createArguments( const TQString & ) { return TQString::null; }
+    TQStringList definitionEntries( const TQString &definition, TQUnknownInterface *designerIface ) const;
+    void setDefinitionEntries( const TQString &definition, const TQStringList &entries, TQUnknownInterface *designerIface );
+    TQString createArguments( const TQString & ) { return TQString(); }
     TQString createEmptyFunction();
     bool supports( Support s ) const;
     TQStringList fileFilterList() const;
@@ -63,7 +63,7 @@ public:
     TQString formCodeExtension() const { return ".h"; }
     bool canConnect( const TQString &signal, const TQString &slot );
     void compressProject( const TQString &, const TQString &, bool ) {}
-    TQString uncompressProject( const TQString &, const TQString & ) { return TQString::null; }
+    TQString uncompressProject( const TQString &, const TQString & ) { return TQString(); }
     TQString aboutText() const { return ""; }
 
     void addConnection( const TQString &, const TQString &,
@@ -75,7 +75,7 @@ public:
     TQStrList signalNames( TQObject *obj ) const;
 
 private:
-    QUnknownInterface *parent;
+    TQUnknownInterface *tqparent;
     ulong ref;
 
 };
diff --git a/kdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp
index ef995e44..4293224f 100644
--- a/kdevdesigner/shared/domtool.cpp
+++ b/kdevdesigner/shared/domtool.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -352,7 +352,7 @@ static bool toBool( const TQString& s )
 }
 
 /*!
-  Convert Qt 2.x format to Qt 3.0 format if necessary
+  Convert TQt 2.x format to TQt 3.0 format if necessary
 */
 void DomTool::fixDocument( TQDomDocument& doc )
 {
@@ -404,9 +404,9 @@ void DomTool::fixDocument( TQDomDocument& doc )
 	bool stdset = toBool( e.attribute( "stdset" ) );
 	if ( stdset || name == "toolTip" || name == "whatsThis" ||
 	     name == "buddy" ||
-	     e.parentNode().toElement().tagName() == "item" ||
-	     e.parentNode().toElement().tagName() == "spacer" ||
-	     e.parentNode().toElement().tagName() == "column"
+	     e.tqparentNode().toElement().tagName() == "item" ||
+	     e.tqparentNode().toElement().tagName() == "spacer" ||
+	     e.tqparentNode().toElement().tagName() == "column"
 	     )
 	    e.removeAttribute( "stdset" );
 	else
diff --git a/kdevdesigner/shared/domtool.h b/kdevdesigner/shared/domtool.h
index 8f3aa67c..efa67f09 100644
--- a/kdevdesigner/shared/domtool.h
+++ b/kdevdesigner/shared/domtool.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -33,7 +33,7 @@
 class TQDomElement;
 class TQDomDocument;
 
-class DomTool : public Qt
+class DomTool : public TQt
 {
 public:
     static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue );
diff --git a/kdevdesigner/shared/globaldefs.h b/kdevdesigner/shared/globaldefs.h
index ce70cae2..655545c6 100644
--- a/kdevdesigner/shared/globaldefs.h
+++ b/kdevdesigner/shared/globaldefs.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -44,7 +44,7 @@ static void init_colors()
 	return;
 
 #if 0 // a calculated alternative for backColor1
-    TQColorGroup myCg = qApp->palette().active();
+    TQColorGroup myCg = tqApp->palette().active();
     int h1, s1, v1;
     int h2, s2, v2;
     myCg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 );
diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp
index 0affb9d0..03dc57a7 100644
--- a/kdevdesigner/shared/parser.cpp
+++ b/kdevdesigner/shared/parser.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-class NormalizeObject : public QObject
+class NormalizeObject : public TQObject
 {
 public:
     NormalizeObject() : TQObject() {}
@@ -38,9 +38,9 @@ public:
 TQString Parser::cleanArgs( const TQString &func )
 {
     TQString slot( func );
-    int begin = slot.find( "(" ) + 1;
+    int begin = slot.tqfind( "(" ) + 1;
     TQString args = slot.mid( begin );
-    args = args.left( args.find( ")" ) );
+    args = args.left( args.tqfind( ")" ) );
     TQStringList lst = TQStringList::split( ',', args );
     TQString res = slot.left( begin );
     for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
@@ -48,13 +48,13 @@ TQString Parser::cleanArgs( const TQString &func )
 	    res += ",";
 	TQString arg = *it;
 	int pos = 0;
-	if ( ( pos = arg.find( "&" ) ) != -1 ) {
+	if ( ( pos = arg.tqfind( "&" ) ) != -1 ) {
 	    arg = arg.left( pos + 1 );
-	} else if ( ( pos = arg.find( "*" ) ) != -1 ) {
+	} else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) {
 	    arg = arg.left( pos + 1 );
 	} else {
 	    arg = arg.simplifyWhiteSpace();
-	    if ( ( pos = arg.find( ':' ) ) != -1 )
+	    if ( ( pos = arg.tqfind( ':' ) ) != -1 )
 		arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace();
 	    TQStringList l = TQStringList::split( ' ', arg );
 	    if ( l.count() == 2 ) {
@@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func )
     }	
     res += ")";
 
-    return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
+    return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
 }
diff --git a/kdevdesigner/shared/parser.h b/kdevdesigner/shared/parser.h
index c50fed89..abec9963 100644
--- a/kdevdesigner/shared/parser.h
+++ b/kdevdesigner/shared/parser.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp
index 91fa7dee..76c522f9 100644
--- a/kdevdesigner/shared/ui2uib.cpp
+++ b/kdevdesigner/shared/ui2uib.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -89,7 +89,7 @@
 	string-table is preinitialized with very common strings, so
 	that these need not be stored along with .uib files.
 
-    2.  QObjects are referred to by index in a table rather than by
+    2.  TQObjects are referred to by index in a table rather than by
 	name. The table itself is not stored in the .uib file; it is
 	rather build dynamically by ui2uib and TQWidgetFactory as new
 	objects are specified. In ui2uib, the table is represented by
@@ -97,7 +97,7 @@
 	TQObject pointers suffices.
 
     3.  The data is packed to take as little place as possible,
-	without slowing down QLayoutFactory too much. For example, an
+	without slowing down TQLayoutFactory too much. For example, an
 	index into the string-table is a 32-bit integer, but in
 	practice it is rarely above 65534, so only 16 bits are used
 	for them; when an index above 65534 is met, the index is
@@ -119,9 +119,9 @@
 	specified.
 
     6.  Some of the information stored in a .ui file is useful only
-	by uic, not to QLayoutFactory. That information is, for now,
+	by uic, not to TQLayoutFactory. That information is, for now,
 	not taken along in the .uib file. Likewise, needless
-	QLayoutWidget objects are not taken along.
+	TQLayoutWidget objects are not taken along.
 
     The arbitrary constants related to the .uib file formats are
     defined in uib.h. Constants such as Block_Actions and
@@ -129,25 +129,25 @@
     .uib files easier to read in a hexadecimal editor.
 
     The file format isn't designed to be extensible. Any extension
-    that prevents an older version of QLayoutWidget of reading the
+    that prevents an older version of TQLayoutWidget of reading the
     file correctly must have a different magic number. The plan is to
     use UibMagic + 1 for version 2, UibMagic + 2 for version 3, etc.
 */
 
-static TQCString layoutForTag( const TQString& tag )
+static TQCString tqlayoutForTag( const TQString& tag )
 {
     if ( tag == "grid" ) {
-	return "TQGridLayout";
+	return TQGRIDLAYOUT_OBJECT_NAME_STRING;
     } else if ( tag == "hbox" ) {
-	return "TQHBoxLayout";
+	return TQHBOXLAYOUT_OBJECT_NAME_STRING;
     } else if ( tag == "vbox" ) {
-	return "TQVBoxLayout";
+	return TQVBOXLAYOUT_OBJECT_NAME_STRING;
     } else {
-	return "TQLayout";
+	return TQLAYOUT_OBJECT_NAME_STRING;
     }
 }
 
-class UibHack : public QObject
+class UibHack : public TQObject
 {
 public:
     static TQString normalize( const TQString& member ) {
@@ -164,7 +164,7 @@ public:
     int insert() { return next++; }
     void setName( int no, const TQString& name );
 
-    int find( const TQString& name, int deflt = -1 ) const;
+    int tqfind( const TQString& name, int deflt = -1 ) const;
     int count() const { return next; }
 
 private:
@@ -181,32 +181,32 @@ void UibIndexMap::setName( int no, const TQString& name )
     }
 }
 
-int UibIndexMap::find( const TQString& name, int deflt ) const
+int UibIndexMap::tqfind( const TQString& name, int deflt ) const
 {
-    TQMap<TQString, int>::ConstIterator no = nameMap.find( name );
-    if ( no == nameMap.end() || conflicts.contains(name) ) {
+    TQMap<TQString, int>::ConstIterator no = nameMap.tqfind( name );
+    if ( no == nameMap.end() || conflicts.tqcontains(name) ) {
 	return deflt;
     } else {
 	return *no;
     }
 }
 
-static void packUInt16( TQDataStream& out, Q_UINT16 n )
+static void packUInt16( TQDataStream& out, TQ_UINT16 n )
 {
     if ( n < 255 ) {
-	out << (Q_UINT8) n;
+	out << (TQ_UINT8) n;
     } else {
-	out << (Q_UINT8) 255;
+	out << (TQ_UINT8) 255;
 	out << n;
     }
 }
 
-static void packUInt32( TQDataStream& out, Q_UINT32 n )
+static void packUInt32( TQDataStream& out, TQ_UINT32 n )
 {
     if ( n < 65535 ) {
-	out << (Q_UINT16) n;
+	out << (TQ_UINT16) n;
     } else {
-	out << (Q_UINT16) 65535;
+	out << (TQ_UINT16) 65535;
 	out << n;
     }
 }
@@ -232,7 +232,7 @@ static void packString( UibStrTable& strings, TQDataStream& out,
 static void packStringSplit( UibStrTable& strings, TQDataStream& out,
 			     const TQString& str, TQChar sep )
 {
-    int pos = str.find( sep );
+    int pos = str.tqfind( sep );
     if ( pos == -1 )
 	pos = str.length();
     packString( strings, out, str.left(pos) );
@@ -244,7 +244,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out,
 {
     TQStringList::ConstIterator s;
 
-    Q_UINT8 type = value.type();
+    TQ_UINT8 type = value.type();
     if ( tag == "pixmap" ) {
 	type = TQVariant::Pixmap;
     } else if ( tag == "image" ) {
@@ -293,7 +293,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out,
 	packUInt32( out, value.asInt() );
 	break;
     case TQVariant::Bool:
-	out << (Q_UINT8) value.asBool();
+	out << (TQ_UINT8) value.asBool();
 	break;
     case TQVariant::Double:
 	out << value.asDouble();
@@ -333,8 +333,8 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
 
     if ( tag == "font" ) {
 	TQString family;
-	Q_UINT16 pointSize = 65535;
-	Q_UINT8 fontFlags = 0;
+	TQ_UINT16 pointSize = 65535;
+	TQ_UINT8 fontFlags = 0;
 
 	TQDomElement g = f.firstChild().toElement();
 	while ( !g.isNull() ) {
@@ -344,7 +344,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
 		family = text;
 	    } else if ( g.tagName() == "pointsize" ) {
 		fontFlags |= Font_PointSize;
-		pointSize = (Q_UINT16) text.toUInt();
+		pointSize = (TQ_UINT16) text.toUInt();
 	    } else {
 		if ( g.firstChild().toText().data().toInt() != 0 ) {
 		    if ( g.tagName() == "bold" ) {
@@ -361,7 +361,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
 	    g = g.nextSibling().toElement();
 	}
 
-	out << (Q_UINT8) Object_FontProperty;
+	out << (TQ_UINT8) Object_FontProperty;
 	packCString( strings, out, name );
 	out << fontFlags;
 	if ( fontFlags & Font_Family )
@@ -369,34 +369,34 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
 	if ( fontFlags & Font_PointSize )
 	    packUInt16( out, pointSize );
     } else if ( tag == "palette" ) {
-	out << (Q_UINT8) Object_PaletteProperty;
+	out << (TQ_UINT8) Object_PaletteProperty;
 	packCString( strings, out, name );
 
 	TQDomElement g = f.firstChild().toElement();
 	while ( !g.isNull() ) {
 	    TQDomElement h = g.firstChild().toElement();
 	    while ( !h.isNull() ) {
-		value = DomTool::elementToVariant( h, Qt::gray );
+		value = DomTool::elementToVariant( h, TQt::gray );
 		if ( h.tagName() == "color" ) {
-		    out << (Q_UINT8) Palette_Color;
+		    out << (TQ_UINT8) Palette_Color;
 		    out << value.asColor();
 		} else if ( h.tagName() == "pixmap" ) {
-		    out << (Q_UINT8) Palette_Pixmap;
+		    out << (TQ_UINT8) Palette_Pixmap;
 		    packVariant( strings, out, value, "pixmap" );
 		}
 		h = h.nextSibling().toElement();
 	    }
 
 	    if ( g.tagName() == "active" ) {
-		out << (Q_UINT8) Palette_Active;
+		out << (TQ_UINT8) Palette_Active;
 	    } else if ( g.tagName() == "inactive" ) {
-		out << (Q_UINT8) Palette_Inactive;
+		out << (TQ_UINT8) Palette_Inactive;
 	    } else {
-		out << (Q_UINT8) Palette_Disabled;
+		out << (TQ_UINT8) Palette_Disabled;
 	    }
 	    g = g.nextSibling().toElement();
 	}
-	out << (Q_UINT8) Palette_End;
+	out << (TQ_UINT8) Palette_End;
     } else {
 	value = DomTool::elementToVariant( f, value, comment );
 	if ( value.isValid() ) {
@@ -404,12 +404,12 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
 		buddies[objectNo] += value.asString();
 	    } else {
 		if ( tag == "string" ) {
-		    out << (Q_UINT8) Object_TextProperty;
+		    out << (TQ_UINT8) Object_TextProperty;
 		    packCString( strings, out, name );
 		    packCString( strings, out, value.asString().utf8() );
 		    packCString( strings, out, comment.utf8() );
 		} else {
-		    out << (Q_UINT8) Object_VariantProperty;
+		    out << (TQ_UINT8) Object_VariantProperty;
 		    packCString( strings, out, name );
 		    packVariant( strings, out, value, tag );
 		}
@@ -430,7 +430,7 @@ static void outputGridCell( TQDataStream& out, TQDomElement elem )
 	rowspan = 1;
 
     if ( column != 0 || row != 0 || colspan != 1 || rowspan != 1 ) {
-	out << (Q_UINT8) Object_GridCell;
+	out << (TQ_UINT8) Object_GridCell;
 	packUInt16( out, column );
 	packUInt16( out, row );
 	packUInt16( out, colspan );
@@ -456,9 +456,9 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
     while ( !f.isNull() ) {
 	TQString tag = f.tagName();
 	if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
-	    out << (Q_UINT8) Object_SubLayout;
+	    out << (TQ_UINT8) Object_SubLayout;
 	    subLayoutNo = outputObject( buddies, objects, strings, out, f,
-					layoutForTag(tag) );
+					tqlayoutForTag(tag) );
 	} else if ( tag == "property" ) {
 	    if ( f.attribute("name") == "name" ) {
 		name = DomTool::elementToVariant( f, name ).asCString();
@@ -470,14 +470,14 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
 
     if ( subLayoutNo != -1 ) {
 	/*
-	  Remove the sub-layout's Object_End marker, append the grid
+	  Remove the sub-tqlayout's Object_End marker, append the grid
 	  cell and the correct name property, and put the Object_End
 	  marker back.
 	*/
-	out.device()->at( out.device()->at() - 1 );
+	out.tqdevice()->at( out.tqdevice()->at() - 1 );
 	outputGridCell( out, elem );
 	outputProperty( buddies, subLayoutNo, strings, out, nameElem );
-	out << (Q_UINT8) Object_End;
+	out << (TQ_UINT8) Object_End;
 
 	objects.setName( subLayoutNo, name );
     }
@@ -488,15 +488,15 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
 			 TQDataStream& out, TQDomElement elem,
 			 TQCString className )
 {
-    bool isQObject = !className.isEmpty();
+    bool isTQObject = !className.isEmpty();
 
-    if ( className == "TQToolBar" )
-	out << (Q_UINT8) elem.attribute( "dock", "0" ).toInt();
-    if ( className == "TQWidget" )
+    if ( className == TQTOOLBAR_OBJECT_NAME_STRING )
+	out << (TQ_UINT8) elem.attribute( "dock", "0" ).toInt();
+    if ( className == TQWIDGET_OBJECT_NAME_STRING )
 	className = elem.attribute( "class", className ).latin1();
 
     int objectNo = -1;
-    if ( isQObject ) {
+    if ( isTQObject ) {
 	packCString( strings, out, className );
 	objectNo = objects.insert();
     }
@@ -504,7 +504,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
     outputGridCell( out, elem );
 
     // optimization: insert '&Foo' into string-table before 'Foo'
-    if ( className == "TQAction" || className == "TQActionGroup" ) {
+    if ( className == TQACTION_OBJECT_NAME_STRING || className == TQACTIONGROUP_OBJECT_NAME_STRING ) {
 	TQVariant value = DomTool::readProperty( elem, "menuText", TQVariant() );
 	if ( value.asString().startsWith("&") )
 	    strings.insertString( value.asString() );
@@ -516,67 +516,67 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
 	if ( tag == "action" ) {
 	    if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) {
 		TQString actionName = f.attribute( "name" );
-		int no = objects.find( actionName );
+		int no = objects.tqfind( actionName );
 		if ( no != -1 ) {
-		    out << (Q_UINT8) Object_ActionRef;
+		    out << (TQ_UINT8) Object_ActionRef;
 		    packUInt16( out, no );
 		}
 	    } else {
-		out << (Q_UINT8) Object_SubAction;
-		outputObject( buddies, objects, strings, out, f, "TQAction" );
+		out << (TQ_UINT8) Object_SubAction;
+		outputObject( buddies, objects, strings, out, f, TQACTION_OBJECT_NAME_STRING );
 	    }
 	} else if ( tag == "actiongroup" ) {
-	    out << (Q_UINT8) Object_SubAction;
-	    outputObject( buddies, objects, strings, out, f, "TQActionGroup" );
+	    out << (TQ_UINT8) Object_SubAction;
+	    outputObject( buddies, objects, strings, out, f, TQACTIONGROUP_OBJECT_NAME_STRING );
 	} else if ( tag == "attribute" ) {
-	    out << (Q_UINT8) Object_Attribute;
+	    out << (TQ_UINT8) Object_Attribute;
 	    outputProperty( buddies, objectNo, strings, out, f );
 	} else if ( tag == "column" ) {
-	    out << (Q_UINT8) Object_Column;
+	    out << (TQ_UINT8) Object_Column;
 	    outputObject( buddies, objects, strings, out, f );
 	} else if ( tag == "event" ) {
-	    out << (Q_UINT8) Object_Event;
+	    out << (TQ_UINT8) Object_Event;
 	    packCString( strings, out, f.attribute("name").latin1() );
 	    packVariant( strings, out,
 			 TQStringList::split(',', f.attribute("functions")) );
 	} else if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
-	    out << (Q_UINT8) Object_SubLayout;
+	    out << (TQ_UINT8) Object_SubLayout;
 	    outputObject( buddies, objects, strings, out, f,
-			  layoutForTag(tag) );
+			  tqlayoutForTag(tag) );
 	} else if ( tag == "item" ) {
 	    if ( elem.tagName() == "menubar" ) {
-		out << (Q_UINT8) Object_MenuItem;
+		out << (TQ_UINT8) Object_MenuItem;
 		packCString( strings, out, f.attribute("name").latin1() );
 		packCString( strings, out, f.attribute("text").utf8() );
 		outputObject( buddies, objects, strings, out, f );
 	    } else {
-		out << (Q_UINT8) Object_Item;
+		out << (TQ_UINT8) Object_Item;
 		outputObject( buddies, objects, strings, out, f );
 	    }
 	} else if ( tag == "property" ) {
 	    outputProperty( buddies, objectNo, strings, out, f );
 	} else if ( tag == "row" ) {
-	    out << (Q_UINT8) Object_Row;
+	    out << (TQ_UINT8) Object_Row;
 	    outputObject( buddies, objects, strings, out, f );
 	} else if ( tag == "separator" ) {
-	    out << (Q_UINT8) Object_Separator;
+	    out << (TQ_UINT8) Object_Separator;
 	} else if ( tag == "spacer" ) {
-	    out << (Q_UINT8) Object_Spacer;
+	    out << (TQ_UINT8) Object_Spacer;
 	    outputObject( buddies, objects, strings, out, f );
 	} else if ( tag == "widget" ) {
-	    if ( f.attribute("class") == "QLayoutWidget" &&
+	    if ( f.attribute("class") == TQLAYOUTWIDGET_OBJECT_NAME_STRING &&
 		 elem.tagName() != "widget" ) {
 		outputLayoutWidgetsSubLayout( buddies, objects, strings, out,
 					      f );
 	    } else {
-		out << (Q_UINT8) Object_SubWidget;
-		outputObject( buddies, objects, strings, out, f, "TQWidget" );
+		out << (TQ_UINT8) Object_SubWidget;
+		outputObject( buddies, objects, strings, out, f, TQWIDGET_OBJECT_NAME_STRING );
 	    }
 	}
 	f = f.nextSibling().toElement();
     }
-    out << (Q_UINT8) Object_End;
-    if ( isQObject )
+    out << (TQ_UINT8) Object_End;
+    if ( isTQObject )
 	objects.setName( objectNo,
 			 DomTool::readProperty(elem, "name", "").asString() );
     return objectNo;
@@ -586,7 +586,7 @@ static void outputBlock( TQDataStream& out, BlockTag tag,
 			 const TQByteArray& data )
 {
     if ( !data.isEmpty() ) {
-	out << (Q_UINT8) tag;
+	out << (TQ_UINT8) tag;
 	packByteArray( out, data );
     }
 }
@@ -619,9 +619,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
     UibIndexMap objects;
     int widgetNo = -1;
     TQCString className;
-    Q_INT16 defaultMargin = -32768;
-    Q_INT16 defaultSpacing = -32768;
-    Q_UINT8 introFlags = 0;
+    TQ_INT16 defaultMargin = -32768;
+    TQ_INT16 defaultSpacing = -32768;
+    TQ_UINT8 introFlags = 0;
 
     TQDomElement elem = doc.firstChild().toElement().firstChild().toElement();
     while ( !elem.isNull() ) {
@@ -682,7 +682,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
 	    }
 	    break;
 	case 'l':
-	    if ( tag == "layoutdefaults" ) {
+	    if ( tag == "tqlayoutdefaults" ) {
 		TQString margin = elem.attribute( "margin" );
 		if ( !margin.isEmpty() )
 		    defaultMargin = margin.toInt();
@@ -747,7 +747,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
     {
 	TQDataStream out2( widgetBlock, IO_WriteOnly );
 	widgetNo = outputObject( buddies, objects, strings, out2, widgetElem,
-				 "TQWidget" );
+				 TQWIDGET_OBJECT_NAME_STRING );
     }
 
     if ( !tabstopsElem.isNull() ) {
@@ -756,7 +756,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
 	while ( !f.isNull() ) {
 	    if ( f.tagName() == "tabstop" ) {
 		TQString widgetName = f.firstChild().toText().data();
-		int no = objects.find( widgetName );
+		int no = objects.tqfind( widgetName );
 		if ( no != -1 )
 		    packUInt16( out2, no );
 	    }
@@ -772,7 +772,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
     if ( !menubarElem.isNull() ) {
 	TQDataStream out2( menubarBlock, IO_WriteOnly );
 	outputObject( buddies, objects, strings, out2, menubarElem,
-		      "TQMenuBar" );
+		      TQMENUBAR_OBJECT_NAME_STRING );
     }
 
     if ( !toolbarsElem.isNull() ) {
@@ -780,7 +780,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
 	TQDomElement f = toolbarsElem.firstChild().toElement();
 	while ( !f.isNull() ) {
 	    if ( f.tagName() == "toolbar" )
-		outputObject( buddies, objects, strings, out2, f, "TQToolBar" );
+		outputObject( buddies, objects, strings, out2, f, TQTOOLBAR_OBJECT_NAME_STRING );
 	    f = f.nextSibling().toElement();
 	}
     }
@@ -791,7 +791,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
 	while ( a != buddies.end() ) {
 	    TQStringList::ConstIterator b = (*a).begin();
 	    while ( b != (*a).end() ) {
-		int no = objects.find( *b );
+		int no = objects.tqfind( *b );
 		if ( no != -1 ) {
 		    packUInt16( out2, a.key() );
 		    packUInt16( out2, no );
@@ -822,12 +822,12 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
 		}
 
 		TQString language = f.attribute( "language", "C++" );
-		int senderNo = objects.find( argMap["sender"], widgetNo );
-		int receiverNo = objects.find( argMap["receiver"], widgetNo );
+		int senderNo = objects.tqfind( argMap["sender"], widgetNo );
+		int receiverNo = objects.tqfind( argMap["receiver"], widgetNo );
 		TQString signal = UibHack::normalize( argMap["signal"] );
 		TQString slot = UibHack::normalize( argMap["slot"] );
 
-		Q_UINT8 connectionFlags = 0;
+		TQ_UINT8 connectionFlags = 0;
 		if ( language != prevLanguage )
 		    connectionFlags |= Connection_Language;
 		if ( senderNo != prevSenderNo )
@@ -873,9 +873,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
     }
 
     out << UibMagic;
-    out << (Q_UINT8) '\n';
-    out << (Q_UINT8) '\r';
-    out << (Q_UINT8) out.version();
+    out << (TQ_UINT8) '\n';
+    out << (TQ_UINT8) '\r';
+    out << (TQ_UINT8) out.version();
     outputBlock( out, Block_Strings, strings.block() );
     outputBlock( out, Block_Intro, introBlock );
     outputBlock( out, Block_Images, imagesBlock );
@@ -889,5 +889,5 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
     outputBlock( out, Block_Functions, functionsBlock );
     outputBlock( out, Block_Buddies, buddiesBlock );
     outputBlock( out, Block_Connections, connectionsBlock );
-    out << (Q_UINT8) Block_End;
+    out << (TQ_UINT8) Block_End;
 }
diff --git a/kdevdesigner/shared/ui2uib.h b/kdevdesigner/shared/ui2uib.h
index 3dd985b6..81041e6e 100644
--- a/kdevdesigner/shared/ui2uib.h
+++ b/kdevdesigner/shared/ui2uib.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp
index ca48b4e4..443df331 100644
--- a/kdevdesigner/shared/uib.cpp
+++ b/kdevdesigner/shared/uib.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,12 +27,12 @@
 #include "uib.h"
 
 static const char commonStrings[] =
-    "\0()\0(bool)\0(const TQString&)\0(int)\0C++\0Layout1\0PNG\0QCheckBox\0"
-    "QComboBox\0QDialog\0QFrame\0QGridLayout\0QGroupBox\0QHBoxLayout\0QLabel\0"
-    "QLineEdit\0QListView\0QPushButton\0QRadioButton\0QVBoxLayout\0QWidget\0"
+    "\0()\0(bool)\0(const TQString&)\0(int)\0C++\0Layout1\0PNG\0TQCheckBox\0"
+    "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0"
+    "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0"
     "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0"
-    "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0"
-    "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
+    "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0"
+    "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
     "toolTip\0unnamed\0whatsThis";
 
 UibStrTable::UibStrTable()
diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h
index 0a7063a4..07607328 100644
--- a/kdevdesigner/shared/uib.h
+++ b/kdevdesigner/shared/uib.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 
 #include <tqdatastream.h>
 
-const Q_UINT32 UibMagic = 0xb77c61d8;
+const TQ_UINT32 UibMagic = 0xb77c61d8;
 
 enum BlockTag { Block_End = '$', Block_Actions = 'A', Block_Buddies = 'B',
 		Block_Connections = 'C', Block_Functions = 'F',
@@ -101,16 +101,16 @@ inline int UibStrTable::insertCString( const char *cstr )
 		return i;
 	}
 	for ( i = 0; i < len + 1; i++ )
-	    out << (Q_UINT8) cstr[i];
+	    out << (TQ_UINT8) cstr[i];
 	return nextPos;
     }
 }
 
 inline int UibStrTable::insertString( const TQString& str )
 {
-    if ( str.contains('\0') || str[0] == TQChar(0x7f) ) {
+    if ( str.tqcontains('\0') || str[0] == TQChar(0x7f) ) {
 	int nextPos = table.size();
-	out << (Q_UINT8) 0x7f;
+	out << (TQ_UINT8) 0x7f;
 	out << str;
 	return nextPos;
     } else {
@@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const
 {
     if ( table[offset] == 0x7f ) {
 	TQDataStream in( table, IO_ReadOnly );
-	in.device()->at( offset + 1 );
+	in.tqdevice()->at( offset + 1 );
 	TQString str;
 	in >> str;
 	return str;
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp
index 6419b9b6..88785cdc 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/kdevdesigner/shared/widgetdatabase.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,11 +56,11 @@ static int dbcustomcount = 200;
 static TQStrList *wGroups;
 static TQStrList *invisibleGroups;
 static bool whatsThisLoaded = FALSE;
-static QPluginManager<WidgetInterface> *widgetPluginManager = 0;
+static TQPluginManager<WidgetInterface> *widgetPluginManager = 0;
 static bool plugins_set_up = FALSE;
 static bool was_in_setup = FALSE;
 
-TQCleanupHandler<QPluginManager<WidgetInterface> > cleanup_manager;
+TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager;
 
 WidgetDatabaseRecord::WidgetDatabaseRecord()
 {
@@ -91,7 +91,7 @@ WidgetDatabaseRecord::~WidgetDatabaseRecord()
   one application doesn't make sense anyway and so you don't need more
   than an instance of the widgetdatabase.
 
-  For creating widgets, layouts, etc. see WidgetFactory.
+  For creating widgets, tqlayouts, etc. see WidgetFactory.
 */
 
 /*!
@@ -135,7 +135,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_pushbutton.png";
-    r->name = "TQPushButton";
+    r->name = TQPUSHBUTTON_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Buttons" );
     r->toolTip = "Push Button";
     r->isCommon = TRUE;
@@ -144,7 +144,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_toolbutton.png";
-    r->name = "TQToolButton";
+    r->name = TQTOOLBUTTON_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Buttons" );
     r->toolTip = "Tool Button";
 
@@ -152,7 +152,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_radiobutton.png";
-    r->name = "TQRadioButton";
+    r->name = TQRADIOBUTTON_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Buttons" );
     r->toolTip = "Radio Button";
     r->isCommon = TRUE;
@@ -161,7 +161,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_checkbox.png";
-    r->name = "TQCheckBox";
+    r->name = TQCHECKBOX_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Buttons" );
     r->toolTip = "Check Box";
     r->isCommon = TRUE;
@@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_groupbox.png";
-    r->name = "TQGroupBox";
+    r->name = TQGROUPBOX_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Containers" );
     r->toolTip = "Group Box";
     r->isContainer = TRUE;
@@ -179,7 +179,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_buttongroup.png";
-    r->name = "TQButtonGroup";
+    r->name = TQBUTTONGROUP_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Containers" );
     r->toolTip = "Button Group";
     r->isContainer = TRUE;
@@ -189,7 +189,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_frame.png";
-    r->name = "TQFrame";
+    r->name = TQFRAME_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Containers" );
     r->toolTip = "Frame";
     r->isContainer = TRUE;
@@ -198,7 +198,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_tabwidget.png";
-    r->name = "TQTabWidget";
+    r->name = TQTABWIDGET_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Containers" );
     r->toolTip = "Tabwidget";
     r->isContainer = TRUE;
@@ -207,7 +207,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_widgetstack.png";
-    r->name = "TQWidgetStack";
+    r->name = TQWIDGETSTACK_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Containers" );
     r->toolTip = "Widget Stack";
     r->isContainer = TRUE;
@@ -216,7 +216,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_toolbox.png";
-    r->name = "TQToolBox";
+    r->name = TQTOOLBOX_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Containers" );
     r->toolTip = "Tool Box";
     r->isContainer = TRUE;
@@ -225,7 +225,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_listbox.png";
-    r->name = "TQListBox";
+    r->name = TQLISTBOX_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Views" );
     r->toolTip = "List Box";
     r->isCommon = TRUE;
@@ -234,37 +234,37 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_listview.png";
-    r->name = "TQListView";
+    r->name = TQLISTVIEW_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Views" );
     r->toolTip = "List View";
 
     append( r );
 
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_iconview.png";
-    r->name = "TQIconView";
+    r->name = TQICONVIEW_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Views" );
     r->toolTip = "Icon View";
 
     append( r );
 #endif
 
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_table.png";
-    r->name = "TQTable";
+    r->name = TQTABLE_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Views" );
     r->toolTip = "Table";
 
     append( r );
 #endif
 
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_datatable.png";
     r->includeFile = "tqdatatable.h";
-    r->name = "TQDataTable";
+    r->name = TQDATATABLE_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Database" );
     r->toolTip = "Data Table";
 
@@ -273,7 +273,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_lineedit.png";
-    r->name = "TQLineEdit";
+    r->name = TQLINEEDIT_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Line Edit";
     r->isCommon = TRUE;
@@ -282,7 +282,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_spinbox.png";
-    r->name = "TQSpinBox";
+    r->name = TQSPINBOX_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Spin Box";
     r->isCommon = TRUE;
@@ -291,7 +291,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_dateedit.png";
-    r->name = "QDateEdit";
+    r->name = TQDATEEDIT_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Date Edit";
     r->includeFile = "tqdatetimeedit.h";
@@ -300,7 +300,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_timeedit.png";
-    r->name = "QTimeEdit";
+    r->name = TQTIMEEDIT_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Time Edit";
     r->includeFile = "tqdatetimeedit.h";
@@ -309,7 +309,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_datetimeedit.png";
-    r->name = "QDateTimeEdit";
+    r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Date-Time Edit";
     r->includeFile = "tqdatetimeedit.h";
@@ -318,7 +318,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_multilineedit.png";
-    r->name = "TQMultiLineEdit";
+    r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Temp" );
     r->toolTip = "Multi Line Edit";
 
@@ -326,7 +326,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_richtextedit.png";
-    r->name = "TQTextEdit";
+    r->name = TQTEXTEDIT_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Rich Text Edit";
     r->isCommon = TRUE;
@@ -335,7 +335,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_combobox.png";
-    r->name = "TQComboBox";
+    r->name = TQCOMBOBOX_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Combo Box";
     r->isCommon = TRUE;
@@ -344,7 +344,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_slider.png";
-    r->name = "TQSlider";
+    r->name = TQSLIDER_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Slider";
 
@@ -352,7 +352,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_scrollbar.png";
-    r->name = "TQScrollBar";
+    r->name = TQSCROLLBAR_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Scrollbar";
 
@@ -360,7 +360,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_dial.png";
-    r->name = "TQDial";
+    r->name = TQDIAL_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Input" );
     r->toolTip = "Dial";
 
@@ -368,7 +368,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_label.png";
-    r->name = "TQLabel";
+    r->name = TQLABEL_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Temp" );
     r->toolTip = "Label";
 
@@ -395,7 +395,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_lcdnumber.png";
-    r->name = "TQLCDNumber";
+    r->name = TQLCDNUMBER_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Display" );
     r->toolTip = "LCD Number";
 
@@ -413,7 +413,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_progress.png";
-    r->name = "TQProgressBar";
+    r->name = TQPROGRESSBAR_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Display" );
     r->toolTip = "Progress Bar";
 
@@ -421,7 +421,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_textview.png";
-    r->name = "TQTextView";
+    r->name = TQTEXTVIEW_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Temp" );
     r->toolTip = "Text View";
 
@@ -429,7 +429,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_textbrowser.png";
-    r->name = "TQTextBrowser";
+    r->name = TQTEXTBROWSER_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Display" );
     r->toolTip = "Text Browser";
 
@@ -440,40 +440,40 @@ void WidgetDatabase::setupDataBase( int id )
     r->name = "Spacer";
     r->group = widgetGroup( "Temp" );
     r->toolTip = "Spacer";
-    r->whatsThis = "The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts.";
+    r->whatsThis = "The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of tqlayouts.";
 
     append( r );
 
     r = new WidgetDatabaseRecord;
-    r->name = "TQWidget";
+    r->name = TQWIDGET_OBJECT_NAME_STRING;
     r->isForm = TRUE;
     r->group = widgetGroup( "Forms" );
 
     append( r );
 
     r = new WidgetDatabaseRecord;
-    r->name = "TQDialog";
+    r->name = TQDIALOG_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Forms" );
     r->isForm = TRUE;
 
     append( r );
 
     r = new WidgetDatabaseRecord;
-    r->name = "TQWizard";
+    r->name = TQWIZARD_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Forms" );
     r->isContainer = TRUE;
 
     append( r );
 
     r = new WidgetDatabaseRecord;
-    r->name = "QDesignerWizard";
+    r->name = "TQDesignerWizard";
     r->group = widgetGroup( "Forms" );
     r->isContainer = TRUE;
 
     append( r );
 
     r = new WidgetDatabaseRecord;
-    r->name = "QLayoutWidget";
+    r->name = TQLAYOUTWIDGET_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Temp" );
     r->includeFile = "";
     r->isContainer = TRUE;
@@ -481,7 +481,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 
     r = new WidgetDatabaseRecord;
-    r->name = "TQSplitter";
+    r->name = TQSPLITTER_OBJECT_NAME_STRING;
     r->group = widgetGroup( "Temp" );
     r->includeFile = "tqsplitter.h";
     r->isContainer = TRUE;
@@ -490,7 +490,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_tabwidget.png";
-    r->name = "QDesignerTabWidget";
+    r->name = "TQDesignerTabWidget";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
@@ -498,7 +498,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_tabwidget.png";
-    r->name = "QDesignerWidget";
+    r->name = "TQDesignerWidget";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
@@ -506,7 +506,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_tabwidget.png";
-    r->name = "QDesignerDialog";
+    r->name = "TQDesignerDialog";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
@@ -514,7 +514,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
-    r->name = "TQMainWindow";
+    r->name = TQMAINWINDOW_OBJECT_NAME_STRING;
     r->includeFile = "tqmainwindow.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
@@ -523,7 +523,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
-    r->name = "QDesignerAction";
+    r->name = "TQDesignerAction";
     r->includeFile = "tqaction.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = FALSE;
@@ -532,7 +532,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
-    r->name = "QDesignerActionGroup";
+    r->name = "TQDesignerActionGroup";
     r->includeFile = "tqaction.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = FALSE;
@@ -541,17 +541,17 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
-    r->name = "TQScrollView";
+    r->name = TQSCROLLVIEW_OBJECT_NAME_STRING;
     r->includeFile = "tqscrollview.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
     append( r );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
-    r->name = "TQDataBrowser";
+    r->name = TQDATABROWSER_OBJECT_NAME_STRING;
     r->includeFile = "tqdatabrowser.h";
     r->group = widgetGroup( "Database" );
     r->toolTip = "Data Browser";
@@ -562,7 +562,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
-    r->name = "TQDataView";
+    r->name = TQDATAVIEW_OBJECT_NAME_STRING;
     r->includeFile = "tqdataview.h";
     r->group = widgetGroup( "Database" );
     r->toolTip = "Data View";
@@ -666,7 +666,7 @@ TQString WidgetDatabase::className( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->name;
 }
 
@@ -679,7 +679,7 @@ TQString WidgetDatabase::group( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->group;
 }
 
@@ -692,7 +692,7 @@ TQString WidgetDatabase::toolTip( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->toolTip;
 }
 
@@ -705,7 +705,7 @@ TQString WidgetDatabase::whatsThis( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->whatsThis;
 }
 
@@ -718,7 +718,7 @@ TQString WidgetDatabase::includeFile( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     if ( r->includeFile.isNull() )
 	return r->name.lower() + ".h";
     return r->includeFile;
@@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id )
     return r->isForm;
 }
 
-/*!  Returns whether the widget registered as \a id can have children.
+/*!  Returns whether the widget registered as \a id can have tqchildren.
 */
 
 bool WidgetDatabase::isContainer( int id )
@@ -760,11 +760,11 @@ TQString WidgetDatabase::createWidgetName( int id )
 {
     setupDataBase( id );
     TQString n = className( id );
-    if ( n == "QLayoutWidget" )
+    if ( n == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
 	n = "Layout";
     if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] )
 	n = n.mid( 1 );
-    int colonColon = n.findRev( "::" );
+    int colonColon = n.tqfindRev( "::" );
     if ( colonColon != -1 )
 	n = n.mid( colonColon + 2 );
 
@@ -783,14 +783,14 @@ int WidgetDatabase::idFromClassName( const TQString &name )
     setupDataBase( -1 );
     if ( name.isEmpty() )
 	return 0;
-    int *i = className2Id->find( name );
+    int *i = className2Id->tqfind( name );
     if ( i )
 	return *i;
     if ( name == "FormWindow" )
-	return idFromClassName( "QLayoutWidget" );
+	return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING );
 #ifdef UIC
     setupDataBase( -2 );
-    i = className2Id->find( name );
+    i = className2Id->tqfind( name );
     if ( i )
 	return *i;
 #endif
@@ -799,7 +799,7 @@ int WidgetDatabase::idFromClassName( const TQString &name )
 
 bool WidgetDatabase::hasWidget( const TQString &name )
 {
-    return className2Id->find( name ) != 0;
+    return className2Id->tqfind( name ) != 0;
 }
 
 WidgetDatabaseRecord *WidgetDatabase::at( int index )
@@ -820,7 +820,7 @@ void WidgetDatabase::insert( int index, WidgetDatabaseRecord *r )
     db[ index ] = r;
     className2Id->insert( r->name, new int( index ) );
     if ( index < dbcustom )
-	dbcount = QMAX( dbcount, index );
+	dbcount = TQMAX( dbcount, index );
 }
 
 void WidgetDatabase::append( WidgetDatabaseRecord *r )
@@ -832,7 +832,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r )
 
 TQString WidgetDatabase::widgetGroup( const TQString &g )
 {
-    if ( wGroups->find( g.ascii() ) == -1 )
+    if ( wGroups->tqfind( g.ascii() ) == -1 )
 	wGroups->append( g.ascii() );
     return g;
 }
@@ -854,7 +854,7 @@ TQString WidgetDatabase::widgetGroup( int i )
     setupDataBase( -1 );
     if ( i >= 0 && i < (int)wGroups->count() )
 	return wGroups->at( i );
-    return TQString::null;
+    return TQString();
 }
 
 int WidgetDatabase::numWidgetGroups()
@@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups()
 bool WidgetDatabase::isGroupVisible( const TQString &g )
 {
     setupDataBase( -1 );
-    return invisibleGroups->find( g.ascii() ) == -1;
+    return invisibleGroups->tqfind( g.ascii() ) == -1;
 }
 
 int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r )
@@ -927,7 +927,7 @@ void WidgetDatabase::loadWhatsThis( const TQString &docPath )
 }
 
 
-// ### Qt 3.1: make these publically accessible via QWidgetDatabase API
+// ### TQt 3.1: make these publically accessible via TQWidgetDatabase API
 #if defined(UIC)
 bool dbnounload = FALSE;
 TQStringList *dbpaths = 0;
@@ -936,7 +936,7 @@ extern TQString *qwf_plugin_dir;
 #endif
 
 
-QPluginManager<WidgetInterface> *widgetManager()
+TQPluginManager<WidgetInterface> *widgetManager()
 {
     if ( !widgetPluginManager ) {
 	TQString pluginDir = "/designer";
@@ -944,7 +944,7 @@ QPluginManager<WidgetInterface> *widgetManager()
 	if ( qwf_plugin_dir )
 	    pluginDir = *qwf_plugin_dir;
 #endif
-	widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), pluginDir );
+	widgetPluginManager = new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), pluginDir );
 	cleanup_manager.add( &widgetPluginManager );
 #if defined(UIC)
 	if ( dbnounload )
diff --git a/kdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h
index a41728fb..e64e4fae 100644
--- a/kdevdesigner/shared/widgetdatabase.h
+++ b/kdevdesigner/shared/widgetdatabase.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,10 +30,10 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 
 
-extern QPluginManager<WidgetInterface> *widgetManager();
+extern TQPluginManager<WidgetInterface> *widgetManager();
 
 struct WidgetDatabaseRecord
 {
@@ -48,7 +48,7 @@ struct WidgetDatabaseRecord
     int nameCounter;
 };
 
-class WidgetDatabase : public Qt
+class WidgetDatabase : public TQt
 {
 public:
     WidgetDatabase();
diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp
index 5e54297e..ebcabad1 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/kdevdesigner/src/kdevdesigner.cpp
@@ -59,7 +59,7 @@ KDevDesigner::KDevDesigner()
         // our hands on it
         TQStringList args;
         args.append("in shell");
-        m_part = static_cast<KParts::ReadWritePart *>(factory->create(this,
+        m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this),
                                 "kdevdesigner_part", "KParts::ReadWritePart", args));
 
         if (m_part)
@@ -99,16 +99,16 @@ void KDevDesigner::load(const KURL& url)
 
 void KDevDesigner::setupActions()
 {
-/*    KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());*/
+/*    KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+    KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());*/
 
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
     
-    m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-    m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+    m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+    m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void KDevDesigner::saveProperties(KConfig* /*config*/)
@@ -190,7 +190,7 @@ void KDevDesigner::fileOpen()
     // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
     // button is clicked
     KURL url =
-        KFileDialog::getOpenURL( TQString::null, TQString::null, this );
+        KFileDialog::getOpenURL( TQString(), TQString(), this );
 
     if (url.isEmpty() == false)
     {
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 19a0762e..8a26d288 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -42,6 +42,7 @@ class KToggleAction;
 class KDevDesigner : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp
index a535f575..c06c77dc 100644
--- a/kdevdesigner/src/main.cpp
+++ b/kdevdesigner/src/main.cpp
@@ -41,8 +41,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
     KAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description,
-                     KAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);
-    about.addAuthor( "Trolltech AS", "Qt Designer code (Free Edition)" );
+                     KAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);
+    about.addAuthor( "Trolltech AS", "TQt Designer code (Free Edition)" );
     about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@kdevelop.org" );
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions( options );
diff --git a/kdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp
index 0097605b..89e17a6b 100644
--- a/kdevdesigner/uilib/database.cpp
+++ b/kdevdesigner/uilib/database.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,7 +30,7 @@
 #include "database2.h"
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #if defined(DESIGNER)
 #include "formwindow.h"
@@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport()
 {
     con = 0;
     frm = 0;
-    parent = 0;
+    tqparent = 0;
 }
 
 void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o,
@@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 {
     tbl = table;
     dbControls = databaseControls;
-    parent = o;
+    tqparent = o;
 
     if ( connection != "(default)" )
 	con = TQSqlDatabase::database( connection );
@@ -62,19 +62,19 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 	con = TQSqlDatabase::database();
     frm = new TQSqlForm( o, table.ascii() );
     for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
-	TQObject *chld = parent->child( it.key().ascii(), "TQWidget" );
+	TQObject *chld = tqparent->child( it.key().ascii(), TQWIDGET_OBJECT_NAME_STRING );
 	if ( !chld )
 	    continue;
 	frm->insert( (TQWidget*)chld, *it );
     }
 }
 
-QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name )
-    : TQDataBrowser( parent, name )
+TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name )
+    : TQDataBrowser( tqparent, name )
 {
 }
 
-bool QDesignerDataBrowser::event( TQEvent* e )
+bool TQDesignerDataBrowser::event( TQEvent* e )
 {
     bool b = TQDataBrowser::event( e );
 #if defined(DESIGNER)
@@ -96,12 +96,12 @@ bool QDesignerDataBrowser::event( TQEvent* e )
     return b;
 }
 
-QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name )
-    : TQDataView( parent, name )
+TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name )
+    : TQDataView( tqparent, name )
 {
 }
 
-bool QDesignerDataView::event( TQEvent* e )
+bool TQDesignerDataView::event( TQEvent* e )
 {
     bool b = TQDataView::event( e );
 #if defined(DESIGNER)
diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h
index d0c1be9b..ada42364 100644
--- a/kdevdesigner/uilib/database2.h
+++ b/kdevdesigner/uilib/database2.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 
 #include "tqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqdataview.h>
 #include <tqdatabrowser.h>
 #include <tqsqlcursor.h>
@@ -52,27 +52,29 @@ protected:
     TQSqlForm* frm;
     TQString tbl;
     TQMap<TQString, TQString> dbControls;
-    TQObject *parent;
+    TQObject *tqparent;
 
 };
 
-class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
+class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDataBrowser2( TQWidget *parent, const char *name );
+    TQDesignerDataBrowser2( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
 };
 
-class QDesignerDataView2 : public TQDataView, public DatabaseSupport2
+class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDataView2( TQWidget *parent, const char *name );
+    TQDesignerDataView2( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
@@ -80,8 +82,8 @@ protected:
 };
 
 #define DatabaseSupport DatabaseSupport2
-#define QDesignerDataBrowser QDesignerDataBrowser2
-#define QDesignerDataView QDesignerDataView2
+#define TQDesignerDataBrowser TQDesignerDataBrowser2
+#define TQDesignerDataView TQDesignerDataView2
 
 #endif
 
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index a3a16755..b19d7d14 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,14 +17,14 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
-#include "tqwidgetfactory.h"
+#include "qwidgetfactory.h"
 
 #include "../interfaces/languageinterface.h"
 #include "../interfaces/widgetinterface.h"
@@ -41,17 +41,17 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqobjectlist.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqmime.h>
 #include <tqdragobject.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqsqlrecord.h>
 #include <tqsqldatabase.h>
 #include <tqdatatable.h>
 #endif
 
-// include all Qt widgets we support
+// include all TQt widgets we support
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqcheckbox.h>
@@ -60,7 +60,7 @@
 #include <tqbuttongroup.h>
 #include <tqiconview.h>
 #include <tqheader.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include <tqlistbox.h>
@@ -98,7 +98,7 @@
 
 #include <stdlib.h>
 
-class QWidgetFactoryPrivate
+class TQWidgetFactoryPrivate
 {
 public:
     TQCString translationContext;
@@ -107,8 +107,8 @@ public:
 };
 
 static TQPtrList<TQWidgetFactory> widgetFactories;
-static QPluginManager<LanguageInterface> *languageInterfaceManager = 0;
-static QPluginManager<WidgetInterface> *widgetInterfaceManager = 0;
+static TQPluginManager<LanguageInterface> *languageInterfaceManager = 0;
+static TQPluginManager<WidgetInterface> *widgetInterfaceManager = 0;
 
 static TQMap<TQString, bool> *availableWidgetMap = 0;
 static TQStringList *availableWidgetList = 0;
@@ -149,7 +149,7 @@ static void setupWidgetListAndMap()
 
     if ( !widgetInterfaceManager )
 	widgetInterfaceManager =
-	    new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), *qwf_plugin_dir );
+	    new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), *qwf_plugin_dir );
 
     TQStringList l = widgetInterfaceManager->featureList();
     TQStringList::Iterator it;
@@ -167,7 +167,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat
     if ( format == "XPM.GZ" || format == "XBM.GZ" ) {
 	if ( len < data.size() * 10 )
 	    len = data.size() * 10;
-	// qUncompress() expects the first 4 bytes to be the expected length of
+	// tqUncompress() expects the first 4 bytes to be the expected length of
 	// the uncompressed data
 	TQByteArray dataTmp( data.size() + 4 );
 	memcpy( dataTmp.data()+4, data.data(), data.size() );
@@ -175,9 +175,9 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat
 	dataTmp[1] = ( len & 0x00ff0000 ) >> 16;
 	dataTmp[2] = ( len & 0x0000ff00 ) >> 8;
 	dataTmp[3] = ( len & 0x000000ff );
-	TQByteArray baunzip = qUncompress( dataTmp );
+	TQByteArray baunzip = tqUncompress( dataTmp );
 	len = baunzip.size();
-	img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')).ascii() );
+	img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.tqfind('.')).ascii() );
     } else {
 	img.loadFromData( (const uchar*)data.data(), data.size(), format.ascii() );
     }
@@ -205,16 +205,16 @@ static TQSizePolicy::SizeType stringToSizeType( const TQString& str )
 
 
 /*!
-  \class QWidgetFactory
+  \class TQWidgetFactory
 
   \brief The TQWidgetFactory class provides for the dynamic creation of widgets
-  from Qt Designer .ui files.
+  from TQt Designer .ui files.
 
   This class basically offers two things:
 
   \list
 
-  \i Dynamically creating widgets from \link designer-manual.book Qt
+  \i Dynamically creating widgets from \link designer-manual.book TQt
   Designer\endlink user interface description files.
   You can do this using the static function TQWidgetFactory::create().
   This function also performs signal and slot connections, tab
@@ -228,21 +228,21 @@ static TQSizePolicy::SizeType stringToSizeType( const TQString& str )
 
   \endlist
 
-  This class is not included in the Qt library itself. To use it you
+  This class is not included in the TQt library itself. To use it you
   must link against \c libqui.so (Unix) or \c qui.lib (Windows), which is
-  built into \c INSTALL/lib if you built \e{Qt Designer} (\c INSTALL is
-  the directory where Qt is installed ).
+  built into \c INSTALL/lib if you built \e{TQt Designer} (\c INSTALL is
+  the directory where TQt is installed ).
 
   See the "Creating Dynamic Dialogs from .ui Files" section of the \link
-  designer-manual.book Qt Designer manual\endlink for an example. See
-  also the \l{QWidgetPlugin} class and the \link plugins-howto.html
+  designer-manual.book TQt Designer manual\endlink for an example. See
+  also the \l{TQWidgetPlugin} class and the \link plugins-howto.html
   Plugins documentation\endlink.
 */
 
 /*! Constructs a TQWidgetFactory. */
 
 TQWidgetFactory::TQWidgetFactory()
-    : d( new QWidgetFactoryPrivate() ), dbControls( 0 ),
+    : d( new TQWidgetFactoryPrivate() ), dbControls( 0 ),
       usePixmapCollection( FALSE ), defMargin( 11 ), defSpacing( 6 )
 {
     widgetFactories.setAutoDelete( TRUE );
@@ -259,12 +259,12 @@ TQWidgetFactory::~TQWidgetFactory()
 
 /*!
 
-    Loads the \e{Qt Designer} user interface description file \a uiFile
-  and returns the top-level widget in that description. \a parent and
+    Loads the \e{TQt Designer} user interface description file \a uiFile
+  and returns the top-level widget in that description. \a tqparent and
   \a name are passed to the constructor of the top-level widget.
 
   This function also performs signal and slot connections, tab
-  ordering, etc., as described in the .ui file. In \e{Qt Designer} it
+  ordering, etc., as described in the .ui file. In \e{TQt Designer} it
   is possible to add custom slots to a form and connect to them. If
   you want these connections to be made, you must create a class
   derived from TQObject, which implements all these slots. Then pass an
@@ -278,15 +278,15 @@ TQWidgetFactory::~TQWidgetFactory()
 */
 
 TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
-				 TQWidget *parent, const char *name )
+				 TQWidget *tqparent, const char *name )
 {
     setupPluginDir();
     TQFile f( uiFile );
     bool failed = FALSE;
     if ( !f.open( IO_ReadOnly ) )
 	failed = TRUE;
-    if ( failed && qApp->type() == TQApplication::Tty ) {
-	// for QSA: If we have no GUI, we have no form definition
+    if ( failed && tqApp->type() == TQApplication::Tty ) {
+	// for TQSA: If we have no GUI, we have no form definition
 	// files, but just the code. So try if only the code exists.
 	f.setName( uiFile + ".qs" );
 	failed = !f.open( IO_ReadOnly );
@@ -295,7 +295,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
 	return 0;
 
     qwf_currFileName = uiFile;
-    TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name );
+    TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, tqparent, name );
     if ( !qwf_forms )
 	qwf_forms = new TQMap<TQWidget*, TQString>;
     qwf_forms->insert( w, uiFile );
@@ -308,7 +308,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
     Loads the user interface description from device \a dev.
  */
 
-TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name )
+TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name )
 {
     setupPluginDir();
     TQWidget *w = 0;
@@ -320,18 +320,18 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
     widgetFactory->toplevel = 0;
 
     // If we have no GUI, we only want to load the code
-    if ( qApp->type() != TQApplication::Tty ) {
+    if ( tqApp->type() != TQApplication::Tty ) {
 	TQIODevice::Offset start = dev->at();
-	Q_UINT32 magic;
+	TQ_UINT32 magic;
 	TQDataStream in( dev );
 	in >> magic;
 	if ( magic == UibMagic ) {
-	    w = widgetFactory->createFromUibFile( in, connector, parent, name );
+	    w = widgetFactory->createFromUibFile( in, connector, tqparent, name );
 	} else {
 	    in.unsetDevice();
 	    dev->at( start );
 	    if ( doc.setContent( dev, &errMsg, &errLine ) ) {
-		w = widgetFactory->createFromUiFile( doc, connector, parent, name );
+		w = widgetFactory->createFromUiFile( doc, connector, tqparent, name );
 	    } else {
 		// qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine );
 	    }
@@ -344,22 +344,22 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 
     if ( !languageInterfaceManager )
 	languageInterfaceManager =
-	    new QPluginManager<LanguageInterface>( IID_Language, TQApplication::libraryPaths(), *qwf_plugin_dir );
+	    new TQPluginManager<LanguageInterface>( IID_Language, TQApplication::libraryPaths(), *qwf_plugin_dir );
     widgetFactory->loadExtraSource();
 
     if ( widgetFactory->toplevel ) {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	TQMap<TQWidget*, SqlWidgetConnection>::Iterator cit = widgetFactory->sqlWidgetConnections.begin();
 	for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) {
-	    if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) !=
+	    if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) !=
 		 widgetFactory->noDatabaseWidgets.end() )
 		continue;
-	    if ( cit.key()->inherits( "QDesignerDataBrowser2" ) )
-		( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
-								    cit.key(), *(*cit).dbControls );
-	    else if ( cit.key()->inherits( "QDesignerDataView2" ) )
-		( (QDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
-								 cit.key(), *(*cit).dbControls );
+	    if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) )
+		( (TQDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
+								    TQT_TQOBJECT(cit.key()), *(*cit).dbControls );
+	    else if ( cit.key()->inherits( "TQDesignerDataView2" ) )
+		( (TQDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
+								 TQT_TQOBJECT(cit.key()), *(*cit).dbControls );
 	}
 
 	for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin();
@@ -367,10 +367,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 	    TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key().ascii(), TQDATATABLE_OBJECT_NAME_STRING );
 	    if ( !table )
 		continue;
-	    if ( widgetFactory->noDatabaseWidgets.find( table->name() ) !=
+	    if ( widgetFactory->noDatabaseWidgets.tqfind( table->name() ) !=
 		 widgetFactory->noDatabaseWidgets.end() )
 		continue;
-	    TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.find( table );
+	    TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.tqfind( table );
 	    TQString conn = (*it)[ 0 ];
 	    TQSqlCursor* c = 0;
 	    TQSqlDatabase *db = 0;
@@ -405,7 +405,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 }
 
 TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connector,
-	TQWidget *parent, const char *name )
+	TQWidget *tqparent, const char *name )
 {
     DomTool::fixDocument( doc );
 
@@ -456,7 +456,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
 	    widget = e;
 	} else if ( e.tagName() == "pixmapinproject" ) {
 	    usePixmapCollection = TRUE;
-	} else if ( e.tagName() == "layoutdefaults" ) {
+	} else if ( e.tagName() == "tqlayoutdefaults" ) {
 	    defSpacing = e.attribute( "spacing", TQString::number( defSpacing ) ).toInt();
 	    defMargin = e.attribute( "margin", TQString::number( defMargin ) ).toInt();
 	}
@@ -466,7 +466,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
     if ( !imageCollection.isNull() )
 	loadImageCollection( imageCollection );
 
-    createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
+    createWidgetInternal( widget, tqparent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
     TQWidget *w = toplevel;
     if ( !w )
 	return 0;
@@ -480,7 +480,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
 
     if ( !connections.isNull() )
 	loadConnections( connections, connector );
-    if ( w && name && qstrlen( name ) > 0 )
+    if ( w && name && tqstrlen( name ) > 0 )
 	w->setName( name );
 
     if ( !tabOrder.isNull() )
@@ -494,9 +494,9 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
     return w;
 }
 
-void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n )
+void TQWidgetFactory::unpackUInt16( TQDataStream& in, TQ_UINT16& n )
 {
-    Q_UINT8 half;
+    TQ_UINT8 half;
     in >> half;
     if ( half == 255 ) {
 	in >> n;
@@ -505,9 +505,9 @@ void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n )
     }
 }
 
-void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n )
+void TQWidgetFactory::unpackUInt32( TQDataStream& in, TQ_UINT32& n )
 {
-    Q_UINT16 half;
+    TQ_UINT16 half;
     in >> half;
     if ( half == 65535 ) {
 	in >> n;
@@ -518,7 +518,7 @@ void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n )
 
 void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array )
 {
-    Q_UINT32 size;
+    TQ_UINT32 size;
     unpackUInt32( in, size );
     array.resize( size );
     in.readRawBytes( array.data(), size );
@@ -527,7 +527,7 @@ void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array )
 void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& in,
 				    TQCString& cstr )
 {
-    Q_UINT32 n;
+    TQ_UINT32 n;
     unpackUInt32( in, n );
     cstr = strings.asCString( n );
 }
@@ -535,7 +535,7 @@ void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& i
 void TQWidgetFactory::unpackString( const UibStrTable& strings, TQDataStream& in,
 				   TQString& str )
 {
-    Q_UINT32 n;
+    TQ_UINT32 n;
     unpackUInt32( in, n );
     str = strings.asString( n );
 }
@@ -553,14 +553,14 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i
 				    TQVariant& value )
 {
     TQString imageName;
-    Q_UINT32 number;
-    Q_UINT16 count;
-    Q_UINT16 x;
-    Q_UINT16 y;
-    Q_UINT16 width;
-    Q_UINT16 height;
-    Q_UINT8 bit;
-    Q_UINT8 type;
+    TQ_UINT32 number;
+    TQ_UINT16 count;
+    TQ_UINT16 x;
+    TQ_UINT16 y;
+    TQ_UINT16 width;
+    TQ_UINT16 height;
+    TQ_UINT8 bit;
+    TQ_UINT8 type;
 
     in >> type;
 
@@ -652,7 +652,7 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i
 }
 
 void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
-				  TQLayout *parent )
+				  TQLayout *tqparent )
 {
     TQCString name;
     TQVariant value;
@@ -661,11 +661,11 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
     bool vertical = FALSE;
     int w = 0;
     int h = 0;
-    Q_UINT16 column = 0;
-    Q_UINT16 row = 0;
-    Q_UINT16 colspan = 1;
-    Q_UINT16 rowspan = 1;
-    Q_UINT8 objectTag;
+    TQ_UINT16 column = 0;
+    TQ_UINT16 row = 0;
+    TQ_UINT16 colspan = 1;
+    TQ_UINT16 rowspan = 1;
+    TQ_UINT8 objectTag;
 
     in >> objectTag;
     while ( !in.atEnd() && objectTag != Object_End ) {
@@ -682,7 +682,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
 
 	    if ( name == "orientation" ) {
 		vertical = ( value == "Vertical" );
-	    } else if ( name == "sizeHint" ) {
+	    } else if ( name == "tqsizeHint" ) {
 		w = value.toSize().width();
 		h = value.toSize().height();
 	    } else if ( name == "sizeType" ) {
@@ -695,7 +695,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
 	in >> objectTag;
     }
 
-    if ( parent != 0 ) {
+    if ( tqparent != 0 ) {
 	TQSpacerItem *spacer;
 	if ( vertical ) {
 	    spacer = new TQSpacerItem( w, h, TQSizePolicy::Minimum, sizeType );
@@ -703,18 +703,18 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
 	    spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum );
 	}
 
-	if ( parent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
-	    ((TQGridLayout *) parent)->addMultiCell( spacer, row,
+	if ( tqparent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+	    ((TQGridLayout *) tqparent)->addMultiCell( spacer, row,
 		    row + rowspan - 1, column, column + colspan - 1,
-		    vertical ? Qt::AlignHCenter : Qt::AlignVCenter );
+		    vertical ? TQt::AlignHCenter : TQt::AlignVCenter );
 	} else {
-	    parent->addItem( spacer );
+	    tqparent->addItem( spacer );
 	}
     }
 }
 
 void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
-				       TQDataStream& in, TQObject *parent,
+				       TQDataStream& in, TQObject *tqparent,
 				       bool isRow )
 {
     TQString text;
@@ -727,7 +727,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
     TQVariant value;
     TQCString comment;
     TQString str;
-    Q_UINT8 objectTag;
+    TQ_UINT8 objectTag;
 
     in >> objectTag;
     while ( !in.atEnd() && objectTag != Object_End ) {
@@ -762,13 +762,13 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
 	in >> objectTag;
     }
 
-    if ( parent != 0 ) {
-	if ( parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) {
-	    createListViewColumn( (TQListView *) parent, text, pixmap, clickable,
+    if ( tqparent != 0 ) {
+	if ( tqparent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) {
+	    createListViewColumn( (TQListView *) tqparent, text, pixmap, clickable,
 				  resizable );
-#ifndef QT_NO_TABLE
-	} else if ( parent->inherits(TQTABLE_OBJECT_NAME_STRING) ) {
-	    createTableColumnOrRow( (TQTable *) parent, text, pixmap, field,
+#ifndef TQT_NO_TABLE
+	} else if ( tqparent->inherits(TQTABLE_OBJECT_NAME_STRING) ) {
+	    createTableColumnOrRow( (TQTable *) tqparent, text, pixmap, field,
 				    isRow );
 #endif
 	}
@@ -776,24 +776,24 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
 }
 
 void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
-				TQObject *parent, TQListViewItem *parentItem )
+				TQObject *tqparent, TQListViewItem *tqparentItem )
 {
     TQStringList texts;
     TQValueList<TQPixmap> pixmaps;
     TQCString name;
     TQVariant value;
     TQCString comment;
-    Q_UINT8 objectTag;
+    TQ_UINT8 objectTag;
 
     TQListView *listView = 0;
-    if ( parent != 0 && parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) )
-	parent = (TQListView *) parent;
+    if ( tqparent != 0 && tqparent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) )
+	tqparent = TQT_TQOBJECT((TQListView *) tqparent);
     TQListViewItem *item = 0;
     if ( listView != 0 ) {
-	if ( parentItem == 0 ) {
+	if ( tqparentItem == 0 ) {
 	    item = new TQListViewItem( listView, d->lastItem );
 	} else {
-	    item = new TQListViewItem( parentItem, d->lastItem );
+	    item = new TQListViewItem( tqparentItem, d->lastItem );
 	}
 	d->lastItem = item;
     }
@@ -804,7 +804,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
 	case Object_Item:
 	    if ( listView != 0 )
 		d->lastItem->setOpen( TRUE );
-	    inputItem( strings, in, parent, item );
+	    inputItem( strings, in, tqparent, item );
 	    break;
 	case Object_TextProperty:
 	    unpackCString( strings, in, name );
@@ -847,21 +847,21 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
 	TQString text = texts.last();
 	TQPixmap pixmap = pixmaps.last();
 
-	if ( parent != 0 ) {
-	    if ( parent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ||
-		 parent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) {
-		TQListBox *listBox = (TQListBox *) parent->qt_cast( TQLISTBOX_OBJECT_NAME_STRING );
+	if ( tqparent != 0 ) {
+	    if ( tqparent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ||
+		 tqparent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) {
+		TQListBox *listBox = (TQListBox *) tqparent->qt_cast( TQLISTBOX_OBJECT_NAME_STRING );
 		if ( listBox == 0 )
-		    listBox = ((TQComboBox *) parent)->listBox();
+		    listBox = ((TQComboBox *) tqparent)->listBox();
 
 		if ( pixmap.isNull() ) {
 		    (void) new TQListBoxText( listBox, text );
 		} else {
 		    (void) new TQListBoxPixmap( listBox, pixmap, text );
 		}
-    #ifndef QT_NO_ICONVIEW
-	    } else if ( parent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) {
-		(void) new TQIconViewItem( (TQIconView *) parent, text, pixmap );
+    #ifndef TQT_NO_ICONVIEW
+	    } else if ( tqparent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) {
+		(void) new TQIconViewItem( (TQIconView *) tqparent, text, pixmap );
     #endif
 	    }
 	}
@@ -874,13 +874,13 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects,
 {
     TQCString name;
     TQCString text;
-    Q_UINT16 actionNo;
-    Q_UINT8 objectTag;
+    TQ_UINT16 actionNo;
+    TQ_UINT8 objectTag;
 
     unpackCString( strings, in, name );
     unpackCString( strings, in, text );
 
-    TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->parentWidget(), name );
+    TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->tqparentWidget(), name );
 
     in >> objectTag;
     while ( !in.atEnd() && objectTag != Object_End ) {
@@ -903,35 +903,35 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects,
 TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 				      const UibStrTable& strings,
 				      TQDataStream& in, TQWidget *ancestorWidget,
-				      TQObject *parent, TQCString className )
+				      TQObject *tqparent, TQCString className )
 {
     TQObject *obj = 0;
     TQWidget *widget = 0;
-    TQLayout *layout = 0;
-    TQWidget *parentWidget = 0;
-    TQLayout *parentLayout = 0;
-
-    bool isQObject = !className.isEmpty();
-    if ( isQObject ) {
-	if ( parent != 0 ) {
-	    if ( parent->isWidgetType() ) {
-		if ( parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) {
-		    parentWidget = ((TQMainWindow *) parent)->centralWidget();
+    TQLayout *tqlayout = 0;
+    TQWidget *tqparentWidget = 0;
+    TQLayout *tqparentLayout = 0;
+
+    bool isTQObject = !className.isEmpty();
+    if ( isTQObject ) {
+	if ( tqparent != 0 ) {
+	    if ( tqparent->isWidgetType() ) {
+		if ( tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) {
+		    tqparentWidget = ((TQMainWindow *) tqparent)->centralWidget();
 		} else {
-		    parentWidget = (TQWidget *) parent;
+		    tqparentWidget = (TQWidget *) tqparent;
 		}
-	    } else if ( parent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) {
-		parentLayout = (TQLayout *) parent;
-		parentWidget = ancestorWidget;
+	    } else if ( tqparent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) {
+		tqparentLayout = (TQLayout *) tqparent;
+		tqparentWidget = ancestorWidget;
 	    }
 	}
 
 	if ( className == TQACTION_OBJECT_NAME_STRING ) {
 	    unpackCString( strings, in, className );
 	    if ( className == TQACTIONGROUP_OBJECT_NAME_STRING ) {
-		obj = new TQActionGroup( parent );
+		obj = new TQActionGroup( tqparent );
 	    } else {
-		obj = new TQAction( parent );
+		obj = new TQAction( tqparent );
 	    }
 	} else if ( className == TQLAYOUT_OBJECT_NAME_STRING ) {
 	    unpackCString( strings, in, className );
@@ -941,27 +941,27 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	    } else if ( className == TQVBOXLAYOUT_OBJECT_NAME_STRING ) {
 		type = VBox;
 	    }
-	    if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
-		layout = createLayout( 0, 0, type );
+	    if ( tqparentLayout != 0 && tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+		tqlayout = createLayout( 0, 0, type );
 	    } else {
-		layout = createLayout( parentWidget, parentLayout, type );
+		tqlayout = createLayout( tqparentWidget, tqparentLayout, type );
 	    }
-	    obj = layout;
+	    obj = TQT_TQOBJECT(tqlayout);
 	} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
 	    unpackCString( strings, in, className );
-	    widget = ((TQMainWindow *) parent)->menuBar();
-	    obj = widget;
+	    widget = ((TQMainWindow *) tqparent)->menuBar();
+	    obj = TQT_TQOBJECT(widget);
 	} else if ( className == TQTOOLBAR_OBJECT_NAME_STRING ) {
-	    Q_UINT8 dock;
+	    TQ_UINT8 dock;
 	    in >> dock;
 	    unpackCString( strings, in, className );
-	    widget = new TQToolBar( TQString::null, (TQMainWindow *) parent,
-				   (Qt::Dock) dock );
-	    obj = widget;
+	    widget = new TQToolBar( TQString(), (TQMainWindow *) tqparent,
+				   (TQt::Dock) dock );
+	    obj = TQT_TQOBJECT(widget);
 	} else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
 	    unpackCString( strings, in, className );
-	    widget = createWidget( className, parentWidget, 0 );
-	    obj = widget;
+	    widget = createWidget( className, tqparentWidget, 0 );
+	    obj = TQT_TQOBJECT(widget);
 	}
 
 	if ( widget != 0 )
@@ -974,14 +974,14 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
     TQVariant value;
     TQCString comment;
     TQString str;
-    Q_UINT16 actionNo;
+    TQ_UINT16 actionNo;
     int metAttribute = 0;
-    Q_UINT16 column = 0;
-    Q_UINT16 row = 0;
-    Q_UINT16 colspan = 1;
-    Q_UINT16 rowspan = 1;
-    Q_UINT8 paletteTag;
-    Q_UINT8 objectTag;
+    TQ_UINT16 column = 0;
+    TQ_UINT16 row = 0;
+    TQ_UINT16 colspan = 1;
+    TQ_UINT16 rowspan = 1;
+    TQ_UINT8 paletteTag;
+    TQ_UINT8 objectTag;
 
     in >> objectTag;
     while ( !in.atEnd() && objectTag != Object_End ) {
@@ -1005,8 +1005,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	    {
 		TQFont font;
 		TQString family;
-		Q_UINT16 pointSize;
-		Q_UINT8 fontFlags;
+		TQ_UINT16 pointSize;
+		TQ_UINT8 fontFlags;
 
 		unpackCString( strings, in, name );
 		in >> fontFlags;
@@ -1047,7 +1047,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	case Object_PaletteProperty:
 	    {
 		TQPalette palette;
-		TQColorGroup colorGroup;
+		TQColorGroup tqcolorGroup;
 		TQColor color;
 		int role = -1;
 
@@ -1057,26 +1057,26 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 		while ( !in.atEnd() && paletteTag != Palette_End ) {
 		    switch ( paletteTag ) {
 		    case Palette_Active:
-			palette.setActive( colorGroup );
+			palette.setActive( tqcolorGroup );
 			role = -1;
 			break;
 		    case Palette_Inactive:
-			palette.setInactive( colorGroup );
+			palette.setInactive( tqcolorGroup );
 			role = -1;
 			break;
 		    case Palette_Disabled:
-			palette.setDisabled( colorGroup );
+			palette.setDisabled( tqcolorGroup );
 			role = -1;
 			break;
 		    case Palette_Color:
 			role++;
 			in >> color;
-			colorGroup.setColor( (TQColorGroup::ColorRole) role,
+			tqcolorGroup.setColor( (TQColorGroup::ColorRole) role,
 					     color );
 			break;
 		    case Palette_Pixmap:
 			unpackVariant( strings, in, value );
-			colorGroup.setBrush( (TQColorGroup::ColorRole) role,
+			tqcolorGroup.setBrush( (TQColorGroup::ColorRole) role,
 					     TQBrush(color, value.asPixmap()) );
 			break;
 		    default:
@@ -1092,21 +1092,21 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	    inputColumnOrRow( strings, in, obj, TRUE );
 	    break;
 	case Object_Spacer:
-	    inputSpacer( strings, in, layout );
+	    inputSpacer( strings, in, tqlayout );
 	    break;
 	case Object_Separator:
 	    ((TQToolBar *) widget)->addSeparator();
 	    break;
 	case Object_SubAction:
-	    inputObject( objects, numObjects, strings, in, parentWidget,
-			 obj != 0 ? obj : parent, TQACTION_OBJECT_NAME_STRING );
+	    inputObject( objects, numObjects, strings, in, tqparentWidget,
+			 obj != 0 ? obj : tqparent, TQACTION_OBJECT_NAME_STRING );
 	    break;
 	case Object_SubLayout:
-	    inputObject( objects, numObjects, strings, in, parentWidget, obj,
+	    inputObject( objects, numObjects, strings, in, tqparentWidget, obj,
 			 TQLAYOUT_OBJECT_NAME_STRING );
 	    break;
 	case Object_SubWidget:
-	    inputObject( objects, numObjects, strings, in, parentWidget, obj,
+	    inputObject( objects, numObjects, strings, in, tqparentWidget, obj,
 			 TQWIDGET_OBJECT_NAME_STRING );
 	    break;
 	case Object_TextProperty:
@@ -1117,11 +1117,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 
 	    if ( metAttribute > 0 ) {
 		if ( name == "title" ) {
-		    if ( parent != 0 ) {
-			if ( parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) {
-			    ((TQTabWidget *) parent)->insertTab( widget, str );
-			} else if ( parent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) {
-			    ((TQWizard *) parent)->addPage( widget, str );
+		    if ( tqparent != 0 ) {
+			if ( tqparent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) {
+			    ((TQTabWidget *) tqparent)->insertTab( widget, str );
+			} else if ( tqparent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) {
+			    ((TQWizard *) tqparent)->addPage( widget, str );
 			}
 		    }
 		}
@@ -1136,8 +1136,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 
 	    if ( metAttribute > 0 ) {
 		if ( name == "id" ) {
-		    if ( parent != 0 && parent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) )
-			((TQWidgetStack *) parent)->addWidget( widget, value.toInt() );
+		    if ( tqparent != 0 && tqparent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) )
+			((TQWidgetStack *) tqparent)->addWidget( widget, value.toInt() );
 		}
 	    } else {
 		if ( obj != 0 )
@@ -1151,19 +1151,19 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	metAttribute--;
     }
 
-    if ( parentLayout != 0 ) {
+    if ( tqparentLayout != 0 ) {
 	if ( widget != 0 ) {
-	    if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
-		((TQGridLayout *) parentLayout)->addMultiCellWidget(
+	    if ( tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+		((TQGridLayout *) tqparentLayout)->addMultiCellWidget(
 			widget, row, row + rowspan - 1, column,
 			column + colspan - 1 );
 	    } else {
-		((TQBoxLayout *) parentLayout)->addWidget( widget );
+		((TQBoxLayout *) tqparentLayout)->addWidget( widget );
 	    }
-	} else if ( layout != 0 ) {
-	    if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
-		((TQGridLayout *) parentLayout)->addMultiCellLayout(
-			layout, row, row + rowspan - 1, column,
+	} else if ( tqlayout != 0 ) {
+	    if ( tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+		((TQGridLayout *) tqparentLayout)->addMultiCellLayout(
+			tqlayout, row, row + rowspan - 1, column,
 			column + colspan - 1 );
 	    }
 	}
@@ -1172,13 +1172,13 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 }
 
 TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
-	TQObject * /* connector */ , TQWidget *parent, const char *name )
+	TQObject * /* connector */ , TQWidget *tqparent, const char *name )
 {
 #define END_OF_BLOCK() \
-	( in.atEnd() || in.device()->at() >= nextBlock )
+	( in.atEnd() || in.tqdevice()->at() >= nextBlock )
 
-    Q_UINT8 lf;
-    Q_UINT8 cr;
+    TQ_UINT8 lf;
+    TQ_UINT8 cr;
     in >> lf;
     in >> cr;
     if ( lf != '\n' || cr != '\r' ) {
@@ -1186,10 +1186,10 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	return 0;
     }
 
-    Q_UINT8 qdatastreamVersion;
+    TQ_UINT8 qdatastreamVersion;
     in >> qdatastreamVersion;
     if ( (int) qdatastreamVersion > in.version() ) {
-	qWarning( "Incompatible version of Qt" );
+	qWarning( "Incompatible version of TQt" );
 	return 0;
     }
     in.setVersion( qdatastreamVersion );
@@ -1198,22 +1198,22 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
     TQObject **objects = 0;
     int numObjects = 0;
 
-    Q_UINT8 blockType;
-    Q_UINT32 blockSize;
+    TQ_UINT8 blockType;
+    TQ_UINT32 blockSize;
 
     in >> blockType;
     while ( !in.atEnd() && blockType != Block_End ) {
 	unpackUInt32( in, blockSize );
-	TQIODevice::Offset nextBlock = in.device()->at() + blockSize;
+	TQIODevice::Offset nextBlock = in.tqdevice()->at() + blockSize;
 
 	switch ( blockType ) {
 	case Block_Actions:
-	    inputObject( objects, numObjects, strings, in, toplevel, toplevel );
+	    inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(toplevel) );
 	    break;
 	case Block_Buddies:
 	    {
-		Q_UINT16 labelNo;
-		Q_UINT16 buddyNo;
+		TQ_UINT16 labelNo;
+		TQ_UINT16 buddyNo;
 
 		do {
 		    unpackUInt16( in, labelNo );
@@ -1228,11 +1228,11 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	case Block_Connections:
 	    {
 		TQString language = "C++";
-		Q_UINT16 senderNo = 0;
+		TQ_UINT16 senderNo = 0;
 		TQString signal = "clicked()";
-		Q_UINT16 receiverNo = 0;
+		TQ_UINT16 receiverNo = 0;
 		TQString slot = "accept()";
-		Q_UINT8 connectionFlags;
+		TQ_UINT8 connectionFlags;
 
 		do {
 		    in >> connectionFlags;
@@ -1258,12 +1258,12 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	case Block_Functions:
 	    // ###
 	    qWarning( "Block_Functions not supported" );
-	    in.device()->at( nextBlock );
+	    in.tqdevice()->at( nextBlock );
 	    break;
 	case Block_Images:
 	    {
 		TQString format;
-		Q_UINT32 length;
+		TQ_UINT32 length;
 		TQByteArray data;
 		Image image;
 
@@ -1279,10 +1279,10 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	    break;
 	case Block_Intro:
 	    {
-		Q_INT16 defaultMargin;
-		Q_INT16 defaultSpacing;
-		Q_UINT16 maxObjects;
-		Q_UINT8 introFlags;
+		TQ_INT16 defaultMargin;
+		TQ_INT16 defaultSpacing;
+		TQ_UINT16 maxObjects;
+		TQ_UINT8 introFlags;
 
 		in >> introFlags;
 		in >> defaultMargin;
@@ -1300,7 +1300,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	    }
 	    break;
 	case Block_Menubar:
-	    inputObject( objects, numObjects, strings, in, toplevel, toplevel,
+	    inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(toplevel),
 			 TQMENUBAR_OBJECT_NAME_STRING );
 	    break;
 	case Block_Slots:
@@ -1319,8 +1319,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	    break;
 	case Block_Tabstops:
 	    {
-		Q_UINT16 beforeNo;
-		Q_UINT16 afterNo;
+		TQ_UINT16 beforeNo;
+		TQ_UINT16 afterNo;
 
 		unpackUInt16( in, beforeNo );
 		while ( !END_OF_BLOCK() ) {
@@ -1334,17 +1334,17 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	case Block_Toolbars:
 	    do {
 		inputObject( objects, numObjects, strings, in, toplevel,
-			     toplevel, TQTOOLBAR_OBJECT_NAME_STRING );
+			     TQT_TQOBJECT(toplevel), TQTOOLBAR_OBJECT_NAME_STRING );
 	    } while ( !END_OF_BLOCK() );
 	    break;
 	case Block_Variables:
 	    // ###
 	    qWarning( "Block_Variables not supported" );
-	    in.device()->at( nextBlock );
+	    in.tqdevice()->at( nextBlock );
 	    break;
 	case Block_Widget:
 	    toplevel = (TQWidget *)
-		inputObject( objects, numObjects, strings, in, toplevel, parent,
+		inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(tqparent),
 			     TQWIDGET_OBJECT_NAME_STRING );
 	    if ( toplevel != 0 )
 		toplevel->setName( name );
@@ -1359,7 +1359,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
     return toplevel;
 }
 
-/*! Installs a widget factory \a factory, which normally contains
+/*! Installs a widget factory \a factory, which normally tqcontains
   additional widgets that can then be created using a TQWidgetFactory.
   See createWidget() for further details.
 */
@@ -1370,11 +1370,11 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory )
 }
 
 /*!
-    Creates a widget of the type \a className passing \a parent and \a
+    Creates a widget of the type \a className passing \a tqparent and \a
     name to its constructor.
 
-    If \a className is a widget in the Qt library, it is directly
-    created by this function. If the widget isn't in the Qt library,
+    If \a className is a widget in the TQt library, it is directly
+    created by this function. If the widget isn't in the TQt library,
     each of the installed widget plugins is asked, in turn, to create
     the widget. As soon as a plugin says it can create the widget it
     is asked to do so. It may occur that none of the plugins can
@@ -1388,9 +1388,9 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory )
     \list 1
 
     \i Write a widget plugin. This allows you to use the widget in
-    \e{Qt Designer} and in this TQWidgetFactory. See the widget plugin
+    \e{TQt Designer} and in this TQWidgetFactory. See the widget plugin
     documentation for further details. (See the "Creating Custom
-    Widgets with Plugins" section of the \link designer-manual.book Qt
+    Widgets with Plugins" section of the \link designer-manual.book TQt
     Designer manual\endlink for an example.
 
     \i Subclass TQWidgetFactory. Then reimplement this function to
@@ -1406,119 +1406,119 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory )
     \endlist
 */
 
-TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *parent,
+TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent,
 				       const char *name ) const
 {
     // create widgets we know
     if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
-	return new TQPushButton( parent, name );
+	return new TQPushButton( tqparent, name );
     } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
-	return new TQToolButton( parent, name );
+	return new TQToolButton( tqparent, name );
     } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
-	return new TQCheckBox( parent, name );
+	return new TQCheckBox( tqparent, name );
     } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
-	return new TQRadioButton( parent, name );
+	return new TQRadioButton( tqparent, name );
     } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
-	return new TQGroupBox( parent, name );
+	return new TQGroupBox( tqparent, name );
     } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
-	return new TQButtonGroup( parent, name );
+	return new TQButtonGroup( tqparent, name );
     } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
-#if !defined(QT_NO_ICONVIEW)
-	return new TQIconView( parent, name );
+#if !defined(TQT_NO_ICONVIEW)
+	return new TQIconView( tqparent, name );
 #endif
     } else if ( className == TQTABLE_OBJECT_NAME_STRING ) {
-#if !defined(QT_NO_TABLE)
-	return new TQTable( parent, name );
+#if !defined(TQT_NO_TABLE)
+	return new TQTable( tqparent, name );
 #endif
     } else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) {
-	return new TQListBox( parent, name );
+	return new TQListBox( tqparent, name );
     } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) {
-	return new TQListView( parent, name );
+	return new TQListView( tqparent, name );
     } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING ) {
-	return new TQLineEdit( parent, name );
+	return new TQLineEdit( tqparent, name );
     } else if ( className == TQSPINBOX_OBJECT_NAME_STRING ) {
-	return new TQSpinBox( parent, name );
+	return new TQSpinBox( tqparent, name );
     } else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) {
-	return new TQMultiLineEdit( parent, name );
+	return new TQMultiLineEdit( tqparent, name );
     } else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" || className == "PixmapLabel" ) {
-	return new TQLabel( parent, name );
+	return new TQLabel( tqparent, name );
     } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
-	return new TQWidget( parent, name );
+	return new TQWidget( tqparent, name );
     } else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
-	return new TQTabWidget( parent, name );
+	return new TQTabWidget( tqparent, name );
     } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) {
-	return new TQComboBox( FALSE, parent, name );
+	return new TQComboBox( FALSE, tqparent, name );
     } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
 	if ( !qwf_stays_on_top )
-	    return new TQWidget( parent, name );
-	return new TQWidget( parent, name, Qt::WStyle_StaysOnTop );
+	    return new TQWidget( tqparent, name );
+	return new TQWidget( tqparent, name, TQt::WStyle_StaysOnTop );
     } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
 	if ( !qwf_stays_on_top )
-	    return new TQDialog( parent, name );
-	return new TQDialog( parent, name, FALSE, Qt::WStyle_StaysOnTop );
+	    return new TQDialog( tqparent, name );
+	return new TQDialog( tqparent, name, FALSE, TQt::WStyle_StaysOnTop );
     } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
-	return  new TQWizard( parent, name );
+	return  new TQWizard( tqparent, name );
     } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING ) {
-	return new TQLCDNumber( parent, name );
+	return new TQLCDNumber( tqparent, name );
     } else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING ) {
-	return new TQProgressBar( parent, name );
+	return new TQProgressBar( tqparent, name );
     } else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING ) {
-	return new TQTextView( parent, name );
+	return new TQTextView( tqparent, name );
     } else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING ) {
-	return new TQTextBrowser( parent, name );
+	return new TQTextBrowser( tqparent, name );
     } else if ( className == TQDIAL_OBJECT_NAME_STRING ) {
-	return new TQDial( parent, name );
+	return new TQDial( tqparent, name );
     } else if ( className == TQSLIDER_OBJECT_NAME_STRING ) {
-	return new TQSlider( parent, name );
+	return new TQSlider( tqparent, name );
     } else if ( className == TQFRAME_OBJECT_NAME_STRING ) {
-	return new TQFrame( parent, name );
+	return new TQFrame( tqparent, name );
     } else if ( className == TQSPLITTER_OBJECT_NAME_STRING ) {
-	return new TQSplitter( parent, name );
+	return new TQSplitter( tqparent, name );
     } else if ( className == "Line" ) {
-	TQFrame *f = new TQFrame( parent, name );
+	TQFrame *f = new TQFrame( tqparent, name );
 	f->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
 	return f;
     } else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) {
-	return new TQTextEdit( parent, name );
+	return new TQTextEdit( tqparent, name );
     } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) {
-	return new QDateEdit( parent, name );
+	return new TQDateEdit( tqparent, name );
     } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) {
-	return new QTimeEdit( parent, name );
+	return new TQTimeEdit( tqparent, name );
     } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) {
-	return new QDateTimeEdit( parent, name );
+	return new TQDateTimeEdit( tqparent, name );
     } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) {
-	return new TQScrollBar( parent, name );
+	return new TQScrollBar( tqparent, name );
     } else if ( className == TQPOPUPMENU_OBJECT_NAME_STRING ) {
-	return new TQPopupMenu( parent, name );
+	return new TQPopupMenu( tqparent, name );
     } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
-	return new TQWidgetStack( parent, name );
+	return new TQWidgetStack( tqparent, name );
     } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
-	return new TQToolBox( parent, name );
+	return new TQToolBox( tqparent, name );
     } else if ( className == TQVBOX_OBJECT_NAME_STRING ) {
-	return new TQVBox( parent, name );
+	return new TQVBox( tqparent, name );
     } else if ( className == TQHBOX_OBJECT_NAME_STRING ) {
-	return new TQHBox( parent, name );
+	return new TQHBox( tqparent, name );
     } else if ( className == TQGRID_OBJECT_NAME_STRING ) {
-	return new TQGrid( 4, parent, name );
+	return new TQGrid( 4, tqparent, name );
     } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
 	TQMainWindow *mw = 0;
 	if ( !qwf_stays_on_top )
-	    mw = new TQMainWindow( parent, name );
+	    mw = new TQMainWindow( tqparent, name );
 	else
-	    mw = new TQMainWindow( parent, name, Qt::WType_TopLevel | Qt::WStyle_StaysOnTop );
+	    mw = new TQMainWindow( tqparent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop );
 	mw->setCentralWidget( new TQWidget( mw, "qt_central_widget" ) );
 	mw->centralWidget()->show();
 	(void)mw->statusBar();
 	return mw;
 
     }
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
-	return new TQDataTable( parent, name );
+	return new TQDataTable( tqparent, name );
     } else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
-	return new QDesignerDataBrowser2( parent, name );
+	return new TQDesignerDataBrowser2( tqparent, name );
     } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
-	return new QDesignerDataView2( parent, name );
+	return new TQDesignerDataView2( tqparent, name );
     }
 #endif
 
@@ -1526,22 +1526,22 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa
     // try to create it using the loaded widget plugins
     if ( !widgetInterfaceManager )
 	widgetInterfaceManager =
-	    new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(),
+	    new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(),
 						 *qwf_plugin_dir );
 
-    QInterfacePtr<WidgetInterface> iface = 0;
+    TQInterfacePtr<WidgetInterface> iface = 0;
     widgetInterfaceManager->queryInterface( className, &iface );
     if ( iface ) {
-	TQWidget *w = iface->create( className, parent, name );
+	TQWidget *w = iface->create( className, tqparent, name );
 	if ( w ) {
-	    d->customWidgets.replace( className.latin1(), new bool(TRUE) );
+	    d->customWidgets.tqreplace( className.latin1(), new bool(TRUE) );
 	    return w;
 	}
     }
 
     // hope we have a factory which can do it
     for ( TQWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) {
-	TQWidget *w = f->createWidget( className, parent, name );
+	TQWidget *w = f->createWidget( className, tqparent, name );
 	if ( w )
 	    return w;
     }
@@ -1564,11 +1564,11 @@ TQStringList TQWidgetFactory::widgets()
 bool TQWidgetFactory::supportsWidget( const TQString &widget )
 {
     setupWidgetListAndMap();
-    return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() );
+    return ( availableWidgetMap->tqfind( widget ) != availableWidgetMap->end() );
 }
 
-TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent,
-					       TQLayout* layout, const TQString &classNameArg )
+TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent,
+					       TQLayout* tqlayout, const TQString &classNameArg )
 {
     d->lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -1586,18 +1586,18 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     if ( colspan < 1 )
 	colspan = 1;
 
-    bool isQLayoutWidget = FALSE;
+    bool isTQLayoutWidget = FALSE;
 
     if ( !className.isEmpty() ) {
-	if ( !layout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+	if ( !tqlayout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
 	    className = TQWIDGET_OBJECT_NAME_STRING;
-	    isQLayoutWidget = TRUE;
+	    isTQLayoutWidget = TRUE;
 	}
-	if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
-	    // hide layout widgets
-	    w = parent;
+	if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+	    // hide tqlayout widgets
+	    w = tqparent;
 	} else {
-	    obj = TQWidgetFactory::createWidget( className, parent, 0 );
+	    obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, tqparent, 0 ));
 	    if ( !obj )
 		return 0;
 	    w = (TQWidget*)obj;
@@ -1605,16 +1605,16 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
 		toplevel = w;
 	    if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 		w = ( (TQMainWindow*)w )->centralWidget();
-	    if ( layout ) {
-		switch( layoutType( layout ) ) {
+	    if ( tqlayout ) {
+		switch( tqlayoutType( tqlayout ) ) {
 		case HBox:
-		    ( (TQHBoxLayout*)layout )->addWidget( w );
+		    ( (TQHBoxLayout*)tqlayout )->addWidget( w );
 		    break;
 		case VBox:
-		    ( (TQVBoxLayout*)layout )->addWidget( w );
+		    ( (TQVBoxLayout*)tqlayout )->addWidget( w );
 		    break;
 		case Grid:
-		    ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
+		    ( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								  col, col + colspan - 1 );
 		    break;
 		default:
@@ -1622,12 +1622,12 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
 		}
 	    }
 
-	    layout = 0;
+	    tqlayout = 0;
 	}
     }
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
-    TQString parentClassName = parent ? parent->className() : 0;
-    bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE;
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
+    TQString tqparentClassName = tqparent ? tqparent->className() : 0;
+    bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE;
     if ( isPlugin )
 	qWarning( "####### loading custom container widgets without page support not implemented!" );
     // ### TODO loading for custom container widgets without pages
@@ -1636,45 +1636,45 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     int idx = 0;
     while ( !n.isNull() ) {
 	if ( n.tagName() == "spacer" ) {
-	    createSpacer( n, layout );
+	    createSpacer( n, tqlayout );
 	} else if ( n.tagName() == "widget" ) {
 	    TQMap< TQString, TQString> *oldDbControls = dbControls;
-	    createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
+	    createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
 	    dbControls = oldDbControls;
 	} else if ( n.tagName() == "hbox" ) {
-	    TQLayout *parentLayout = layout;
-	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		layout = createLayout( 0, 0, TQWidgetFactory::HBox, isQLayoutWidget );
+	    TQLayout *tqparentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
 	    else
-		layout = createLayout( w, layout, TQWidgetFactory::HBox, isQLayoutWidget );
-	    obj = layout;
+		tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
-	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
+	    if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
 				    row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "grid" ) {
-	    TQLayout *parentLayout = layout;
-	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		layout = createLayout( 0, 0, TQWidgetFactory::Grid, isQLayoutWidget );
+	    TQLayout *tqparentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
 	    else
-		layout = createLayout( w, layout, TQWidgetFactory::Grid, isQLayoutWidget );
-	    obj = layout;
+		tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
-	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
+	    if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
 				    row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "vbox" ) {
-	    TQLayout *parentLayout = layout;
-	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		layout = createLayout( 0, 0, TQWidgetFactory::VBox, isQLayoutWidget );
+	    TQLayout *tqparentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
 	    else
-		layout = createLayout( w, layout, TQWidgetFactory::VBox, isQLayoutWidget );
-	    obj = layout;
+		tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
-	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
+	    if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
 				    row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
@@ -1682,31 +1682,31 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
 	} else if ( n.tagName() == "attribute" && w ) {
 	    TQString attrib = n.attribute( "name" );
 	    TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
-	    if ( parent ) {
-		if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+	    if ( tqparent ) {
+		if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
 		    if ( attrib == "title" )
-			( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) );
-		} else if ( parent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
+			( (TQTabWidget*)tqparent )->insertTab( w, translate( v.toString() ) );
+		} else if ( tqparent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
 		    if ( attrib == "id" )
-			( (TQWidgetStack*)parent )->addWidget( w, v.toInt() );
-		} else if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
+			( (TQWidgetStack*)tqparent )->addWidget( w, v.toInt() );
+		} else if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
 		    if ( attrib == "label" )
-			( (TQToolBox*)parent )->addItem( w, v.toString() );
-		} else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+			( (TQToolBox*)tqparent )->addItem( w, v.toString() );
+		} else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
 		    if ( attrib == "title" )
-			( (TQWizard*)parent )->addPage( w, translate( v.toString() ) );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+			( (TQWizard*)tqparent )->addPage( w, translate( v.toString() ) );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 		} else if ( isPlugin ) {
 		    if ( attrib == "label" ) {
 			WidgetInterface *iface = 0;
-			widgetInterfaceManager->queryInterface( parentClassName, &iface );
+			widgetInterfaceManager->queryInterface( tqparentClassName, &iface );
 			if ( iface ) {
-			    QWidgetContainerInterfacePrivate *iface2 = 0;
-			    iface->queryInterface( IID_QWidgetContainer,
-						   (QUnknownInterface**)&iface2 );
+			    TQWidgetContainerInterfacePrivate *iface2 = 0;
+			    iface->queryInterface( IID_TQWidgetContainer,
+						   (TQUnknownInterface**)&iface2 );
 			    if ( iface2 ) {
-				iface2->insertPage( parentClassName,
-						    (TQWidget*)parent, translate( v.toString() ), -1, w );
+				iface2->insertPage( tqparentClassName,
+						    (TQWidget*)tqparent, translate( v.toString() ), -1, w );
 				iface2->release();
 			    }
 			    iface->release();
@@ -1728,47 +1728,47 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     return w;
 }
 
-TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout,
-				       LayoutType type, bool isQLayoutWidget )
+TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
+				       LayoutType type, bool isTQLayoutWidget )
 {
     int spacing = defSpacing;
     int margin = defMargin;
 
-    if ( layout || !widget || isQLayoutWidget )
+    if ( tqlayout || !widget || isTQLayoutWidget )
 	margin = 0;
 
-    if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
 	widget = ((TQTabWidget*)widget)->currentPage();
 
-    if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
 	widget = ((TQToolBox*)widget)->currentItem();
 
     TQLayout *l = 0;
     int align = 0;
-    if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+    if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
 	TQGroupBox *gb = (TQGroupBox*)widget;
 	gb->setColumnLayout( 0, Qt::Vertical );
-	layout = gb->layout();
-	layout->setMargin( 0 );
-	layout->setSpacing( 0 );
-	align = Qt::AlignTop;
+	tqlayout = gb->tqlayout();
+	tqlayout->setMargin( 0 );
+	tqlayout->setSpacing( 0 );
+	align = TQt::AlignTop;
     }
-    if ( layout ) {
+    if ( tqlayout ) {
 	switch ( type ) {
         case HBox:
-	    l = new TQHBoxLayout( layout );
+	    l = new TQHBoxLayout( tqlayout );
 	    break;
 	case VBox:
-	    l = new TQVBoxLayout( layout );
+	    l = new TQVBoxLayout( tqlayout );
 	    break;
 	case Grid:
-	    l = new TQGridLayout( layout );
+	    l = new TQGridLayout( tqlayout );
 	    break;
 	default:
 	    return 0;
@@ -1788,19 +1788,19 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout,
 	    return 0;
 	}
     }
-    l->setAlignment( align );
+    l->tqsetAlignment( align );
     l->setMargin( margin );
     l->setSpacing( spacing );
     return l;
 }
 
-TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const
+TQWidgetFactory::LayoutType TQWidgetFactory::tqlayoutType( TQLayout *tqlayout ) const
 {
-    if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
+    if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
-    else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return VBox;
-    else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
 	return Grid;
     return NoLayout;
 }
@@ -1808,18 +1808,18 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) cons
 void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 				  TQVariant value )
 {
-    int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE );
+    int offset = obj->tqmetaObject()->tqfindProperty( prop.ascii(), TRUE );
 
     if ( offset != -1 ) {
-	if ( prop == "geometry" && obj == toplevel ) {
+	if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
 	    toplevel->resize( value.toRect().size() );
 	} else if ( prop == "accel" ) {
-	    obj->setProperty( prop.ascii(), value.toKeySequence() );
+	    obj->setProperty( prop.ascii(), TQVariant(value.toKeySequence()) );
 	} else {
 	    if ( value.type() == TQVariant::String ||
 		 value.type() == TQVariant::CString ) {
 		const TQMetaProperty *metaProp =
-			obj->metaObject()->property( offset, TRUE );
+			obj->tqmetaObject()->property( offset, TRUE );
 		if ( metaProp != 0 && metaProp->isEnumType() ) {
 		    if ( metaProp->isSetType() ) {
 			TQStrList flagsCStr;
@@ -1850,9 +1850,9 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 	    } else if ( prop == "buddy" ) {
 		buddies.insert( obj->name(), value.toCString() );
 	    } else if ( prop == "buttonGroupId" ) {
-		if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
-		    ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() );
-#ifndef QT_NO_SQL
+		if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
+		    ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, value.toInt() );
+#ifndef TQT_NO_SQL
 	    } else if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING )
 		 && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) {
 		const TQStringList& lst = value.asStringList();
@@ -1917,7 +1917,7 @@ void TQWidgetFactory::setProperty( TQObject* widget, const TQString &prop, const
     setProperty( widget, prop, value );
 }
 
-void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
+void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -1938,7 +1938,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
 		    orient = Qt::Vertical;
 	    } else if ( prop == "sizeType" ) {
 		sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() );
-	    } else if ( prop == "sizeHint" ) {
+	    } else if ( prop == "tqsizeHint" ) {
 		w = n.firstChild().firstChild().firstChild().toText().data().toInt();
 		h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
 	    }
@@ -1952,12 +1952,12 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
 	colspan = 1;
     TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
 					 orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
-    if ( layout ) {
-	if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
-	    ( (TQBoxLayout*)layout )->addItem( item );
+    if ( tqlayout ) {
+	if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+	    ( (TQBoxLayout*)tqlayout )->addItem( item );
 	else
-	    ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
-						    orient == Qt::Horizontal ? Qt::AlignVCenter : Qt::AlignHCenter );
+	    ( (TQGridLayout*)tqlayout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
+						    orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
     }
 }
 
@@ -2050,7 +2050,7 @@ struct Connection
     Connection() : sender( 0 ), receiver( 0 ) { }
 };
 
-class NormalizeObject : public QObject
+class NormalizeObject : public TQObject
 {
 public:
     NormalizeObject() : TQObject() {}
@@ -2069,7 +2069,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 		if ( n2.tagName() == "sender" ) {
 		    TQString name = n2.firstChild().toText().data();
 		    if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) {
-			conn.sender = toplevel;
+			conn.sender = TQT_TQOBJECT(toplevel);
 		    } else {
 			if ( name == "this" )
 			    name = toplevel->name();
@@ -2087,7 +2087,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 		} else if ( n2.tagName() == "receiver" ) {
 		    TQString name = n2.firstChild().toText().data();
 		    if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) {
-			conn.receiver = toplevel;
+			conn.receiver = TQT_TQOBJECT(toplevel);
 		    } else {
 			TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE );
 			if ( l ) {
@@ -2113,7 +2113,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 	    TQObject *sender = 0, *receiver = 0;
 	    TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), FALSE );
 	    if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) {
-		sender = toplevel;
+		sender = TQT_TQOBJECT(toplevel);
 	    } else {
 		if ( !l || !l->first() ) {
 		    delete l;
@@ -2127,7 +2127,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 		sender = findAction( conn.sender->name() );
 
 	    if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) {
-		receiver = toplevel;
+		receiver = TQT_TQOBJECT(toplevel);
 	    } else {
 		l = toplevel->queryList( 0, conn.receiver->name(), FALSE );
 		if ( !l || !l->first() ) {
@@ -2140,22 +2140,22 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 	    }
 
 	    TQString s = "2""%1";
-	    s = s.arg( conn.signal );
+	    s = s.tqarg( conn.signal.data() );
 	    TQString s2 = "1""%1";
-	    s2 = s2.arg( conn.slot );
+	    s2 = s2.tqarg( conn.slot.data() );
 
-	    TQStrList signalList = sender->metaObject()->signalNames( TRUE );
-	    TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
+	    TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
+	    TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
 
 	    // if this is a connection to a custom slot and we have a connector, try this as receiver
-	    if ( slotList.find( conn.slot ) == -1 && receiver == toplevel && connector ) {
-		slotList = connector->metaObject()->slotNames( TRUE );
+	    if ( slotList.tqfind( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) {
+		slotList = connector->tqmetaObject()->slotNames( TRUE );
 		receiver = connector;
 	    }
 
 	    // avoid warnings
-	    if ( signalList.find( conn.signal ) == -1 ||
-		 slotList.find( conn.slot ) == -1 ) {
+	    if ( signalList.tqfind( conn.signal ) == -1 ||
+		 slotList.tqfind( conn.slot ) == -1 ) {
 		n = n.nextSibling().toElement();
 		continue;
 	    }
@@ -2206,40 +2206,40 @@ void TQWidgetFactory::createListViewColumn( TQListView *lv, const TQString& txt,
 	lv->header()->setResizeEnabled( resizable, i );
 }
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& txt,
 					     const TQPixmap& pix,
 					     const TQString& field, bool isRow )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     bool isSql = table->inherits( TQDATATABLE_OBJECT_NAME_STRING );
 #endif
     if ( isRow )
 	table->setNumRows( table->numRows() + 1 );
     else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( !isSql )
 #endif
 	    table->setNumCols( table->numCols() + 1 );
     }
 
     TQValueList<Field> fieldMap;
-    if ( fieldMaps.find( table ) != fieldMaps.end() ) {
-	fieldMap = *fieldMaps.find( table );
+    if ( fieldMaps.tqfind( table ) != fieldMaps.end() ) {
+	fieldMap = *fieldMaps.tqfind( table );
 	fieldMaps.remove( table );
     }
 
     int i = isRow ? table->numRows() - 1 : table->numCols() - 1;
     TQHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader();
     if ( !pix.isNull() ) {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( isSql )
 	    ((TQDataTable*)table)->addColumn( field, txt, -1, pix );
 	else
 #endif
 	    h->setLabel( i, pix, txt );
     } else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( isSql )
 	    ((TQDataTable*)table)->addColumn( field, txt );
 	else
@@ -2279,7 +2279,7 @@ void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget )
 	}
 	createListViewColumn( lv, txt, pix, clickable, resizable );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) {
 	TQTable *table = (TQTable*)widget;
 
@@ -2344,7 +2344,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis
 	} else {
 	    new TQListBoxText( lb, txt );
 	}
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
@@ -2399,13 +2399,13 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis
 
 
 
-void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e )
+void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e )
 {
     TQDomElement n = e;
     TQAction *a = 0;
     bool hasMenuText = FALSE;
     if ( n.tagName() == "action" ) {
-	a = new TQAction( parent );
+	a = new TQAction( tqparent );
 	TQDomElement n2 = n.firstChild().toElement();
 	
 	while ( !n2.isNull() ) {
@@ -2417,10 +2417,10 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
 	    actionList.append( a );
     } else if ( n.tagName() == "actiongroup" ) {
-	a = new TQActionGroup( parent );
+	a = new TQActionGroup( tqparent );
 	TQDomElement n2 = n.firstChild().toElement();
 	while ( !n2.isNull() ) {
 	    if ( n2.tagName() == "property" ) {
@@ -2435,7 +2435,7 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
 	    actionList.append( a );
     }
 
@@ -2448,9 +2448,9 @@ void TQWidgetFactory::loadActions( const TQDomElement &e )
     TQDomElement n = e.firstChild().toElement();
     while ( !n.isNull() ) {
 	if ( n.tagName() == "action" ) {
-	    loadChildAction( toplevel, n );
+	    loadChildAction( TQT_TQOBJECT(toplevel), n );
 	} else if ( n.tagName() == "actiongroup" ) {
-	    loadChildAction( toplevel, n );
+	    loadChildAction( TQT_TQOBJECT(toplevel), n );
 	}
 	n = n.nextSibling().toElement();
     }
@@ -2463,8 +2463,8 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e )
     TQToolBar *tb = 0;
     while ( !n.isNull() ) {
 	if ( n.tagName() == "toolbar" ) {
-	    Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt();
-	    tb = new TQToolBar( TQString::null, mw, dock );
+	    TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt();
+	    tb = new TQToolBar( TQString(), mw, dock );
 	    tb->setLabel( n.attribute( "label" ) );
 	    tb->setName( n.attribute( "name" ).ascii() );
 	    TQDomElement n2 = n.firstChild().toElement();
@@ -2478,7 +2478,7 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e )
 		} else if ( n2.tagName() == "widget" ) {
 		    (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
 		} else if ( n2.tagName() == "property" ) {
-		    setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() );
+		    setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() );
 		}
 		n2 = n2.nextSibling().toElement();
 	    }
@@ -2499,7 +2499,7 @@ void TQWidgetFactory::loadMenuBar( const TQDomElement &e )
 	    popup->setName( n.attribute( "name" ).ascii() );
 	    mb->insertItem( translate( n.attribute( "text" ) ), popup );
 	} else if ( n.tagName() == "property" ) {
-	    setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() );
+	    setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() );
 	} else if ( n.tagName() == "separator" ) {
 	    mb->insertSeparator();
 	}
@@ -2595,12 +2595,12 @@ void TQWidgetFactory::loadExtraSource()
 
 TQString TQWidgetFactory::translate( const TQString& sourceText, const TQString& comment )
 {
-    return qApp->translate( d->translationContext, sourceText.utf8(), comment.utf8(),
+    return tqApp->translate( d->translationContext, sourceText.utf8(), comment.utf8(),
 			    TQApplication::UnicodeUTF8 );
 }
 
 TQString TQWidgetFactory::translate( const char *sourceText, const char *comment )
 {
-    return qApp->translate( d->translationContext, sourceText, comment,
+    return tqApp->translate( d->translationContext, sourceText, comment,
 			    TQApplication::UnicodeUTF8 );
 }
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index 87daa640..c7028696 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,17 +17,17 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
-#ifndef QWIDGETFACTORY_H
-#define QWIDGETFACTORY_H
+#ifndef TQWIDGETFACTORY_H
+#define TQWIDGETFACTORY_H
 
-#ifndef QT_H
+#ifndef TQT_H
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqimage.h>
@@ -35,7 +35,7 @@
 #include <tqvaluelist.h>
 #include <tqmap.h>
 #include <tqaction.h>
-#endif // QT_H
+#endif // TQT_H
 
 class TQDomDocument;
 class TQDomElement;
@@ -45,21 +45,21 @@ class TQListViewItem;
 class TQMenuBar;
 class TQTable;
 class TQWidget;
-class QWidgetFactoryPrivate;
+class TQWidgetFactoryPrivate;
 class UibStrTable;
 
-class QWidgetFactory
+class TQWidgetFactory
 {
 public:
     TQWidgetFactory();
     virtual ~TQWidgetFactory();
 
-    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
-    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
+    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
+    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
     static void addWidgetFactory( TQWidgetFactory *factory );
     static void loadImages( const TQString &dir );
 
-    virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
+    virtual TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const;
     static TQStringList widgets();
     static bool supportsWidget( const TQString &widget );
 
@@ -68,12 +68,12 @@ private:
     void loadImageCollection( const TQDomElement &e );
     void loadConnections( const TQDomElement &e, TQObject *connector );
     void loadTabOrder( const TQDomElement &e );
-    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
-    TQLayout *createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type, bool isQLayoutWidget = FALSE );
-    LayoutType layoutType( TQLayout *l ) const;
+    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg );
+    TQLayout *createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
+    LayoutType tqlayoutType( TQLayout *l ) const;
     void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
     void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
-    void createSpacer( const TQDomElement &e, TQLayout *layout );
+    void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
     TQImage loadFromCollection( const TQString &name );
     TQPixmap loadPixmap( const TQString &name );
     TQPixmap loadPixmap( const TQDomElement &e );
@@ -81,7 +81,7 @@ private:
     void createListViewColumn( TQListView *lv, const TQString& txt,
 			       const TQPixmap& pix, bool clickable,
 			       bool resizable );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     void createTableColumnOrRow( TQTable *table, const TQString& txt,
 				 const TQPixmap& pix, const TQString& field,
 				 bool isRow );
@@ -89,7 +89,7 @@ private:
     void createColumn( const TQDomElement &e, TQWidget *widget );
     void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap );
     void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
-    void loadChildAction( TQObject *parent, const TQDomElement &e );
+    void loadChildAction( TQObject *tqparent, const TQDomElement &e );
     void loadActions( const TQDomElement &e );
     void loadToolBars( const TQDomElement &e );
     void loadMenuBar( const TQDomElement &e );
@@ -98,10 +98,10 @@ private:
     TQAction *findAction( const TQString &name );
     void loadExtraSource();
     TQString translate( const char *sourceText, const char *comment = "" );
-    TQString translate( const TQString& sourceText, const TQString& comment = TQString::null );
+    TQString translate( const TQString& sourceText, const TQString& comment = TQString() );
 
-    void unpackUInt16( TQDataStream& in, Q_UINT16& n );
-    void unpackUInt32( TQDataStream& in, Q_UINT32& n );
+    void unpackUInt16( TQDataStream& in, TQ_UINT16& n );
+    void unpackUInt32( TQDataStream& in, TQ_UINT32& n );
     void unpackByteArray( TQDataStream& in, TQByteArray& array );
     void unpackCString( const UibStrTable& strings, TQDataStream& in,
 			TQCString& cstr );
@@ -112,21 +112,21 @@ private:
     void unpackVariant( const UibStrTable& strings, TQDataStream& in,
 			TQVariant& value );
     void inputSpacer( const UibStrTable& strings, TQDataStream& in,
-		      TQLayout *parent );
+		      TQLayout *tqparent );
     void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in,
-			   TQObject *parent, bool isRow );
+			   TQObject *tqparent, bool isRow );
     void inputItem( const UibStrTable& strings, TQDataStream& in,
-		    TQObject *parent, TQListViewItem *parentItem = 0 );
+		    TQObject *tqparent, TQListViewItem *tqparentItem = 0 );
     void inputMenuItem( TQObject **objects, const UibStrTable& strings,
 			TQDataStream& in, TQMenuBar *menuBar );
     TQObject *inputObject( TQObject **objects, int& numObjects,
 			  const UibStrTable& strings, TQDataStream& in,
-			  TQWidget *ancestorWidget, TQObject *parent,
+			  TQWidget *ancestorWidget, TQObject *tqparent,
 			  TQCString className = "" );
     TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector,
-			       TQWidget *parent, const char *name );
+			       TQWidget *tqparent, const char *name );
     TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector,
-				TQWidget *parent, const char *name );
+				TQWidget *tqparent, const char *name );
 
 private:
     struct Image {
@@ -145,7 +145,7 @@ private:
 	TQString name;
 	TQPixmap pix;
 	TQString field;
-	Q_DUMMY_COMPARISON_OPERATOR( Field )
+	TQ_DUMMY_COMPARISON_OPERATOR( Field )
     };
 
     struct SqlWidgetConnection
@@ -156,12 +156,12 @@ private:
 	TQString conn;
 	TQString table;
 	TQMap<TQString, TQString> *dbControls;
-	Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
+	TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
     };
 
     TQValueList<Image> images;
     TQWidget *toplevel;
-    QWidgetFactoryPrivate *d;
+    TQWidgetFactoryPrivate *d;
     TQMap<TQString, TQString> *dbControls;
     TQMap<TQString, TQStringList> dbTables;
     TQMap<TQWidget*, SqlWidgetConnection> sqlWidgetConnections;
diff --git a/kdevelop.m4.in b/kdevelop.m4.in
index 90e88204..33d2c912 100644
--- a/kdevelop.m4.in
+++ b/kdevelop.m4.in
@@ -401,8 +401,10 @@ ac_db_lib=db
     AC_LANG_CPLUSPLUS
 
     save_CXXFLAGS="$CXXFLAGS"
+    save_LDFLAGS="$LDFLAGS"
 
-    CXXFLAGS="$CXXFLAGS $ac_db_includedir $ac_db_libdir -l$ac_db_lib"
+    CXXFLAGS="$CXXFLAGS $QT_INCLUDES $ac_db_includedir $ac_db_libdir -l$ac_db_lib"
+    LDFLAGS="$LDFLAGS $LIBQT"
 
     AC_TRY_LINK([
       #include <db.h>
@@ -419,6 +421,7 @@ ac_db_lib=db
     ac_cv_bdb=no
     )
     CXXFLAGS="$save_CXXFLAGS"
+    LDFLAGS="$save_LDFLAGS"
     AC_LANG_RESTORE
    ])
 
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp
index e783595e..3656446e 100644
--- a/languages/ada/AdaParser.cpp
+++ b/languages/ada/AdaParser.cpp
@@ -1954,10 +1954,10 @@ void AdaParser::value_s() {
 	returnAST = value_s_AST;
 }
 
-void AdaParser::parenth_values() {
+void AdaParser::tqparenth_values() {
 	returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST;
-	RefAdaAST parenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
+	RefAdaAST tqparenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	
 	match(LPAREN);
 	value();
@@ -1981,8 +1981,8 @@ void AdaParser::parenth_values() {
 	_loop46:;
 	} // ( ... )*
 	match(RPAREN);
-	parenth_values_AST = RefAdaAST(currentAST.root);
-	returnAST = parenth_values_AST;
+	tqparenth_values_AST = RefAdaAST(currentAST.root);
+	returnAST = tqparenth_values_AST;
 }
 
 void AdaParser::value() {
@@ -2869,10 +2869,10 @@ RefAdaAST  AdaParser::is_operator() {
 	return d;
 }
 
-void AdaParser::parenthesized_primary() {
+void AdaParser::tqparenthesized_primary() {
 	returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST;
-	RefAdaAST parenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
+	RefAdaAST tqparenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	ANTLR_USE_NAMESPACE(antlr)RefToken  pp = ANTLR_USE_NAMESPACE(antlr)nullToken;
 	RefAdaAST pp_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	
@@ -2913,8 +2913,8 @@ void AdaParser::parenthesized_primary() {
 		Set(pp_AST, PARENTHESIZED_PRIMARY);
 #line 2915 "AdaParser.cpp"
 	}
-	parenthesized_primary_AST = RefAdaAST(currentAST.root);
-	returnAST = parenthesized_primary_AST;
+	tqparenthesized_primary_AST = RefAdaAST(currentAST.root);
+	returnAST = tqparenthesized_primary_AST;
 }
 
 void AdaParser::extension_opt() {
@@ -5643,7 +5643,7 @@ void AdaParser::enumeration_aggregate() {
 	ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST;
 	RefAdaAST enumeration_aggregate_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 	
-	parenth_values();
+	tqparenth_values();
 	if (inputState->guessing==0) {
 		astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 	}
@@ -8484,7 +8484,7 @@ void AdaParser::statements() {
 		case SELECT:
 		case ABORT:
 		case RAISE:
-		case REQUEUE:
+		case RETQUEUE:
 		{
 			statement();
 			if (inputState->guessing==0) {
@@ -8601,7 +8601,7 @@ void AdaParser::handled_stmts_opt() {
 	case SELECT:
 	case ABORT:
 	case RAISE:
-	case REQUEUE:
+	case RETQUEUE:
 	{
 		statements();
 		if (inputState->guessing==0) {
@@ -8708,7 +8708,7 @@ void AdaParser::statement() {
 		}
 		break;
 	}
-	case REQUEUE:
+	case RETQUEUE:
 	{
 		requeue_stmt();
 		if (inputState->guessing==0) {
@@ -8878,7 +8878,7 @@ void AdaParser::def_label_opt() {
 	case SELECT:
 	case ABORT:
 	case RAISE:
-	case REQUEUE:
+	case RETQUEUE:
 	{
 		break;
 	}
@@ -9207,7 +9207,7 @@ void AdaParser::requeue_stmt() {
 		r_AST = astFactory->create(r);
 		astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(r_AST));
 	}
-	match(REQUEUE);
+	match(RETQUEUE);
 	name();
 	if (inputState->guessing==0) {
 		astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -9238,7 +9238,7 @@ void AdaParser::requeue_stmt() {
 	match(SEMI);
 	if ( inputState->guessing==0 ) {
 #line 1393 "ada.g"
-		Set (r_AST, REQUEUE_STATEMENT);
+		Set (r_AST, RETQUEUE_STATEMENT);
 #line 9243 "AdaParser.cpp"
 	}
 	requeue_stmt_AST = RefAdaAST(currentAST.root);
@@ -10517,7 +10517,7 @@ void AdaParser::stmts_opt() {
 		case SELECT:
 		case ABORT:
 		case RAISE:
-		case REQUEUE:
+		case RETQUEUE:
 		{
 			statement();
 			if (inputState->guessing==0) {
@@ -11401,7 +11401,7 @@ void AdaParser::primary() {
 	}
 	case LPAREN:
 	{
-		parenthesized_primary();
+		tqparenthesized_primary();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
@@ -11623,7 +11623,7 @@ void AdaParser::name_or_qualified() {
 			switch ( LA(1)) {
 			case LPAREN:
 			{
-				parenthesized_primary();
+				tqparenthesized_primary();
 				if (inputState->guessing==0) {
 					astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 				}
@@ -12036,7 +12036,7 @@ const char* AdaParser::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"REQUEUE_STATEMENT",
+	"RETQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",
diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.hpp
index 0074c820..cf9fec9b 100644
--- a/languages/ada/AdaParser.hpp
+++ b/languages/ada/AdaParser.hpp
@@ -97,7 +97,7 @@ public:
 	public: void function_tail();
 	public: void generic_inst();
 	public: void value_s();
-	public: void parenth_values();
+	public: void tqparenth_values();
 	public: void value();
 	public: void ranged_expr_s();
 	public: void ranged_expr();
@@ -115,7 +115,7 @@ public:
 	public: void name();
 	public: RefAdaAST  definable_operator_symbol();
 	public: RefAdaAST  is_operator();
-	public: void parenthesized_primary();
+	public: void tqparenthesized_primary();
 	public: void extension_opt();
 	public: void separate_or_abstract(
 		RefAdaAST t
diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp
index 167d671c..1561277f 100644
--- a/languages/ada/AdaStoreWalker.cpp
+++ b/languages/ada/AdaStoreWalker.cpp
@@ -3223,8 +3223,8 @@ void AdaStoreWalker::name(RefAdaAST _t) {
 	_retTree = _t;
 }
 
-void AdaStoreWalker::parenthesized_primary(RefAdaAST _t) {
-	RefAdaAST parenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t;
+void AdaStoreWalker::tqparenthesized_primary(RefAdaAST _t) {
+	RefAdaAST tqparenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t;
 	
 	try {      // for error handling
 		RefAdaAST __t129 = _t;
@@ -6710,7 +6710,7 @@ void AdaStoreWalker::statement(RefAdaAST _t) {
 			_t = _retTree;
 			break;
 		}
-		case REQUEUE_STATEMENT:
+		case RETQUEUE_STATEMENT:
 		{
 			requeue_stmt(_t);
 			_t = _retTree;
@@ -7102,7 +7102,7 @@ void AdaStoreWalker::requeue_stmt(RefAdaAST _t) {
 	try {      // for error handling
 		RefAdaAST __t470 = _t;
 		RefAdaAST tmp233_AST_in = _t;
-		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),REQUEUE_STATEMENT);
+		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),RETQUEUE_STATEMENT);
 		_t = _t->getFirstChild();
 		name(_t);
 		_t = _retTree;
@@ -8809,7 +8809,7 @@ void AdaStoreWalker::primary(RefAdaAST _t) {
 		}
 		case PARENTHESIZED_PRIMARY:
 		{
-			parenthesized_primary(_t);
+			tqparenthesized_primary(_t);
 			_t = _retTree;
 			break;
 		}
@@ -8960,7 +8960,7 @@ void AdaStoreWalker::name_or_qualified(RefAdaAST _t) {
 			switch ( _t->getType()) {
 			case PARENTHESIZED_PRIMARY:
 			{
-				parenthesized_primary(_t);
+				tqparenthesized_primary(_t);
 				_t = _retTree;
 				break;
 			}
@@ -9271,7 +9271,7 @@ const char* AdaStoreWalker::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"REQUEUE_STATEMENT",
+	"RETQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",
diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.hpp
index c18f5dcd..bf661ea2 100644
--- a/languages/ada/AdaStoreWalker.hpp
+++ b/languages/ada/AdaStoreWalker.hpp
@@ -185,7 +185,7 @@ public:
 	public: void defining_identifier_list(RefAdaAST _t);
 	public: void init_opt(RefAdaAST _t);
 	public: void name(RefAdaAST _t);
-	public: void parenthesized_primary(RefAdaAST _t);
+	public: void tqparenthesized_primary(RefAdaAST _t);
 	public: void extension_opt(RefAdaAST _t);
 	public: void task_type_or_single_decl(RefAdaAST _t);
 	public: void prot_type_or_single_decl(RefAdaAST _t);
diff --git a/languages/ada/AdaStoreWalkerTokenTypes.hpp b/languages/ada/AdaStoreWalkerTokenTypes.hpp
index daaa4b21..bdaf1d2a 100644
--- a/languages/ada/AdaStoreWalkerTokenTypes.hpp
+++ b/languages/ada/AdaStoreWalkerTokenTypes.hpp
@@ -92,7 +92,7 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes {
 		OR = 81,
 		TERMINATE = 82,
 		RAISE = 83,
-		REQUEUE = 84,
+		RETQUEUE = 84,
 		AND = 85,
 		XOR = 86,
 		NOT = 87,
@@ -177,7 +177,7 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes {
 		RAISE_STATEMENT = 166,
 		RANGE_ATTRIBUTE_REFERENCE = 167,
 		RECORD_REPRESENTATION_CLAUSE = 168,
-		REQUEUE_STATEMENT = 169,
+		RETQUEUE_STATEMENT = 169,
 		RETURN_STATEMENT = 170,
 		SELECTIVE_ACCEPT = 171,
 		SEQUENCE_OF_STATEMENTS = 172,
diff --git a/languages/ada/AdaTokenTypes.hpp b/languages/ada/AdaTokenTypes.hpp
index 918b1cfd..8ef62fbf 100644
--- a/languages/ada/AdaTokenTypes.hpp
+++ b/languages/ada/AdaTokenTypes.hpp
@@ -92,7 +92,7 @@ struct CUSTOM_API AdaTokenTypes {
 		OR = 81,
 		TERMINATE = 82,
 		RAISE = 83,
-		REQUEUE = 84,
+		RETQUEUE = 84,
 		AND = 85,
 		XOR = 86,
 		NOT = 87,
@@ -177,7 +177,7 @@ struct CUSTOM_API AdaTokenTypes {
 		RAISE_STATEMENT = 166,
 		RANGE_ATTRIBUTE_REFERENCE = 167,
 		RECORD_REPRESENTATION_CLAUSE = 168,
-		REQUEUE_STATEMENT = 169,
+		RETQUEUE_STATEMENT = 169,
 		RETURN_STATEMENT = 170,
 		SELECTIVE_ACCEPT = 171,
 		SEQUENCE_OF_STATEMENTS = 172,
diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp
index be5f0623..f6c122b5 100644
--- a/languages/ada/AdaTreeParserSuper.cpp
+++ b/languages/ada/AdaTreeParserSuper.cpp
@@ -2404,8 +2404,8 @@ void AdaTreeParserSuper::definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)Ref
 	_retTree = _t;
 }
 
-void AdaTreeParserSuper::parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
-	ANTLR_USE_NAMESPACE(antlr)RefAST parenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t;
+void AdaTreeParserSuper::tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
+	ANTLR_USE_NAMESPACE(antlr)RefAST tqparenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t;
 	
 	try {      // for error handling
 		ANTLR_USE_NAMESPACE(antlr)RefAST __t101 = _t;
@@ -6298,7 +6298,7 @@ void AdaTreeParserSuper::statement(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
 			_t = _retTree;
 			break;
 		}
-		case REQUEUE_STATEMENT:
+		case RETQUEUE_STATEMENT:
 		{
 			requeue_stmt(_t);
 			_t = _retTree;
@@ -6690,7 +6690,7 @@ void AdaTreeParserSuper::requeue_stmt(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
 	try {      // for error handling
 		ANTLR_USE_NAMESPACE(antlr)RefAST __t463 = _t;
 		ANTLR_USE_NAMESPACE(antlr)RefAST tmp231_AST_in = _t;
-		match(_t,REQUEUE_STATEMENT);
+		match(_t,RETQUEUE_STATEMENT);
 		_t = _t->getFirstChild();
 		name(_t);
 		_t = _retTree;
@@ -8397,7 +8397,7 @@ void AdaTreeParserSuper::primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
 		}
 		case PARENTHESIZED_PRIMARY:
 		{
-			parenthesized_primary(_t);
+			tqparenthesized_primary(_t);
 			_t = _retTree;
 			break;
 		}
@@ -8548,7 +8548,7 @@ void AdaTreeParserSuper::name_or_qualified(ANTLR_USE_NAMESPACE(antlr)RefAST _t)
 			switch ( _t->getType()) {
 			case PARENTHESIZED_PRIMARY:
 			{
-				parenthesized_primary(_t);
+				tqparenthesized_primary(_t);
 				_t = _retTree;
 				break;
 			}
@@ -8882,7 +8882,7 @@ const char* AdaTreeParserSuper::tokenNames[] = {
 	"RAISE_STATEMENT",
 	"RANGE_ATTRIBUTE_REFERENCE",
 	"RECORD_REPRESENTATION_CLAUSE",
-	"REQUEUE_STATEMENT",
+	"RETQUEUE_STATEMENT",
 	"RETURN_STATEMENT",
 	"SELECTIVE_ACCEPT",
 	"SEQUENCE_OF_STATEMENTS",
diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.hpp
index a4d164f0..01833993 100644
--- a/languages/ada/AdaTreeParserSuper.hpp
+++ b/languages/ada/AdaTreeParserSuper.hpp
@@ -67,7 +67,7 @@ public:
 	public: void init_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void name(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
-	public: void parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
+	public: void tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void extension_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void spec_decl_part(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void basic_declarative_items_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
diff --git a/languages/ada/AdaTreeParserSuperTokenTypes.hpp b/languages/ada/AdaTreeParserSuperTokenTypes.hpp
index 924b7415..46edd24a 100644
--- a/languages/ada/AdaTreeParserSuperTokenTypes.hpp
+++ b/languages/ada/AdaTreeParserSuperTokenTypes.hpp
@@ -92,7 +92,7 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes {
 		OR = 81,
 		TERMINATE = 82,
 		RAISE = 83,
-		REQUEUE = 84,
+		RETQUEUE = 84,
 		AND = 85,
 		XOR = 86,
 		NOT = 87,
@@ -177,7 +177,7 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes {
 		RAISE_STATEMENT = 166,
 		RANGE_ATTRIBUTE_REFERENCE = 167,
 		RECORD_REPRESENTATION_CLAUSE = 168,
-		REQUEUE_STATEMENT = 169,
+		RETQUEUE_STATEMENT = 169,
 		RETURN_STATEMENT = 170,
 		SELECTIVE_ACCEPT = 171,
 		SEQUENCE_OF_STATEMENTS = 172,
diff --git a/languages/ada/README.dox b/languages/ada/README.dox
index e71e6d45..ccb7f0aa 100644
--- a/languages/ada/README.dox
+++ b/languages/ada/README.dox
@@ -24,7 +24,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato
 \authors <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a>
 \authors <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a>
 
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \requirement Ada compiler
 
diff --git a/languages/ada/ada.g b/languages/ada/ada.g
index 5f97952b..876255f5 100644
--- a/languages/ada/ada.g
+++ b/languages/ada/ada.g
@@ -179,7 +179,7 @@ generic_inst : NEW! compound_name ( LPAREN! value_s RPAREN! )?
 	{ pop_def_id(); }
 	;
 
-parenth_values : LPAREN! value ( COMMA! value )* RPAREN!
+tqparenth_values : LPAREN! value ( COMMA! value )* RPAREN!
 	;
 
 value : ( OTHERS^ RIGHT_SHAFT! expression
@@ -287,7 +287,7 @@ definable_operator_symbol returns [RefAdaAST d]
 		op:CHAR_STRING { #op->setType(OPERATOR_SYMBOL); d=#op; }
 	;
 
-parenthesized_primary : pp:LPAREN^
+tqparenthesized_primary : pp:LPAREN^
 		( NuLL RECORD!
 		| value_s extension_opt
 		)
@@ -851,7 +851,7 @@ abstract_tagged_limited_opt
 local_enum_name : IDENTIFIER  // to be refined: do a symbol table lookup
 	;
 
-enumeration_aggregate : parenth_values
+enumeration_aggregate : tqparenth_values
 	;
 
 aliased_constant_opt : ( ALIASED )? ( CONSTANT )?
@@ -1267,7 +1267,7 @@ accept_stmt : a:ACCEPT^ def_id[false] entry_index_opt formal_part_opt
 	;
 
 entry_index_opt : ( (LPAREN expression RPAREN) => LPAREN! expression RPAREN!
-	// Looks alot like parenthesized_expr_opt, but it's not.
+	// Looks alot like tqparenthesized_expr_opt, but it's not.
 	// We need the syn pred for the usage context in accept_stmt.
 	// The formal_part_opt that follows the entry_index_opt there
 	// creates ambiguity (due to the opening LPAREN.)
@@ -1463,7 +1463,7 @@ factor : ( NOT^ primary
 	;
 
 primary : ( name_or_qualified
-	| parenthesized_primary
+	| tqparenthesized_primary
 	| allocator
 	| NuLL
 	| NUMERIC_LIT
@@ -1485,7 +1485,7 @@ name_or_qualified { RefAdaAST dummy; }
 			)
 		| p:LPAREN^ value_s RPAREN!
 			{ Set(#p, INDEXED_COMPONENT); }
-		| TIC^ ( parenthesized_primary | attribute_id )
+		| TIC^ ( tqparenthesized_primary | attribute_id )
 		)*
 	;
 
@@ -1773,7 +1773,7 @@ tokens {
   // part 3: Non-RM synthetic tokens.
   // They exist mainly to normalize the node structure with respect to
   // optional items. (Without them, the presence or absence of an optional
-  // item would change the node layout, but we want a fixed layout.)
+  // item would change the node tqlayout, but we want a fixed tqlayout.)
   ABSTRACT_FUNCTION_DECLARATION;
   ABSTRACT_PROCEDURE_DECLARATION;
   ACCESS_TO_FUNCTION_DECLARATION;
diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g
index dbca7312..a9a6fbde 100644
--- a/languages/ada/ada.store.g
+++ b/languages/ada/ada.store.g
@@ -582,7 +582,7 @@ name_or_qualified
 	   )
 	| #(INDEXED_COMPONENT name_or_qualified value_s)
 	| #(TIC name_or_qualified
-		( parenthesized_primary
+		( tqparenthesized_primary
 		| attribute_id
 		)
 	   )
diff --git a/languages/ada/ada.tree.g b/languages/ada/ada.tree.g
index df167dcd..6f343f97 100644
--- a/languages/ada/ada.tree.g
+++ b/languages/ada/ada.tree.g
@@ -189,7 +189,7 @@ name    : IDENTIFIER
 definable_operator_symbol : OPERATOR_SYMBOL
 	;
 
-parenthesized_primary
+tqparenthesized_primary
 	: #(PARENTHESIZED_PRIMARY ( NuLL | value_s extension_opt ) )
 	;
 
@@ -901,7 +901,7 @@ factor  : #(NOT primary)
 
 primary :
 	( name_or_qualified
-	| parenthesized_primary
+	| tqparenthesized_primary
 	| allocator
 	| NuLL
 	| NUMERIC_LIT
@@ -926,7 +926,7 @@ name_or_qualified
 	   )
 	| #(INDEXED_COMPONENT name_or_qualified value_s)
 	| #(TIC name_or_qualified
-		( parenthesized_primary
+		( tqparenthesized_primary
 		| attribute_id
 		)
 	   )
diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp
index 6e4bea13..516218c8 100644
--- a/languages/ada/ada_utils.cpp
+++ b/languages/ada/ada_utils.cpp
@@ -16,7 +16,7 @@
 
 TQString qtext (const RefAdaAST& n)
 {
-  return TQString::fromLatin1 (text (n).c_str ());
+  return TQString::tqfromLatin1 (text (n).c_str ());
 }
 
 TQStringList qnamelist (const RefAdaAST& n)
@@ -30,7 +30,7 @@ TQString ada_spec_filename (const TQString& comp_unit_name)
 {
    TQString fn (comp_unit_name.lower ());
 
-   fn.replace (TQRegExp("."), "-");
+   fn.tqreplace (TQRegExp("."), "-");
    fn += ".ads";
    return fn;
 }
@@ -44,7 +44,7 @@ TQString fq_specfilename (const TQString& comp_unit_name)
 
     TQString adaincpath = getenv ("ADA_INCLUDE_PATH");
     if (adaincpath.isNull ())
-        return TQString::null;
+        return TQString();
 
     TQStringList dirs = TQStringList::split (':', adaincpath);
     TQString fq_filename;
@@ -64,6 +64,6 @@ TQString fq_specfilename (const TQString& comp_unit_name)
     } else {
         kdDebug () << "Cannot find file " << fname << endl;
     }
-    return TQString::null;
+    return TQString();
 }
 
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index 7c7f4198..35b34c44 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -50,8 +50,8 @@ struct AdaSupportPartData {
     AdaSupportPartData () : problemReporter (0) {}
 };
 
-AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
+AdaSupportPart::AdaSupportPart (TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport (&data, tqparent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
 {
     setInstance (AdaSupportPartFactory::instance ());
 
@@ -78,7 +78,7 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri
     // a small hack (robe)
     //classStore ()->globalScope ()->setName ("(default packages)");
     //classStore ()->addScope (classStore ()->globalScope ());
-    //classStore ()->globalScope ()->setName (TQString::null);
+    //classStore ()->globalScope ()->setName (TQString());
 }
 
 
@@ -143,7 +143,7 @@ void AdaSupportPart::initialParse ()
 
             TQString fn = project ()->projectDirectory () + "/" + *it;
             maybeParse (fn);
-            kapp->processEvents (500);
+            kapp->tqprocessEvents (500);
         }
 
         emit updatedSourceInfo();
@@ -167,7 +167,7 @@ void AdaSupportPart::maybeParse (const TQString &fileName)
 {
     kdDebug () << "AdaSupportPart::maybeParse: " << fileName << endl;
 
-    if (!fileExtensions ().contains (TQFileInfo (fileName).extension ()))
+    if (!fileExtensions ().tqcontains (TQFileInfo (fileName).extension ()))
         return;
 
 //    mainWindow ()->statusBar ()->message (i18n ("Parsing file: %1").arg (fileName));
@@ -250,7 +250,7 @@ void AdaSupportPart::parse (const TQString &fileName)
         }
     } catch (antlr::ANTLRException& ex) {
         kdDebug () << "*exception*: " << ex.toString ().c_str () << endl;
-        d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage ().c_str() ),
+        d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage ().c_str() ),
                                          fileName,
                                          lexer.getLine (),
                                          lexer.getColumn ());
@@ -285,7 +285,7 @@ void AdaSupportPart::parseContents (const TQString& contents, const TQString& fi
 
     } catch (antlr::ANTLRException& ex) {
         kdDebug () << "*exception*: " << ex.toString ().c_str () << endl;
-        d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage().c_str() ),
+        d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage().c_str() ),
                                          fileName,
                                          lexer.getLine (),
                                          lexer.getColumn ());
@@ -298,7 +298,7 @@ void AdaSupportPart::savedFile (const KURL& fileName)
 {
     kdDebug () << "AdaSupportPart::savedFile ()" << endl;
 
-    if (project ()->allFiles ().contains (fileName.path().mid (project ()->projectDirectory ().length () + 1))) {
+    if (project ()->allFiles ().tqcontains (fileName.path().mid (project ()->projectDirectory ().length () + 1))) {
         maybeParse (fileName.path());
         emit updatedSourceInfo();
     }
@@ -328,7 +328,7 @@ void AdaSupportPart::saveProjectSourceInfo( )
         return;
 
     TQDataStream stream( &f );
-    TQMap<TQString, Q_ULONG> offsets;
+    TQMap<TQString, TQ_ULONG> offsets;
 
     TQString pcs( "PCS" );
     stream << pcs << KDEV_PCS_VERSION;
@@ -336,13 +336,13 @@ void AdaSupportPart::saveProjectSourceInfo( )
     stream << int( fileList.size() );
     for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
         const FileDom dom = (*it);
-#if QT_VERSION >= 0x030100
+#if [[[TQT_VERSION IS DEPRECATED]]] >= 0x030100
         stream << dom->name() << m_timestamp[ dom->name() ].toTime_t();
 #else
         stream << dom->name() << toTime_t(m_timestamp[ dom->name() ]);
 #endif
         offsets.insert( dom->name(), stream.device()->at() );
-        stream << (Q_ULONG)0; // dummy offset
+        stream << (TQ_ULONG)0; // dummy offset
     }
 
     for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h
index aefaab76..a2e01a5f 100644
--- a/languages/ada/adasupportpart.h
+++ b/languages/ada/adasupportpart.h
@@ -13,8 +13,9 @@ class TQStringList;
 class AdaSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    AdaSupportPart (TQObject *parent, const char *name, const TQStringList &);
+    AdaSupportPart (TQObject *tqparent, const char *name, const TQStringList &);
     ~AdaSupportPart ();
 
     void parseContents (const TQString& contents, const TQString& fileName);
diff --git a/languages/ada/addclass.cpp b/languages/ada/addclass.cpp
index ee28ff93..8605e42a 100644
--- a/languages/ada/addclass.cpp
+++ b/languages/ada/addclass.cpp
@@ -33,7 +33,7 @@ AddClassInfo::AddClassInfo()
 TQString AddClassInfo::adaFileName() const
 {
   TQString dest = className;
-  dest.replace(TQRegExp("\\."), "/");
+  dest.tqreplace(TQRegExp("\\."), "/");
   return sourceDir + "/" + dest + ".ada";
 }
 
@@ -183,12 +183,12 @@ bool AddClass::generate()
 	 " * published by the Free Software Foundation; either version 2 of the\n"
 	 " * License, or (at your option) any later version.\n";
     }
-    else if (m_info.license == "QPL")
+    else if (m_info.license == "TQPL")
     {
       code += 
 	" * This program may be distributed under the terms of the Q Public\n"
 	" * License as defined by Trolltech AS of Norway and appearing in the\n"
-        " * file LICENSE.QPL included in the packaging of this file.\n"
+        " * file LICENSE.TQPL included in the packaging of this file.\n"
         " *\n"
         " * This program is distributed in the hope that it will be useful,\n"
         " * but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -206,7 +206,7 @@ bool AddClass::generate()
   // find class and package name
   TQString className, packageName;
 
-  int i = m_info.className.findRev('.');
+  int i = m_info.className.tqfindRev('.');
   if (i == -1)
   {
     packageName = "";
@@ -322,7 +322,7 @@ bool AddClass::generate()
   // create directories
 
   TQString dest = packageName;
-  dest.replace(TQRegExp("\\."), "/");
+  dest.tqreplace(TQRegExp("\\."), "/");
   dest = m_info.sourceDir + "/" + dest;
 
   if (!makeDirs(dest))
diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui
index 49900786..80f466be 100644
--- a/languages/ada/addclassdlg.ui
+++ b/languages/ada/addclassdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>AddClassDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddClassDlg</cstring>
     </property>
@@ -30,7 +30,7 @@
                 <string>&amp;Implements</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -64,7 +64,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="3" column="2">
+                <widget class="TQCheckBox" row="3" column="2">
                     <property name="name">
                         <cstring>Abstract</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         <string>&amp;Abstract</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="1">
+                <widget class="TQCheckBox" row="3" column="1">
                     <property name="name">
                         <cstring>Interface</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <string>&amp;Interface</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <cstring>ClassName</cstring>
                     </property>
                 </widget>
-                <widget class="QButtonGroup" row="4" column="1" rowspan="1" colspan="3">
+                <widget class="TQButtonGroup" row="4" column="1" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>ButtonGroup1</cstring>
                     </property>
@@ -109,7 +109,7 @@
                             <number>0</number>
                         </property>
 
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>Public</cstring>
                             </property>
@@ -120,7 +120,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>Protected</cstring>
                             </property>
@@ -128,7 +128,7 @@
                                 <string>P&amp;rotected</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>Private</cstring>
                             </property>
@@ -138,7 +138,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="3" column="3">
+                <widget class="TQCheckBox" row="3" column="3">
                     <property name="name">
                         <cstring>Final</cstring>
                     </property>
@@ -162,7 +162,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -173,7 +173,7 @@
                         <cstring>Extends</cstring>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="5">
+                <widget class="TQPushButton" row="0" column="5">
                     <property name="name">
                         <cstring>BrowseSourcePath</cstring>
                     </property>
@@ -194,7 +194,7 @@
                         <cstring>SourcePath</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -207,7 +207,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>GroupBox3</cstring>
             </property>
@@ -219,7 +219,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>Constructor</cstring>
                     </property>
@@ -230,7 +230,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>Main</cstring>
                     </property>
@@ -240,7 +240,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>GroupBox4</cstring>
             </property>
@@ -252,7 +252,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -286,7 +286,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QTextEdit" row="0" column="0" rowspan="1" colspan="3">
+                <widget class="TQTextEdit" row="0" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>Documentation</cstring>
                     </property>
@@ -318,7 +318,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="3">
+        <widget class="TQPushButton" row="5" column="3">
             <property name="name">
                 <cstring>PushButton3</cstring>
             </property>
@@ -337,7 +337,7 @@
                 <enum>Expanding</enum>
             </property>
         </spacer>
-        <widget class="QPushButton" row="5" column="0">
+        <widget class="TQPushButton" row="5" column="0">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -348,7 +348,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="1">
+        <widget class="TQPushButton" row="5" column="1">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -420,15 +420,15 @@
     <tabstop>PushButton2</tabstop>
     <tabstop>PushButton3</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>Public_toggled( bool )</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp
index 68607851..2ee39af8 100644
--- a/languages/ada/backgroundparser.cpp
+++ b/languages/ada/backgroundparser.cpp
@@ -25,7 +25,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter,
                                     const TQString& source,
                                     const TQString& filename )
     : m_reporter( reporter ),
-      m_source( source.unicode(), source.length() ),
+      m_source( source.tqunicode(), source.length() ),
       m_fileName( filename )
 {
 }
@@ -64,7 +64,7 @@ void BackgroundParser::run()
 
     } catch( antlr::ANTLRException& ex ){
         kdDebug() << "*exception*: " << ex.toString().c_str() << endl;
-        m_reporter->reportError( TQString::fromLatin1( ex.getMessage().c_str() ),
+        m_reporter->reportError( TQString::tqfromLatin1( ex.getMessage().c_str() ),
 				 m_fileName,
 				 lexer.getLine(),
 				 lexer.getColumn() );
diff --git a/languages/ada/backgroundparser.h b/languages/ada/backgroundparser.h
index 3c41d450..e07ff55f 100644
--- a/languages/ada/backgroundparser.h
+++ b/languages/ada/backgroundparser.h
@@ -19,7 +19,7 @@
 
 class ProblemReporter;
 
-class BackgroundParser: public QThread{
+class BackgroundParser: public TQThread{
 public:
     BackgroundParser( ProblemReporter* reporter,
                       const TQString& source,
diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui
index 75f35b1f..86bb221d 100644
--- a/languages/ada/configproblemreporter.ui
+++ b/languages/ada/configproblemreporter.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ConfigureProblemReporter</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigureProblemReporter</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>bgParserCheckbox</cstring>
             </property>
@@ -24,7 +24,7 @@
                 <string>&amp;Enable background parsing</string>
             </property>
         </widget>
-        <widget class="QSlider">
+        <widget class="TQSlider">
             <property name="name">
                 <cstring>delaySlider</cstring>
             </property>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>101</height>
@@ -78,12 +78,12 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>accept()</slot>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h
index a336965c..20932393 100644
--- a/languages/ada/configproblemreporter.ui.h
+++ b/languages/ada/configproblemreporter.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
diff --git a/languages/ada/configure.in.in b/languages/ada/configure.in.in
index be677e4b..c64a6b76 100644
--- a/languages/ada/configure.in.in
+++ b/languages/ada/configure.in.in
@@ -1,4 +1,4 @@
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-AC_CHECK_HEADERS(sstream)
+KDE_CHECK_HEADERS(sstream)
 AC_LANG_RESTORE
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 652d5a6b..1b9b5bc4 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -50,15 +50,15 @@
 #include <kdialogbase.h>
 
 
-class ProblemItem: public QListViewItem{
+class ProblemItem: public TQListViewItem{
 public:
-	ProblemItem( TQListView* parent, const TQString& level, const TQString& problem,
+	ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem,
 				 const TQString& file, const TQString& line, const TQString& column  )
-		: TQListViewItem( parent, level, problem, file, line, column ) {}
+		: TQListViewItem( tqparent, level, problem, file, line, column ) {}
 
-	ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem,
+	ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem,
 				 const TQString& file, const TQString& line, const TQString& column  )
-		: TQListViewItem( parent, level, problem, file, line, column ) {}
+		: TQListViewItem( tqparent, level, problem, file, line, column ) {}
 
 	int compare( TQListViewItem* item, int column, bool ascending ) const {
 		if( column == 3 || column == 4 ){
@@ -73,8 +73,8 @@ public:
 
 };
 
-ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const char* name )
-    : TQListView( parent, name ),
+ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* tqparent, const char* name )
+    : TQListView( tqparent, name ),
       m_adaSupport( part ),
       m_editor( 0 ),
       m_document( 0 ),
@@ -185,7 +185,7 @@ void ProblemReporter::reparse()
 	}
 
 /* Temporarily deactivated (crashes)*/
-    if (!m_adaSupport->fileExtensions ().contains (TQFileInfo (m_filename).extension ()))
+    if (!m_adaSupport->fileExtensions ().tqcontains (TQFileInfo (m_filename).extension ()))
     {
         m_bgParser = new BackgroundParser( this, m_editor->text(), m_filename );
 	m_bgParser->start();
@@ -211,7 +211,7 @@ void ProblemReporter::reportError( TQString message,
 
     new ProblemItem( this,
                        "error",
-                       message.replace( TQRegExp("\n"), "" ),
+                       message.tqreplace( TQRegExp("\n"), "" ),
                        filename,
                        TQString::number( line ),
                        TQString::number( column ) );
@@ -223,7 +223,7 @@ void ProblemReporter::reportWarning( TQString message,
 {
     new ProblemItem( this,
                        "warning",
-                       message.replace( TQRegExp("\n"), "" ),
+                       message.tqreplace( TQRegExp("\n"), "" ),
                        filename,
                        TQString::number( line ),
                        TQString::number( column ) );
@@ -235,7 +235,7 @@ void ProblemReporter::reportMessage( TQString message,
 {
     new TQListViewItem( this,
                        "message",
-                       message.replace( TQRegExp("\n"), "" ),
+                       message.tqreplace( TQRegExp("\n"), "" ),
                        filename,
                        TQString::number( line ),
                        TQString::number( column ) );
diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h
index 16fe2181..84c9ce57 100644
--- a/languages/ada/problemreporter.h
+++ b/languages/ada/problemreporter.h
@@ -37,10 +37,11 @@ namespace KTextEditor{
     class Document;
 }
 
-class ProblemReporter: public QListView{
+class ProblemReporter: public TQListView{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 );
+    ProblemReporter( AdaSupportPart* part, TQWidget* tqparent=0, const char* name=0 );
     virtual ~ProblemReporter();
 
     virtual void reportError( TQString message, TQString filename,
diff --git a/languages/bash/README.dox b/languages/bash/README.dox
index 95765f0a..af38febf 100644
--- a/languages/bash/README.dox
+++ b/languages/bash/README.dox
@@ -10,6 +10,6 @@ Supports bash language
 \feature runs bash script in external terminal
 \feature syntax highlighting and code folding via katepart
 \feature Code completion works for variables
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 */
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index a36761a8..7bcd879f 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -36,8 +36,8 @@ typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
 static const KDevPluginInfo data("kdevbashsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
 
-BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
+BashSupportPart::BashSupportPart(TQObject *tqparent, const char *name, const TQStringList& )
+: KDevLanguageSupport (&data, tqparent, name ? name : "BashSupportPart" )
 {
 	setInstance(BashSupportFactory::instance());
 	setXMLFile("kdevbashsupport.rc");
@@ -172,7 +172,7 @@ void BashSupportPart::savedFile(const KURL &fileName)
 {
 	kdDebug(9014) << "savedFile()" << endl;
 
-	if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 )))
+	if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 )))
 	{
 		parse(fileName.path());
 		emit addedSourceInfo( fileName.path() );
@@ -418,7 +418,7 @@ void BashCodeCompletion::completionBoxHidden()
 	m_cursorInterface->cursorPositionReal(&line, &col);
 	TQString lineStr = m_editInterface->textLine(line);
 
-	start = lineStr.findRev(TQRegExp("[$][\\d\\w]*\\b$"));
+	start = lineStr.tqfindRev(TQRegExp("[$][\\d\\w]*\\b$"));
 	m_editInterface->removeText ( start, col, line, col );
 */
 }
diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h
index 4b3219fa..b083a32a 100644
--- a/languages/bash/bashsupport_part.h
+++ b/languages/bash/bashsupport_part.h
@@ -22,9 +22,10 @@
 
 //class BashSupportWidget;
 
-class BashCodeCompletion : QObject
+class BashCodeCompletion : TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		BashCodeCompletion();
 		~BashCodeCompletion();
@@ -49,8 +50,9 @@ class BashCodeCompletion : QObject
 class BashSupportPart : public KDevLanguageSupport
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		BashSupportPart(TQObject *parent, const char *name, const TQStringList &);
+		BashSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
 		virtual ~BashSupportPart();
 
 	protected:
diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h
index 8aed7e94..39ed4a43 100644
--- a/languages/cpp/KDevCppSupportIface.h
+++ b/languages/cpp/KDevCppSupportIface.h
@@ -10,6 +10,7 @@ class CppSupportPart;
 class KDevCppSupportIface : public TQObject, public DCOPObject
 {
 	Q_OBJECT
+//	TQ_OBJECT
 	K_DCOP
 public:
 	KDevCppSupportIface( CppSupportPart* cppSupport );
diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox
index ba1fbc05..3078ec53 100644
--- a/languages/cpp/README.dox
+++ b/languages/cpp/README.dox
@@ -16,7 +16,7 @@ and if you want play with the c++ parser go to lib/cppparser/, the best is to st
 \feature can do code completion
 \feature has presistent class store
 \feature code highlight
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a>
 
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 42031f59..70dd27b3 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -41,8 +41,8 @@
 #include <tqtextstream.h>
 
 AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass,
-                                        TQWidget* parent, const char* name, bool modal, WFlags fl )
-: AddAttributeDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 )
+                                        TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+: AddAttributeDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 )
 {
 	access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" );
 	
@@ -91,7 +91,7 @@ void AddAttributeDialog::accept()
 	m_klass->getEndPosition( &line, &column );
 	
 	// compute the insertion point map
-	TQMap<TQString, QPair<int, int> > points;
+	TQMap<TQString, TQPair<int, int> > points;
 	TQStringList accessList;
 	
 	const VariableList variableList = m_klass->variableList();
@@ -100,9 +100,9 @@ void AddAttributeDialog::accept()
 		int varEndLine, varEndColumn;
 		( *it ) ->getEndPosition( &varEndLine, &varEndColumn );
 		TQString access = accessID( *it );
-		QPair<int, int> varEndPoint = qMakePair( varEndLine, varEndColumn );
+		TQPair<int, int> varEndPoint = tqMakePair( varEndLine, varEndColumn );
 		
-		if ( !points.contains( access ) || points[ access ] < varEndPoint )
+		if ( !points.tqcontains( access ) || points[ access ] < varEndPoint )
 		{
 			accessList.remove( access );
 			accessList.push_back( access ); // move 'access' at the end of the list
@@ -131,20 +131,20 @@ void AddAttributeDialog::accept()
 			
 			TQString str = variableDeclaration( currentItem );
 			
-			QPair<int, int> pt;
-			if ( points.contains( *it ) )
+			TQPair<int, int> pt;
+			if ( points.tqcontains( *it ) )
 			{
 				pt = points[ *it ];
 			}
 			else
 			{
 				str.prepend( access + ":\n" );
-				points[ *it ] = qMakePair( line - 1, 0 );
+				points[ *it ] = tqMakePair( line - 1, 0 );
 				pt = points[ *it ]; // end of class declaration
 			}
 			
 			editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str );
-			insertedLine += str.contains( TQChar( '\n' ) );
+			insertedLine += str.tqcontains( TQChar( '\n' ) );
 		}
 	}
 	
@@ -194,7 +194,7 @@ void AddAttributeDialog::updateGUI()
 void AddAttributeDialog::addAttribute()
 {
 	TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal",
-	                                          "int", TQString( "attribute_%1" ).arg( ++m_count ) );
+	                                          "int", TQString( "attribute_%1" ).tqarg( ++m_count ) );
 	attributes->setCurrentItem( item );
 	attributes->setSelected( item, true );
 	
@@ -236,7 +236,7 @@ TQStringList AddAttributeDialog::newAccessList( const TQStringList& accessList )
 		item = item->nextSibling();
 		
 		TQString access = currentItem->text( 0 );
-		if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) )
+		if ( !( accessList.tqcontains( access ) || newAccessList.tqcontains( access ) ) )
 			newAccessList.push_back( access );
 	}
 	
@@ -248,16 +248,16 @@ TQString AddAttributeDialog::accessID( VariableDom var ) const
 	switch ( var->access() )
 	{
 	case CodeModelItem::Public:
-		return TQString::fromLatin1( "Public" );
+		return TQString::tqfromLatin1( "Public" );
 		
 	case CodeModelItem::Protected:
-		return TQString::fromLatin1( "Protected" );
+		return TQString::tqfromLatin1( "Protected" );
 		
 	case CodeModelItem::Private:
-		return TQString::fromLatin1( "Private" );
+		return TQString::tqfromLatin1( "Private" );
 	}
 	
-	return TQString::null;
+	return TQString();
 }
 
 #include "addattributedialog.moc" 
diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h
index 54d917b1..ffe2a92d 100644
--- a/languages/cpp/addattributedialog.h
+++ b/languages/cpp/addattributedialog.h
@@ -29,9 +29,10 @@ class CppSupportPart;
 class AddAttributeDialog : public AddAttributeDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass,
-	                    TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	                    TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~AddAttributeDialog();
 
 	virtual void addAttribute();
diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui
index eabd89fe..27ad6d5a 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddAttributeDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddAttributeDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Access</string>
@@ -77,9 +77,9 @@
                 <enum>LastColumn</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -95,14 +95,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addAttributeButton</cstring>
                     </property>
@@ -110,7 +110,7 @@
                         <string>&amp;Add Attribute</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>deleteAttributeButton</cstring>
                     </property>
@@ -120,7 +120,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -131,15 +131,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -150,7 +150,7 @@
                                 <cstring>returnType</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="0">
+                        <widget class="TQComboBox" row="1" column="0">
                             <property name="name">
                                 <cstring>returnType</cstring>
                             </property>
@@ -163,7 +163,7 @@
                                 <cstring>declarator</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -176,20 +176,20 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QComboBox" row="1" column="1">
+                        <widget class="TQComboBox" row="1" column="1">
                             <property name="name">
                                 <cstring>storage</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel5</cstring>
                             </property>
@@ -200,7 +200,7 @@
                                 <cstring>storage</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -211,7 +211,7 @@
                                 <cstring>access</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="0">
+                        <widget class="TQComboBox" row="1" column="0">
                             <property name="name">
                                 <cstring>access</cstring>
                             </property>
@@ -220,7 +220,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -244,14 +244,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -268,7 +268,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -313,9 +313,9 @@
     </connection>
     <connection>
         <sender>attributes</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>AddAttributeDialogBase</receiver>
-        <slot>currentChanged(QListViewItem*)</slot>
+        <slot>currentChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>returnType</sender>
@@ -362,14 +362,14 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot>addAttribute()</slot>
     <slot>deleteCurrentAttribute()</slot>
-    <slot>currentChanged(QListViewItem*)</slot>
+    <slot>currentChanged(TQListViewItem*)</slot>
     <slot>updateGUI()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index ae4e1738..71f03b5d 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -44,8 +44,8 @@
 #include <tqtextstream.h>
 
 AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass,
-                                  TQWidget* parent, const char* name, bool modal, WFlags fl )
-: AddMethodDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 )
+                                  TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+: AddMethodDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 )
 {
 	TQString fileName = m_klass->fileName();
 
@@ -75,7 +75,7 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass,
 		while ( it != m.end() )
 		{
 			TQString ext = TQFileInfo( it.key() ).extension();
-			if ( !headers.contains( ext ) )
+			if ( !headers.tqcontains( ext ) )
 				sourceFile->insertItem( it.key() );
 			++it;
 		}
@@ -119,27 +119,27 @@ void AddMethodDialog::reject()
 TQString AddMethodDialog::accessID( FunctionDom fun ) const
 {
 	if ( fun->isSignal() )
-		return TQString::fromLatin1( "Signals" );
+		return TQString::tqfromLatin1( "Signals" );
 
 	switch ( fun->access() )
 	{
 	case CodeModelItem::Public:
 		if ( fun->isSlot() )
-			return TQString::fromLatin1( "Public Slots" );
-		return TQString::fromLatin1( "Public" );
+			return TQString::tqfromLatin1( "Public Slots" );
+		return TQString::tqfromLatin1( "Public" );
 
 	case CodeModelItem::Protected:
 		if ( fun->isSlot() )
-			return TQString::fromLatin1( "Protected Slots" );
-		return TQString::fromLatin1( "Protected" );
+			return TQString::tqfromLatin1( "Protected Slots" );
+		return TQString::tqfromLatin1( "Protected" );
 
 	case CodeModelItem::Private:
 		if ( fun->isSlot() )
-			return TQString::fromLatin1( "Private Slots" );
-		return TQString::fromLatin1( "Private" );
+			return TQString::tqfromLatin1( "Private Slots" );
+		return TQString::tqfromLatin1( "Private" );
 	}
 
-	return TQString::null;
+	return TQString();
 }
 
 void AddMethodDialog::accept()
@@ -157,7 +157,7 @@ void AddMethodDialog::accept()
 	m_klass->getEndPosition( &line, &column );
 
 	// compute the insertion point map
-	TQMap<TQString, QPair<int, int> > points;
+	TQMap<TQString, TQPair<int, int> > points;
 	TQStringList accessList;
 
 	const FunctionList functionList = m_klass->functionList();
@@ -166,9 +166,9 @@ void AddMethodDialog::accept()
 		int funEndLine, funEndColumn;
 		( *it ) ->getEndPosition( &funEndLine, &funEndColumn );
 		TQString access = accessID( *it );
-		QPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn );
+		TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn );
 
-		if ( !points.contains( access ) || points[ access ] < funEndPoint )
+		if ( !points.tqcontains( access ) || points[ access ] < funEndPoint )
 		{
 			accessList.remove( access );
 			accessList.push_back( access ); // move 'access' at the end of the list
@@ -198,20 +198,20 @@ void AddMethodDialog::accept()
 			bool isInline = currentItem->text( 0 ) == "True";
 			TQString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem );
 
-			QPair<int, int> pt;
-			if ( points.contains( *it ) )
+			TQPair<int, int> pt;
+			if ( points.tqcontains( *it ) )
 			{
 				pt = points[ *it ];
 			}
 			else
 			{
 			str.prepend( access + ":\n" );
-				points[ *it ] = qMakePair( line - 1, 0 );
+				points[ *it ] = tqMakePair( line - 1, 0 );
 				pt = points[ *it ]; // end of class declaration
 			}
 
 			editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str );
-			insertedLine += str.contains( TQChar( '\n' ) );
+			insertedLine += str.tqcontains( TQChar( '\n' ) );
 		}
 	}
 
@@ -248,7 +248,7 @@ void AddMethodDialog::accept()
 		bool isInline = currentItem->text( 0 ) == "True";
 		if ( !isInline )
 		{
-			editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
+			editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
 			editIface->insertText( editIface->numLines() - 1, 0, str );
 			m_cppSupport->backgroundParser() ->addFile( implementationFile );
 		}
@@ -293,7 +293,7 @@ void AddMethodDialog::updateGUI()
 void AddMethodDialog::addMethod()
 {
 	TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal",
-	                                          "void", TQString( "method_%1()" ).arg( ++m_count ),
+	                                          "void", TQString( "method_%1()" ).tqarg( ++m_count ),
 	                                          sourceFile->currentText() );
 	methods->setCurrentItem( item );
 	methods->setSelected( item, true );
@@ -363,7 +363,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const
 	if ( item->text( 1 ) == "Signals" || item->text( 2 ) == "Pure Virtual" ||
 	     item->text( 2 ) == "Friend" )
 	{
-		return TQString::null;
+		return TQString();
 	}
 
 	TQString className = m_klass->name();
@@ -387,7 +387,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const
 		<< ind << " */\n";
 
 	stream
-		<< ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" )
+		<< ind << item->text( 3 ) << " " << ( isInline ? TQString::tqfromLatin1( "" ) : fullName + "::" )
 		<< item->text( 4 ) << "\n"
 		<< ind << "{\n"
 		<< ind << "    /// @todo implement me\n"
@@ -408,7 +408,7 @@ TQStringList AddMethodDialog::newAccessList( const TQStringList& accessList ) co
 		item = item->nextSibling();
 
 		TQString access = currentItem->text( 1 );
-		if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) )
+		if ( !( accessList.tqcontains( access ) || newAccessList.tqcontains( access ) ) )
 			newAccessList.push_back( access );
 	}
 
diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h
index badfe537..70ab9958 100644
--- a/languages/cpp/addmethoddialog.h
+++ b/languages/cpp/addmethoddialog.h
@@ -29,9 +29,10 @@ class CppSupportPart;
 class AddMethodDialog : public AddMethodDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass,
-	                 TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	                 TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~AddMethodDialog();
 
 	virtual void addMethod();
diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui
index 5ab3f769..3518b3a0 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddMethodDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddMethodDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Inline</string>
@@ -88,9 +88,9 @@
                 <enum>LastColumn</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -106,14 +106,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addMethodButton</cstring>
                     </property>
@@ -121,7 +121,7 @@
                         <string>&amp;Add Method</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>deleteMethodButton</cstring>
                     </property>
@@ -131,7 +131,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -142,15 +142,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -161,7 +161,7 @@
                                 <cstring>returnType</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="0">
+                        <widget class="TQComboBox" row="1" column="0">
                             <property name="name">
                                 <cstring>returnType</cstring>
                             </property>
@@ -174,7 +174,7 @@
                                 <cstring>declarator</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -187,20 +187,20 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QComboBox" row="1" column="1">
+                        <widget class="TQComboBox" row="1" column="1">
                             <property name="name">
                                 <cstring>storage</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel5</cstring>
                             </property>
@@ -211,7 +211,7 @@
                                 <cstring>storage</cstring>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="2">
+                        <widget class="TQCheckBox" row="1" column="2">
                             <property name="name">
                                 <cstring>isInline</cstring>
                             </property>
@@ -219,7 +219,7 @@
                                 <string>&amp;Inline</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -230,7 +230,7 @@
                                 <cstring>access</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="0">
+                        <widget class="TQComboBox" row="1" column="0">
                             <property name="name">
                                 <cstring>access</cstring>
                             </property>
@@ -239,7 +239,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -250,7 +250,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>sourceFile</cstring>
                     </property>
@@ -266,7 +266,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>browseButton</cstring>
                     </property>
@@ -279,7 +279,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -300,14 +300,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -324,7 +324,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -369,9 +369,9 @@
     </connection>
     <connection>
         <sender>methods</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>AddMethodDialogBase</receiver>
-        <slot>currentChanged(QListViewItem*)</slot>
+        <slot>currentChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>returnType</sender>
@@ -445,15 +445,15 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot>addMethod()</slot>
     <slot>deleteCurrentMethod()</slot>
-    <slot>currentChanged(QListViewItem*)</slot>
+    <slot>currentChanged(TQListViewItem*)</slot>
     <slot>updateGUI()</slot>
     <slot>browseImplementationFile()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
index cd3783f7..5240b2ee 100644
--- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
@@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリã�®ãƒ†ãƒ³ãƒ—レートを作æˆ�ã�—ã�¾ã�™ã€‚å�Œæ™
 Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav).
 Comment[ne]=C मा परीक�षण अन�प�रयोग सहितको सा�ेदारी टेम�प�लेट उत�पन�न गर�दछ । यसले automake/autoconf/libtool संयोजनको सट�टामा CMake निर�माण उपकरण प�रयोग गरेर कम�पाइल गर�दछ । यसका लागि cmake 2.1 (cmake cvs बाट उपलब�ध ह�न�छ) वा अब आउने cmake 2.2 उत�पादन आवश�यक पर�दछ ।
 Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (beschikbaar in het cvs van cmake) of de aankomende cmake 2.2-uitgave.
-Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
+Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
 Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[ru]=Создание шаблона раздел�емой библиотеки, включа� те�товую программу на C. Дл� �борки потребует�� CMake вме�то комбинации automake/autoconf/libtool. Потребует�� cmake 2.1 (из CVS cmake) или релиз cmake 2.2.
-Comment[sk]=Vygeneruje šablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
+Comment[sk]=Vygeneruje šablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
 Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2.
 Comment[sr]=Прави шаблон дељене библиотеке, укључујући и пробни програм у C-у. Преводи �е помоћу алата CMake уме�то комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (до�тупан у CVS-у CMake-а) или надолазеће издање CMake 2.2.
 Comment[sr@Latn]=Pravi šablon deljene biblioteke, uklju�ujući i probni program u C-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2.
diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
index e6e6ac44..8f3d0cf9 100644
--- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
@@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリã�®ãƒ†ãƒ³ãƒ—レートを作æˆ�ã�—ã�¾ã�™ã€‚å�Œæ™
 Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C++ op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav).
 Comment[ne]=C++ मा परीक�षण अन�प�रयोग सहितको सा�ेदारी टेम�प�लेट उत�पन�न गर�दछ । यसले automake/autoconf/libtool संयोजनको सट�टामा CMake निर�माण उपकरण प�रयोग गरेर कम�पाइल गर�दछ । यसका लागि cmake 2.1 (cmake cvs बाट उपलब�ध ह�न�छ) वा अब आउने cmake 2.2 उत�पादन आवश�यक पर�दछ ।
 Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C++. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave.
-Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C++. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
+Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C++. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
 Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[ru]=Создание шаблона раздел�емой библиотеки, включа� те�товую программу на C++. Дл� �борки потребует�� CMake вме�то комбинации automake/autoconf/libtool. Потребует�� cmake 2.1 (из CVS cmake) или релиз cmake 2.2.
-Comment[sk]=Vygeneruje šablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
+Comment[sk]=Vygeneruje šablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
 Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C++. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2.
 Comment[sr]=Прави шаблон дељене библиотеке укључујући и пробни програм у C++-у. Преводи �е помоћу алата CMake уме�то комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (до�тупан у CVS-у CMake-а) или надолазеће издање CMake 2.2.
 Comment[sr@Latn]=Pravi šablon deljene biblioteke uklju�ujući i probni program u C++-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2.
diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
index f3c5f7f2..4b78645a 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp
@@ -11,7 +11,7 @@
 #include <tqtextedit.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <tqstatusbar.h>
+#include <statusbar.h>
 #include <tqmessagebox.h>
 #include <tqprinter.h>
 #include <tqapplication.h>
@@ -36,17 +36,17 @@
 
     openIcon = TQPixmap( fileopen );
     TQToolButton * fileOpen
-	= new TQToolButton( openIcon, tr("Open File"), TQString::null,
+	= new TQToolButton( openIcon, tr("Open File"), TQString(),
 			   this, TQT_SLOT(choose()), fileTools, "open file" );
 
     saveIcon = TQPixmap( filesave );
     TQToolButton * fileSave
-	= new TQToolButton( saveIcon, tr("Save File"), TQString::null,
+	= new TQToolButton( saveIcon, tr("Save File"), TQString(),
 			   this, TQT_SLOT(save()), fileTools, "save file" );
 
     printIcon = TQPixmap( fileprint );
     TQToolButton * filePrint
-	= new TQToolButton( printIcon, tr("Print File"), TQString::null,
+	= new TQToolButton( printIcon, tr("Print File"), TQString(),
 			   this, TQT_SLOT(print()), fileTools, "print file" );
 
 
@@ -103,7 +103,7 @@
 
     file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W );
 
-    file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     menuBar()->insertSeparator();
 
@@ -111,7 +111,7 @@
     menuBar()->insertItem( tr("&Help"), help );
 
     help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 );
-    help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) );
+    help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) );
     help->insertSeparator();
     help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
 
@@ -134,13 +134,13 @@
 void %{APPNAME}::newDoc()
 {
     %{APPNAME} *ed = new %{APPNAME};
-    ed->setCaption(tr("Qt Example - Application"));
+    ed->setCaption(tr("TQt Example - Application"));
     ed->show();
 }
 
 void %{APPNAME}::choose()
 {
-    TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null,
+    TQString fn = TQFileDialog::getOpenFileName( TQString(), TQString(),
 					       this);
     if ( !fn.isEmpty() )
 	load( fn );
@@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName )
     e->setText( ts.read() );
     e->setModified( FALSE );
     setCaption( fileName );
-    statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 );
+    statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 );
 }
 
 
@@ -173,7 +173,7 @@ void %{APPNAME}::save()
     TQString text = e->text();
     TQFile f( filename );
     if ( !f.open( IO_WriteOnly ) ) {
-	statusBar()->message( tr("Could not write to %1").arg(filename),
+	statusBar()->message( tr("Could not write to %1").tqarg(filename),
 			      2000 );
 	return;
     }
@@ -186,13 +186,13 @@ void %{APPNAME}::save()
 
     setCaption( filename );
 
-    statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 );
+    statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 );
 }
 
 
 void %{APPNAME}::saveAs()
 {
-    TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null,
+    TQString fn = TQFileDialog::getSaveFileName( TQString(), TQString(),
 					       this );
     if ( !fn.isEmpty() ) {
 	filename = fn;
@@ -249,7 +249,7 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce )
 	return;
     }
 
-    switch( TQMessageBox::information( this, tr("Qt Application Example"),
+    switch( TQMessageBox::information( this, tr("TQt Application Example"),
 				      tr("Do you want to save the changes"
 				      " to the document?"),
 				      tr("Yes"), tr("No"), tr("Cancel"),
@@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce )
 
 void %{APPNAME}::about()
 {
-    TQMessageBox::about( this, tr("Qt Application Example"),
+    TQMessageBox::about( this, tr("TQt Application Example"),
 			tr("This example demonstrates simple use of "
-			"TQMainWindow,\nQMenuBar and TQToolBar."));
+			"TQMainWindow,\nTQMenuBar and TQToolBar."));
 }
 
 
-void %{APPNAME}::aboutQt()
+void %{APPNAME}::aboutTQt()
 {
-    TQMessageBox::aboutQt( this, tr("Qt Application Example") );
+    TQMessageBox::aboutTQt( this, tr("TQt Application Example") );
 }
diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h
index af12e1eb..bc8a2b93 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h
@@ -7,9 +7,10 @@
 
 class TQTextEdit;
 
-class %{APPNAME}: public QMainWindow
+class %{APPNAME}: public TQMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     %{APPNAME}();
@@ -27,7 +28,7 @@ private slots:
     void print();
 
     void about();
-    void aboutQt();
+    void aboutTQt();
 
 private:
     TQPrinter *printer;
diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
index 2e6032e8..a80c8079 100644
--- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
@@ -44,7 +44,7 @@ Comment[it]=Genera un semplice programma di "Hello world" in C++ che usa CMake i
 Comment[ja]=ビルド� automake/autoconf/libtool ���� CMake を使��簡�� Hello World プログラムを C++ �作����。CMake 2.1 ��� 2.2 �必���。
 Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C++ op, mit "CMake" ansteed vun de "automake/autoconf/libtool"-Reeg. Nödig is Verschoon 2.1 oder 2.2 vun CMake.
 Comment[nl]=Genereert een eenvoudig Hello World-programma in C++ met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 of cmake 2.2.
-Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C++. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2.
+Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C++. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2.
 Comment[pt]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2.
 Comment[pt_BR]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2.
 Comment[ru]=Создание про�того приложени� Hello world на C++. Дл� �борки потребует�� CMake вме�то комбинации automake/autoconf/libtool. Потребует�� cmake вер�ии 2.1 или 2.2.
diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
index 3fc09047..3068fdd3 100644
--- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
@@ -49,7 +49,7 @@ Comment[ja]=ビルドã�« automake/autoconf/libtool ã�§ã�¯ã�ªã�� CMake を使ã�£ã
 Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C op mit "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav) ansteed vun de "automake/autoconf/libtool"-Kombinatschoon.
 Comment[ne]= automake/autoconf/libtool संयोजनको सट�टामा CMake निर�माण उपकरण प�रयोग गरेर C मा साधारण हेल�लो वोल�ड कार�यक�रम उत�पन�न गर�दछ । यसलाई cmake 2.1 (cmake cvs बाट उपलब�ध ह�न�छ) वा आउदै गरेको cmake 2.2 उत�पादन आवश�यक ह�न�छ ।
 Comment[nl]=Genereert een eenvoudig Hello World-programma in C met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave.
-Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
+Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
 Comment[pt]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[pt_BR]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[ru]=Создание про�того приложени� Hello world на C. Дл� �борки потребует�� CMake вме�то комбинации automake/autoconf/libtool. Потребует�� cmake 2.1 (из CVS cmake) или релиз cmake 2.2.
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
index 32f32c65..2f569f3c 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
@@ -33,7 +33,7 @@ void %{APPNAME}::add(TQString arg)
 
 bool %{APPNAME}::remove(TQString arg)
 {
-	TQStringList::Iterator it = m_List.find(arg);
+	TQStringList::Iterator it = m_List.tqfind(arg);
 	if (it != m_List.end())
 	{
 		m_List.remove(it);
diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
index 787140ff..2c71b0ad 100644
--- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate
+++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
@@ -18,7 +18,7 @@ Name[ja]=C++ プログラム (シェルスクリプトベースã�®ãƒ“ルドシã‚
 Name[nds]=C++-Programm (Konsoolskript-Opstellsystem)
 Name[ne]=C++ कार�यक�रम (शेल स�क�रिप�ट निर�माण प�रणाली)
 Name[nl]=C++-programma (shellscript build system)
-Name[pl]=Program w C++ (system budowania za pomocą skryptów powłoki)
+Name[pl]=Program w C++ (system budowania za potqmocą skryptów powłoki)
 Name[pt]=Programa em C++ (sistema de compilação em 'shell script')
 Name[pt_BR]=Programa em C++ (sistema de compilação em 'shell script')
 Name[ru]=Приложение C++ (�борка на �криптах командной оболочки)
diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.hh
index ae93336b..7b356a27 100644
--- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gnome2mmapp/main_window.hh
@@ -2,7 +2,7 @@
 
 // newer (non customized) versions of this file go to main_window.hh_new
 
-// you might replace
+// you might tqreplace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.hh
index 640e1461..6f9405d0 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window.hh
@@ -2,7 +2,7 @@
 
 // newer (non customized) versions of this file go to main_window.hh_new
 
-// you might replace
+// you might tqreplace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index 6388f452..10046641 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -141,7 +141,7 @@ void %{APPNAME}::dragEnterEvent(TQDragEnterEvent *event)
 void %{APPNAME}::dropEvent(TQDropEvent *event)
 {
     // this is a very simplistic implementation of a drop event.  we
-    // will only accept a dropped URL.  the Qt dnd code can do *much*
+    // will only accept a dropped URL.  the TQt dnd code can do *much*
     // much more, so please read the docs there
     KURL::List urls;
 
@@ -173,10 +173,10 @@ void %{APPNAME}::fileOpen()
     // button is clicked
 /*
     // this brings up the generic open dialog
-    KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") );
+    KURL url = KURLRequesterDlg::getURL(TQString(), this, i18n("Open Location") );
 */
     // standard filedialog
-    KURL url = KFileDialog::getOpenURL(TQString::null, TQString::null, this, i18n("Open Location"));
+    KURL url = KFileDialog::getOpenURL(TQString(), TQString(), this, i18n("Open Location"));
     if (!url.isEmpty())
         m_view->openURL(url);
 }
@@ -208,7 +208,7 @@ void %{APPNAME}::filePrint()
     if (!m_printer) m_printer = new KPrinter;
     if (m_printer->setup(this))
     {
-        // setup the printer.  with Qt, you always "print" to a
+        // setup the printer.  with TQt, you always "print" to a
         // TQPainter.. whether the output medium is a pixmap, a screen,
         // or paper
         TQPainter p;
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 1c92feb8..762d8791 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -26,6 +26,7 @@ class KURL;
 class %{APPNAME} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
@@ -44,7 +45,7 @@ public:
 
 protected:
     /**
-     * Overridden virtuals for Qt drag 'n drop (XDND)
+     * Overridden virtuals for TQt drag 'n drop (XDND)
      */
     virtual void dragEnterEvent(TQDragEnterEvent *event);
     virtual void dropEvent(TQDropEvent *event);
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index 32afca2e..5b42a36a 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -13,11 +13,11 @@
 #include <krun.h>
 #include <klocale.h>
 
-%{APPNAME}View::%{APPNAME}View(TQWidget *parent)
-    : TQWidget(parent),
+%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent)
+    : TQWidget(tqparent),
       DCOPObject("%{APPNAME}Iface")
 {
-    // setup our layout manager to automatically add our widgets
+    // setup our tqlayout manager to automatically add our widgets
     TQHBoxLayout *top_layout = new TQHBoxLayout(this);
     top_layout->setAutoAdd(true);
 
diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h
index a4f0b2e6..2eab2322 100644
--- a/languages/cpp/app_templates/kapp/appview.h
+++ b/languages/cpp/app_templates/kapp/appview.h
@@ -24,11 +24,12 @@ class KURL;
 class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAME}View(TQWidget *parent);
+    %{APPNAME}View(TQWidget *tqparent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp
index ff83190f..3d720a65 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/kapp/pref.cpp
@@ -22,20 +22,20 @@
     m_pageTwo = new %{APPNAME}PrefPageTwo(frame);
 }
 
-%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent)
-    : TQFrame(parent)
+%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *tqparent)
+    : TQFrame(tqparent)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    layout->setAutoAdd(true);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    tqlayout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
 
-%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent)
-    : TQFrame(parent)
+%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *tqparent)
+    : TQFrame(tqparent)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    layout->setAutoAdd(true);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    tqlayout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h
index 93859cfd..23798000 100644
--- a/languages/cpp/app_templates/kapp/pref.h
+++ b/languages/cpp/app_templates/kapp/pref.h
@@ -12,6 +12,7 @@ class %{APPNAME}PrefPageTwo;
 class %{APPNAME}Preferences : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     %{APPNAME}Preferences();
 
@@ -20,18 +21,20 @@ private:
     %{APPNAME}PrefPageTwo *m_pageTwo;
 };
 
-class %{APPNAME}PrefPageOne : public QFrame
+class %{APPNAME}PrefPageOne : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}PrefPageOne(TQWidget *parent = 0);
+    %{APPNAME}PrefPageOne(TQWidget *tqparent = 0);
 };
 
-class %{APPNAME}PrefPageTwo : public QFrame
+class %{APPNAME}PrefPageTwo : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}PrefPageTwo(TQWidget *parent = 0);
+    %{APPNAME}PrefPageTwo(TQWidget *tqparent = 0);
 };
 
 #endif // _%{APPNAMEUC}PREF_H_
diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am
index 51cb1973..f118ee10 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@@ -25,11 +25,11 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h
 %{APPNAMELC}_client_LDADD   = $(LIB_KDECORE)
 %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index 1a40df32..8c729f72 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -33,15 +33,15 @@ KatePluginFactory::~KatePluginFactory()
   delete s_instance;
 }
 
-TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
+TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
 {
-  return new KatePlugin%{APPNAME}( parent, name );
+  return new KatePlugin%{APPNAME}( tqparent, name );
 }
 
 KInstance* KatePluginFactory::s_instance = 0L;
 
-KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
-    : Kate::Plugin ( (Kate::Application*)parent, name )
+KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name )
+    : Kate::Plugin ( (Kate::Application*)tqparent, name )
 {
 }
 
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h
index 879ff967..2183e88e 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.h
@@ -17,12 +17,13 @@
 class KatePluginFactory : public KLibFactory
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   private:
     static KInstance* s_instance;
@@ -31,9 +32,10 @@ class KatePluginFactory : public KLibFactory
 class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
+    KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
     virtual ~KatePlugin%{APPNAME}();
 
     void addView (Kate::MainWindow *win);
diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am
index 88ba33a8..42a3cec8 100644
--- a/languages/cpp/app_templates/kateplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am
@@ -16,5 +16,5 @@ plugins_DATA = plugin_%{APPNAMELC}.rc
 kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 18595d10..9ee7b8b5 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -37,15 +37,15 @@ KatePluginFactory::~KatePluginFactory()
     delete s_instance;
 }
 
-TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
+TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
 {
-    return new KatePlugin%{APPNAME}( parent, name );
+    return new KatePlugin%{APPNAME}( tqparent, name );
 }
 
 KInstance* KatePluginFactory::s_instance = 0L;
 
-KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
-    : Kate::Plugin ( (Kate::Application*)parent, name )
+KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name )
+    : Kate::Plugin ( (Kate::Application*)tqparent, name )
 {
 }
 
@@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p )
 /**
  * %{APPNAME}ConfigPage
  */
-%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
-    : Kate::PluginConfigPage( parentWidget )
+%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
+    : Kate::PluginConfigPage( tqparentWidget )
 {
     TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" );
     lo->setSpacing(KDialogBase::spacingHint());
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 6ad068d4..3082884e 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -21,12 +21,13 @@ class %{APPNAME}ConfigPage;
 class KatePluginFactory : public KLibFactory
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
 private:
     static KInstance* s_instance;
@@ -35,9 +36,10 @@ private:
 class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
+    KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
     virtual ~KatePlugin%{APPNAME}();
 
     void addView (Kate::MainWindow *win);
@@ -65,10 +67,11 @@ private:
 class %{APPNAME}ConfigPage : public Kate::PluginConfigPage
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class KatePlugin%{APPNAME};
 
 public:
-    %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L);
+    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
     ~%{APPNAME}ConfigPage ();
 
     /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ).  */
diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
index 2dbd9367..14a5dd2a 100644
--- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
@@ -16,6 +16,6 @@ plugins_DATA = plugin_%{APPNAMELC}.rc
 kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp
index bb15b923..4e9d3ca5 100644
--- a/languages/cpp/app_templates/kcmodule/module.cpp
+++ b/languages/cpp/app_templates/kcmodule/module.cpp
@@ -11,8 +11,8 @@
 typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory;
 K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}"))
 
-%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(parent, name), myAboutData(0)
+%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name, const TQStringList&)
+    : KCModule(tqparent, name), myAboutData(0)
 {
     // place widgets here
     load();
diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h
index 7f539c60..57542aae 100644
--- a/languages/cpp/app_templates/kcmodule/module.h
+++ b/languages/cpp/app_templates/kcmodule/module.h
@@ -9,9 +9,10 @@
 class %{APPNAME}: public KCModule
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
+    %{APPNAME}( TQWidget *tqparent=0, const char *name=0, const TQStringList& = TQStringList() );
     ~%{APPNAME}();
 
     virtual void load();
diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/kcmodule/src-Makefile.am
index e5d30776..6efe685a 100644
--- a/languages/cpp/app_templates/kcmodule/src-Makefile.am
+++ b/languages/cpp/app_templates/kcmodule/src-Makefile.am
@@ -13,5 +13,5 @@ xdg_apps_DATA = %{APPNAMELC}.desktop
 
 
 messages: rc.cpp
-	$(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcm%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/kconfig35/app.h
index 0174aa1b..b8ec3f1e 100644
--- a/languages/cpp/app_templates/kconfig35/app.h
+++ b/languages/cpp/app_templates/kconfig35/app.h
@@ -26,6 +26,7 @@ class KURL;
 class %{APPNAMELC} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp
index 30d627fe..0c82dd25 100644
--- a/languages/cpp/app_templates/kconfig35/appview.cpp
+++ b/languages/cpp/app_templates/kconfig35/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
-    : %{APPNAMELC}view_base(parent)
+%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent)
+    : %{APPNAMELC}view_base(tqparent)
 {
 	settingsChanged();
 }
@@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h
index e0738ebe..897072a6 100644
--- a/languages/cpp/app_templates/kconfig35/appview.h
+++ b/languages/cpp/app_templates/kconfig35/appview.h
@@ -22,11 +22,12 @@ class KURL;
 class %{APPNAMELC}View : public %{APPNAMELC}view_base
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAMELC}View(TQWidget *parent);
+    %{APPNAMELC}View(TQWidget *tqparent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/kconfig35/appview_base.ui
index 626d95df..5852f806 100644
--- a/languages/cpp/app_templates/kconfig35/appview_base.ui
+++ b/languages/cpp/app_templates/kconfig35/appview_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAMELC}view_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
 <property name="name">
 <cstring>%{APPNAMELC}view_base</cstring>
 </property>
@@ -19,7 +19,7 @@
 <property name="name">
 <cstring>unnamed</cstring>
 </property>
-<widget class="QLabel" row="0" column="0">
+<widget class="TQLabel" row="0" column="0">
 <property name="name">
 <cstring>sillyLabel</cstring>
 </property>
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui
index 5c0fc860..8c8b9012 100644
--- a/languages/cpp/app_templates/kconfig35/prefs-base.ui
+++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Prefs_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Prefs_base</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Project age:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -83,14 +83,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="TQSpinBox" row="2" column="1">
             <property name="name">
                 <cstring>kcfg_val_time</cstring>
             </property>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am
index 5f7936da..2a04da7e 100644
--- a/languages/cpp/app_templates/kconfig35/src-Makefile.am
+++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC}
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 # the library search path. 
@@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index b73c02cb..bb91d42e 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -4,8 +4,8 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <QtGui/TQDropEvent>
-#include <QtGui/TQPainter>
+#include <TQtGui/TQDropEvent>
+#include <TQtGui/TQPainter>
 
 #include <kconfigdialog.h>
 #include <kstatusbar.h>
@@ -48,13 +48,13 @@
 void %{APPNAME}::setupActions()
 {
     KStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
-    KStandardAction::quit(qApp, TQT_SLOT(quit()), actionCollection());
+    KStandardAction::quit(tqApp, TQT_SLOT(quit()), actionCollection());
 
     KStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAME}View
     KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this);
-    actionCollection()->addAction( QLatin1String("switch_action"), custom );
+    actionCollection()->addAction( TQLatin1String("switch_action"), custom );
     connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors()));
 }
 
@@ -83,7 +83,7 @@ void %{APPNAME}::optionsPreferences()
     ui_prefs_base.setupUi(generalSettingsDlg);
     dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting");
     connect(dialog, TQT_SIGNAL(settingsChanged(TQString)), m_view, TQT_SLOT(settingsChanged()));
-    dialog->setAttribute( Qt::WA_DeleteOnClose );
+    dialog->setAttribute( TQt::WA_DeleteOnClose );
     dialog->show();
 }
 
diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h
index fb059fde..1a15a7c7 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.h
+++ b/languages/cpp/app_templates/kde4app/kapp4.h
@@ -23,6 +23,7 @@ class KUrl;
 class %{APPNAME} : public KXmlGuiWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp
index 785a6858..9d9e482a 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp
@@ -3,7 +3,7 @@
 #include "settings.h"
 
 #include <klocale.h>
-#include <QtGui/TQLabel>
+#include <TQtGui/TQLabel>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *)
 {
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h
index 40749696..c4ce6517 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.h
+++ b/languages/cpp/app_templates/kde4app/kapp4view.h
@@ -2,7 +2,7 @@
 #ifndef %{APPNAMELC}VIEW_H
 #define %{APPNAMELC}VIEW_H
 
-#include <QtGui/TQWidget>
+#include <TQtGui/TQWidget>
 
 #include "ui_%{APPNAMELC}view_base.h"
 
@@ -22,11 +22,12 @@ class KUrl;
 class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default constructor
      */
-    %{APPNAME}View(TQWidget *parent);
+    %{APPNAME}View(TQWidget *tqparent);
 
     /**
      * Destructor
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
index eb6a254a..92a83f43 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
 <class>%{APPNAMELC}view_base</class>
-<widget class="QWidget" name="%{APPNAMELC}view_base" >
+<widget class="TQWidget" name="%{APPNAMELC}view_base" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,7 +15,7 @@
   <property name="autoFillBackground" >
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
+  <tqlayout class="TQGridLayout" >
    <property name="leftMargin" >
     <number>11</number>
    </property>
@@ -35,7 +35,7 @@
     <number>6</number>
    </property>
    <item row="0" column="0" >
-    <widget class="QLabel" name="kcfg_sillyLabel" >
+    <widget class="TQLabel" name="kcfg_sillyLabel" >
      <property name="palette" >
       <palette>
        <active>
@@ -196,7 +196,7 @@
      <property name="scaledContents" >
       <bool>true</bool>
      </property>
-     <property name="alignment" >
+     <property name="tqalignment" >
       <set>Qt::AlignCenter</set>
      </property>
      <property name="wordWrap" >
@@ -204,9 +204,9 @@
      </property>
     </widget>
    </item>
-  </layout>
+  </tqlayout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <tqlayoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections/>
diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
index 2544a271..c29d33da 100644
--- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
+++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
@@ -9,7 +9,7 @@ set(%{APPNAMELC}_SRCS
    %{APPNAMELC}view.cpp
  )
 
-#kde4_automoc(${%{APPNAMELC}_SRCS})
+#kde4_autotqmoc(${%{APPNAMELC}_SRCS})
 
 kde4_add_ui_files(%{APPNAMELC}_SRCS %{APPNAMELC}view_base.ui prefs_base.ui)
 
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index ea400f02..98bf5f19 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
  <class>prefs_base</class>
- <widget class="QWidget" name="prefs_base" >
+ <widget class="TQWidget" name="prefs_base" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -9,9 +9,9 @@
     <height>156</height>
    </rect>
   </property>
-  <layout class="QGridLayout" >
+  <tqlayout class="TQGridLayout" >
    <item row="0" column="0" >
-    <widget class="QLabel" name="textLabel2_2" >
+    <widget class="TQLabel" name="textLabel2_2" >
      <property name="text" >
       <string>Background color:</string>
      </property>
@@ -37,7 +37,7 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
    <item row="2" column="0" >
-    <widget class="QLabel" name="textLabel1" >
+    <widget class="TQLabel" name="textLabel1" >
      <property name="text" >
       <string>Project age:</string>
      </property>
@@ -47,7 +47,7 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
    <item row="1" column="0" >
-    <widget class="QLabel" name="textLabel2" >
+    <widget class="TQLabel" name="textLabel2" >
      <property name="text" >
       <string>Foreground color:</string>
      </property>
@@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; }
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="tqsizeHint" >
       <size>
        <width>41</width>
        <height>20</height>
@@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; }
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="tqsizeHint" >
       <size>
        <width>41</width>
        <height>20</height>
@@ -105,7 +105,7 @@ p, li { white-space: pre-wrap; }
     </spacer>
    </item>
    <item row="2" column="1" >
-    <widget class="QSpinBox" name="kcfg_val_time" >
+    <widget class="TQSpinBox" name="kcfg_val_time" >
      <property name="toolTip" >
       <string>Set the project age (in days)</string>
      </property>
@@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; }
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="tqsizeHint" >
       <size>
        <width>41</width>
        <height>20</height>
@@ -136,9 +136,9 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-  </layout>
+  </tqlayout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <tqlayoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h
index b908b62c..77914d1c 100644
--- a/languages/cpp/app_templates/kdedcop/app.h
+++ b/languages/cpp/app_templates/kdedcop/app.h
@@ -19,6 +19,7 @@
 class %{APPNAME} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am
index dc26ec93..9b32fb8f 100644
--- a/languages/cpp/app_templates/kdedcop/src-Makefile.am
+++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 # this is the program that gets installed.  it's name is used for all
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 364ec0d7..e6b82e21 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -21,8 +21,8 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
 K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) );
 static const KDevPluginInfo data("kdev%{APPNAMELC}");
 
-%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" )
+%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList& )
+: KDevLanguageSupport(&data, tqparent, name ? name : "%{APPNAME}Part" )
 {
 	setInstance(%{APPNAME}Factory::instance());
 	setXMLFile("kdevlang_%{APPNAMELC}.rc");
@@ -91,7 +91,7 @@ void %{APPNAME}Part::savedFile(const KURL &fileName)
 {
 
 
-	if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 )))
+	if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 )))
 	{
 		kdDebug(9014) << "parse file " << fileName.path() << endl;
 		emit addedSourceInfo( fileName.path() );
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h
index d6d92ff6..234107bb 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h
@@ -18,8 +18,9 @@ class KAction;
 class %{APPNAME}Part : public KDevLanguageSupport
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &);
+		%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &);
 		~%{APPNAME}Part();
 	protected:
 		virtual Features features();
diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp
index cddf3e7e..54e56426 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
-    : %{APPNAME}GlobalConfigBase(parent, name), m_part(part)
+%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
+    : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h
index aea1cbea..f08bd1bd 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfig.h
+++ b/languages/cpp/app_templates/kdevpart/globalconfig.h
@@ -9,8 +9,9 @@ class %{APPNAME}Part;
 class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
+    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
index c16bd90d..7cba9a36 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAME}GlobalConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAME}GlobalConfigBase</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index 082549c4..96ddb6ca 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
+%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
     setXMLFile("kdev%{APPNAMELC}.rc");
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h
index b73e61da..ddedde17 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h
@@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part
 class %{APPNAME}Part: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args);
+    %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args);
     ~%{APPNAME}Part();
   
 private slots:
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h
index 308c3e7e..f7c0290f 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h
@@ -8,9 +8,10 @@
 class KDevProject;
 class %{APPNAME}Part;
 
-class %{APPNAME}Widget: public QWidget
+class %{APPNAME}Widget: public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:  
     %{APPNAME}Widget(%{APPNAME}Part *part);
     ~%{APPNAME}Widget();
diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp
index 42a9f3e7..a3bc8b8c 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
-    : %{APPNAME}ProjectConfigBase(parent, name), m_part(part)
+%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
+    : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h
index 0ab0cb35..2d13ce14 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfig.h
+++ b/languages/cpp/app_templates/kdevpart/projectconfig.h
@@ -9,8 +9,9 @@ class %{APPNAME}Part;
 class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
+    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
index c733a774..140e8df4 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAME}ProjectConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAME}ProjectConfigBase</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
index cddf3e7e..54e56426 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
-    : %{APPNAME}GlobalConfigBase(parent, name), m_part(part)
+%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
+    : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h
index aea1cbea..f08bd1bd 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfig.h
+++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h
@@ -9,8 +9,9 @@ class %{APPNAME}Part;
 class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
+    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
index c16bd90d..7cba9a36 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAME}GlobalConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAME}GlobalConfigBase</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index 082549c4..96ddb6ca 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
+%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
     setXMLFile("kdev%{APPNAMELC}.rc");
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
index b73e61da..ddedde17 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
@@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part
 class %{APPNAME}Part: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args);
+    %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args);
     ~%{APPNAME}Part();
   
 private slots:
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h
index 308c3e7e..f7c0290f 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h
@@ -8,9 +8,10 @@
 class KDevProject;
 class %{APPNAME}Part;
 
-class %{APPNAME}Widget: public QWidget
+class %{APPNAME}Widget: public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:  
     %{APPNAME}Widget(%{APPNAME}Part *part);
     ~%{APPNAME}Widget();
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
index 42a9f3e7..a3bc8b8c 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
-    : %{APPNAME}ProjectConfigBase(parent, name), m_part(part)
+%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
+    : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h
index 0ab0cb35..2d13ce14 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfig.h
+++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h
@@ -9,8 +9,9 @@ class %{APPNAME}Part;
 class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
+    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
index c733a774..140e8df4 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAME}ProjectConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAME}ProjectConfigBase</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
index db259cb3..5ccbec50 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
+++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
@@ -13,9 +13,9 @@ typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" ))
 
-%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name,
+%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     //add the mimetype here - example:
     //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" );
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
index 94776938..93303359 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
+++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
@@ -13,9 +13,10 @@ class TQStringList;
 class %{APPNAME}Plugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args );
+    %{APPNAME}Plugin( TQObject *tqparent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
index 48ac1c66..4bfee32a 100644
--- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
@@ -11,12 +11,12 @@ kfile_%{APPNAMELC}_la_SOURCES = kfile_%{APPNAMELC}.cpp
 kfile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kfile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO)
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 services_DATA = kfile_%{APPNAMELC}.desktop
 servicesdir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h
index 678df7a3..fd0ca00b 100644
--- a/languages/cpp/app_templates/khello/app.h
+++ b/languages/cpp/app_templates/khello/app.h
@@ -17,6 +17,7 @@
 class %{APPNAME} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am
index d9ac7c7a..820f292a 100644
--- a/languages/cpp/app_templates/khello/src-Makefile.am
+++ b/languages/cpp/app_templates/khello/src-Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h
index 678df7a3..fd0ca00b 100644
--- a/languages/cpp/app_templates/khello2/app.h
+++ b/languages/cpp/app_templates/khello2/app.h
@@ -17,6 +17,7 @@
 class %{APPNAME} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am
index 4664fe84..7f9d7125 100644
--- a/languages/cpp/app_templates/khello2/src-Makefile.am
+++ b/languages/cpp/app_templates/khello2/src-Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp
index 266e894f..40e2d2bb 100644
--- a/languages/cpp/app_templates/khello2/widget.cpp
+++ b/languages/cpp/app_templates/khello2/widget.cpp
@@ -4,8 +4,8 @@
 
 #include "%{APPNAMELC}widget.h"
 
-%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl)
-        : %{APPNAME}WidgetBase(parent,name,fl)
+%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl)
+        : %{APPNAME}WidgetBase(tqparent,name,fl)
 {}
 
 %{APPNAME}Widget::~%{APPNAME}Widget()
diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h
index 50d7a721..3773456b 100644
--- a/languages/cpp/app_templates/khello2/widget.h
+++ b/languages/cpp/app_templates/khello2/widget.h
@@ -8,9 +8,10 @@
 class %{APPNAME}Widget : public %{APPNAME}WidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}Widget();
     /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui
index e6f5be3d..4540c922 100644
--- a/languages/cpp/app_templates/khello2/widgetbase.ui
+++ b/languages/cpp/app_templates/khello2/widgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>%{APPNAME}WidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAMELC}widgetbase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QPushButton" row="1" column="0">
+        <widget class="TQPushButton" row="1" column="0">
             <property name="name">
                 <cstring>button</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <string>Click Me!</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>label</cstring>
             </property>
@@ -45,8 +45,8 @@
         <slot>button_clicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>button_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index 29ec3d1d..d609fa26 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -10,8 +10,8 @@
 #include "%{APPNAMELC}.h"
 
 
-%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
-    : KPanelApplet(configFile, type, actions, parent, name)
+%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name)
+    : KPanelApplet(configFile, type, actions, tqparent, name)
 {
     // Get the current application configuration handle
     ksConfig = config();
@@ -62,11 +62,11 @@ void %{APPNAME}::resizeEvent(TQResizeEvent *e)
 
 extern "C"
 {
-    KPanelApplet* init( TQWidget *parent, const TQString& configFile)
+    KPanelApplet* init( TQWidget *tqparent, const TQString& configFile)
     {
         KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
         return new %{APPNAME}(configFile, KPanelApplet::Normal,
                              KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
-                             parent, "%{APPNAMELC}");
+                             tqparent, "%{APPNAMELC}");
     }
 }
diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h
index ba4d6cd4..b11b1aa9 100644
--- a/languages/cpp/app_templates/kicker/applet.h
+++ b/languages/cpp/app_templates/kicker/applet.h
@@ -15,6 +15,7 @@
 class %{APPNAME} : public KPanelApplet
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     /**
@@ -23,11 +24,11 @@ public:
      * @param configFile The configFile handed over in the factory function.
      * @param Type The applet @ref type().
      * @param actions Standard RMB menu actions supported by the applet (see @ref action() ).
-     * @param parent The pointer to the parent widget handed over in the factory function.
-     * @param name A Qt object name for your applet.
+     * @param tqparent The pointer to the tqparent widget handed over in the factory function.
+     * @param name A TQt object name for your applet.
      **/
     %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0,
-        TQWidget *parent = 0, const char *name = 0);
+        TQWidget *tqparent = 0, const char *name = 0);
     /** destructor */
     ~%{APPNAME}();
     
diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am
index 424062d1..8a46f24d 100644
--- a/languages/cpp/app_templates/kicker/src-Makefile.am
+++ b/languages/cpp/app_templates/kicker/src-Makefile.am
@@ -11,5 +11,5 @@ kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la
 %{APPNAMELC}dir = $(kde_datadir)/kicker/applets
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp
index c8dc5d81..ad5d7991 100644
--- a/languages/cpp/app_templates/kioslave/slave.cpp
+++ b/languages/cpp/app_templates/kioslave/slave.cpp
@@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url )
     int remotePort = url.port();
     kdDebug() << "myURL: " << url.prettyURL() << endl;
     
-    infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
+    infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
     // Send the mimeType as soon as it is known
     mimeType("text/plain");
     // Send the data
diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/kioslave/src-Makefile.am
index 957ec330..b73354f1 100644
--- a/languages/cpp/app_templates/kioslave/src-Makefile.am
+++ b/languages/cpp/app_templates/kioslave/src-Makefile.am
@@ -10,5 +10,5 @@ protocol_DATA = %{APPNAMELC}.protocol
 protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui
index fea02def..2aefef82 100644
--- a/languages/cpp/app_templates/kmake/mainview.ui
+++ b/languages/cpp/app_templates/kmake/mainview.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>MainView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>helloLabel</cstring>
                     </property>
@@ -45,7 +45,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -69,8 +69,8 @@
         <slot>slotHelloButtonClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>slotHelloButtonClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp
index 8a0de706..5e953b0d 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.cpp
+++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp
@@ -3,8 +3,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl)
-: MainView(parent,name,fl)
+MainViewImp::MainViewImp(TQWidget* tqparent, const char* name, WFlags fl)
+: MainView(tqparent,name,fl)
 {
 }
 
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h
index 190a26e3..1a8af0b8 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.h
+++ b/languages/cpp/app_templates/kmake/mainviewimp.h
@@ -6,9 +6,10 @@
 class MainViewImp : public MainView
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  MainViewImp(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~MainViewImp();
 
 public slots:
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index 86287a3f..034e2fb3 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -23,8 +23,8 @@ extern "C"
 KInstance* %{APPNAME}Factory::s_global = 0L;
 KAboutData* %{APPNAME}Factory::s_aboutData = 0L;
 
-%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name )
-    : KoFactory( parent, name )
+%{APPNAME}Factory::%{APPNAME}Factory( TQObject* tqparent, const char* name )
+    : KoFactory( tqparent, name )
 {
     global();
 }
@@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L;
     s_global = 0L;
 }
 
-KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, parent, name, !bWantKoDocument );
+    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    %{APPNAME}Part *part = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       part->setReadWrite( false );
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h
index 58061af3..149b4b50 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h
@@ -14,11 +14,12 @@ class KAboutData;
 class %{APPNAME}Factory : public KoFactory
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 );
+    %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 );
     ~%{APPNAME}Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
index c12b5fd7..389fb431 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
@@ -8,20 +8,20 @@
 
 #include <tqpainter.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode )
-    : KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
 {
 }
 
-bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget )
+bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
 {
     // If nothing is loaded, do initialize here
     return TRUE;
 }
 
-KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name )
+KoView* %{APPNAME}Part::createViewInstance( TQWidget* tqparent, const char* name )
 {
-    return new %{APPNAME}View( this, parent, name );
+    return new %{APPNAME}View( this, tqparent, name );
 }
 
 bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store )
@@ -32,13 +32,13 @@ bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisS
 
 bool %{APPNAME}Part::loadXML( TQIODevice *, const TQDomDocument & )
 {
-    /// @todo load the document from the QDomDocument
+    /// @todo load the document from the TQDomDocument
     return true;
 }
 
 TQDomDocument %{APPNAME}Part::saveXML()
 {
-    /// @todo save the document into a QDomDocument
+    /// @todo save the document into a TQDomDocument
     return TQDomDocument();
 }
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h
index 95ebb3f6..0ec011ae 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.h
@@ -11,12 +11,13 @@
 class %{APPNAME}Part : public KoDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false );
+    %{APPNAME}Part( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
-    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 );
 
     virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store );
     virtual bool loadXML( TQIODevice *, const TQDomDocument & );
@@ -24,7 +25,7 @@ public:
     virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter );
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
 };
 
 #endif
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index f32707a8..240251f9 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -13,8 +13,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name )
-    : KoView( part, parent, name )
+%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent, const char* name )
+    : KoView( part, tqparent, name )
 {
     setInstance( %{APPNAME}Factory::global() );
     setXMLFile( "%{APPNAMELC}.rc" );
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h
index 63f5127b..bcaac2e1 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.h
@@ -16,8 +16,9 @@ class %{APPNAME}Part;
 class %{APPNAME}View : public KoView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 );
+    %{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent = 0, const char* name = 0 );
 
 protected slots:
     void cut();
diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am
index 19d38267..a0f702f6 100644
--- a/languages/cpp/app_templates/kofficepart/src-Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am
@@ -37,5 +37,5 @@ rc_DATA = %{APPNAMELC}.rc
 rcdir = $(kde_datadir)/%{APPNAMELC}
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp %{APPNAMELC}_aboutdata.h -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp
index ae9a85a6..4f0d7557 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp
@@ -7,8 +7,8 @@
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}.moc"
 
-%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
-                   KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
+%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name):
+                   KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name)
 {
 	widget=new TQLabel("Init Value",widgetParent);
 }
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
index 9599b530..b219619b 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
@@ -14,18 +14,19 @@
 class %{APPNAME} : public KonqSidebarPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     /**
      * Construct a @ref KonqSidebarPlugin.
      *
      * @param inst The sidebar's kinstance class.
-     * @param parent The sidebar internal button info class responsible for this plugin.
+     * @param tqparent The sidebar internal button info class responsible for this plugin.
      * @param widgetParent The container which will contain the plugins widget.
      * @param desktopName The filename of the configuration file.
-     * @param name A Qt object name for your plugin.
+     * @param name A TQt object name for your plugin.
      **/
-     %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
+     %{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
 
     /** destructor */
     ~%{APPNAME}();
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 3a8a2274..39bb7108 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -183,7 +183,7 @@ void %{APPNAME}::fileOpen()
     // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
     // button is clicked
     KURL url =
-        KFileDialog::getOpenURL( TQString::null, TQString::null, this );
+        KFileDialog::getOpenURL( TQString(), TQString(), this );
 
     if (url.isEmpty() == false)
     {
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index 25cd63bf..9bc577cb 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -22,6 +22,7 @@ class KToggleAction;
 class %{APPNAME} : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 809d642a..45a8116a 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -12,15 +12,15 @@
 #include <tqtextstream.h>
 #include <tqmultilineedit.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName,
-                                  TQObject *parent, const char *name )
-    : KParts::ReadWritePart(parent, name)
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName,
+                                  TQObject *tqparent, const char *name )
+    : KParts::ReadWritePart(tqparent, name)
 {
     // we need an instance
     setInstance( %{APPNAME}PartFactory::instance() );
 
     // this should be your custom internal widget
-    m_widget = new TQMultiLineEdit( parentWidget, widgetName );
+    m_widget = new TQMultiLineEdit( tqparentWidget, widgetName );
 
     // notify the part that this is our internal widget
     setWidget(m_widget);
@@ -74,7 +74,7 @@ void %{APPNAME}Part::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our parent to do it's thing
+    // in any event, we want our tqparent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
@@ -86,7 +86,7 @@ bool %{APPNAME}Part::openFile()
         return false;
 
     // our example widget is text-based, so we use TQTextStream instead
-    // of a raw QDataStream
+    // of a raw TQDataStream
     TQTextStream stream(&file);
     TQString str;
     while (!stream.eof())
@@ -109,7 +109,7 @@ bool %{APPNAME}Part::saveFile()
     if (isReadWrite() == false)
         return false;
 
-    // m_file is always local, so we use QFile
+    // m_file is always local, so we use TQFile
     TQFile file(m_file);
     if (file.open(IO_WriteOnly) == false)
         return false;
@@ -164,12 +164,12 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L;
     s_instance = 0L;
 }
 
-KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                                        TQObject *parent, const char *name,
+KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                                        TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name );
+    %{APPNAME}Part* obj = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h
index 1ebc7825..8d5417ad 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.h
+++ b/languages/cpp/app_templates/kpartapp/app_part.h
@@ -21,12 +21,13 @@ class TQMultiLineEdit;
 class %{APPNAME}Part : public KParts::ReadWritePart
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default constructor
      */
-    %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *parent, const char *name);
+    %{APPNAME}Part(TQWidget *tqparentWidget, const char *widgetName,
+                    TQObject *tqparent, const char *name);
 
     /**
      * Destructor
@@ -70,11 +71,12 @@ class KAboutData;
 class %{APPNAME}PartFactory : public KParts::Factory
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     %{APPNAME}PartFactory();
     virtual ~%{APPNAME}PartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *parent, const char *name,
+    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                            TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
  
diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am
index 357e2d0b..9b1a14b4 100644
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}_part.h
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index 61e3ca0e..dac6dc20 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -8,8 +8,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
-    : Plugin( parent, name )
+Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name )
+    : Plugin( tqparent, name )
 {
     // Instantiate all of your actions here.  These will appear in
     // Konqueror's menu and toolbars.
@@ -27,7 +27,7 @@ void Plugin%{APPNAME}::slotAction()
     // This plugin assumes KHTMLPart.  If your plugin can handle more
     // than this or a different Part than this, simply delete or
     // change the following block.
-    if ( !parent()->inherits("KHTMLPart") )
+    if ( !tqparent()->inherits("KHTMLPart") )
     {
         TQString title( i18n( "Cannot Translate Source" ) );
         TQString text( i18n( "You cannot translate anything except web pages "
@@ -37,9 +37,9 @@ void Plugin%{APPNAME}::slotAction()
         return;
     }
 
-    // Get a handle on our parent so we may get the necessary data for
+    // Get a handle on our tqparent so we may get the necessary data for
     // processing
-    KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
+    KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent());
 
     // This plugin only uses the URL.  You may use whatever data you
     // need.
@@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction()
   s_instance = 0;
 }
 
-TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
+TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
 {
-  return new Plugin%{APPNAME}( parent, name );
+  return new Plugin%{APPNAME}( tqparent, name );
 }
 
 KInstance *%{APPNAME}Factory::instance()
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h
index 7c7bfc0c..3d637d1b 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h
@@ -8,8 +8,9 @@
 class Plugin%{APPNAME} : public KParts::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
+  Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
   virtual ~Plugin%{APPNAME}();
 
 public slots:
@@ -19,11 +20,12 @@ public slots:
 class %{APPNAME}Factory : public KLibFactory
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   %{APPNAME}Factory();
   virtual ~%{APPNAME}Factory();
 
-  virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
+  virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* instance();
 
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index 52e29c09..81242777 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -18,5 +18,5 @@ pluginsdir = $(kde_datadir)/khtml/kpartplugins
 plugins_DATA = plugin_%{APPNAMELC}.rc
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
index ceaf1bda..0ba306bb 100644
--- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
@@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html
 
 CONFIGURING AND COMPILING THE PROJECT(S)
 SCONS TIPS
-MOC PROCESSING
+TQMOC PROCESSING
 SCONS MINIMUM DISTRIBUTION
 MORE TIPS
 
@@ -61,20 +61,20 @@ checkinstall --fstrans=no --nodoc scons install
 To make scons run (much) faster, consult ./addons/README in bksys
 
 ------------------------------------------
-MOC PROCESSING
+TQMOC PROCESSING
 
 In qt programs, when a header 'foo.h' contains a class that has
-signals and slots, then 'foo.h' must contain the macro Q_OBJECT
-in order to compile. foo_moc.cpp is usually generated, and is 
-used to produce foo_moc.o which is linked with the 
+Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT
+in order to compile. foo_tqmoc.cpp is usually generated, and is 
+used to produce foo_tqmoc.o which is linked with the 
 program or the library.
 
-In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, 
+In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, 
 and it must be included at the very end of foo.cpp 
 (add #include "foo.moc" : this increases the speed of 
 compilation a *lot* and makes less object files.
 
-Both modes are provided though, see test6-mocfiesta/
+Both modes are provided though, see test6-tqmocfiesta/
 
 ------------------------------------------
 MINIMUM SCONS DISTRIBUTION
@@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags
 among others), so when you can work without libtool
 (small projects especially), just do it.
 
-** moc processing **
+** tqmoc processing **
 As stated above, you should always add #include "foo.moc"
 for your qt classes (Q_OBJECT) to save precious compilation time.
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src
index 746cdf98..9850e2ae 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src
+++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-src
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 ## This script is a quick test to demonstrate (and test) 
-## the bksys moc handling '#include "file.moc"' can be added .. or not
+## the bksys tqmoc handling '#include "file.moc"' can be added .. or not
 ##
 ## Thomas Nagy, 2005
 ## This file can be reused freely for any project (see COPYING)
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct
index b82de4e1..238a05b8 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConstruct
+++ b/languages/cpp/app_templates/kscons_kmdi/SConstruct
@@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS:
 	shutil.copytree(startdir, FOLDER)
 
 	## remove our object files first
-	os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
-	os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
+	os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
 	#os.popen("pushd %s && scons -c " % FOLDER) # TODO
 
 	## CVS cleanup
-	os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf")
-	os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
 
 	## Subversion cleanup
-	os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER)
+	os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER)
 
 	## GNU Arch cleanup
-	os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
-	os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
 
 	## Create the tarball (coloured output)
 	print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m"
@@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS:
 	import os, shutil
 	if os.path.isdir(env['CACHEDIR']):
 		shutil.rmtree(env['CACHEDIR'])
-	os.popen("find . -name \"*.pyc\" | xargs rm -rf")
+	os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf")
 
 	env.Default(None)
 	env.Exit(0)
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index a851f02a..1f27cee4 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -17,15 +17,15 @@
 typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory;
 K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
 
-%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, 
-		TQObject *parent, const char *name, const TQStringList & /*args*/)
-    : KParts::ReadWritePart(parent)
+%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *tqparentWidget, const char *widgetName, 
+		TQObject *tqparent, const char *name, const TQStringList & /*args*/)
+    : KParts::ReadWritePart(tqparent)
 {
     // we need an instance
     setInstance( %{APPNAMELC}PartFactory::instance() );
 
     // this should be your custom internal widget
-    m_widget = new TQMultiLineEdit( parentWidget, widgetName );
+    m_widget = new TQMultiLineEdit( tqparentWidget, widgetName );
 
     // notify the part that this is our internal widget
     setWidget(m_widget);
@@ -88,7 +88,7 @@ void %{APPNAMELC}Part::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our parent to do it's thing
+    // in any event, we want our tqparent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
@@ -100,7 +100,7 @@ bool %{APPNAMELC}Part::openFile()
         return false;
 
     // our example widget is text-based, so we use TQTextStream instead
-    // of a raw QDataStream
+    // of a raw TQDataStream
     TQTextStream stream(&file);
     TQString str;
     while (!stream.eof())
@@ -123,7 +123,7 @@ bool %{APPNAMELC}Part::saveFile()
     if (isReadWrite() == false)
         return false;
 
-    // m_file is always local, so we use QFile
+    // m_file is always local, so we use TQFile
     TQFile file(m_file);
     if (file.open(IO_WriteOnly) == false)
         return false;
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h
index 3fa9beb5..39509adf 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h
@@ -23,12 +23,13 @@ class KAboutData;
 class %{APPNAMELC}Part : public KParts::ReadWritePart
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default constructor
      */
-    %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *parent, const char *name, const TQStringList & /*args*/);
+    %{APPNAMELC}Part(TQWidget *tqparentWidget, const char *widgetName,
+                    TQObject *tqparent, const char *name, const TQStringList & /*args*/);
 
     /**
      * Destructor
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
index 4286053a..efb41c1d 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqdragobject.h>
-#include <tqstatusbar.h>
+#include <statusbar.h>
 #include <tqtoolbutton.h>
 
 #include <kdebug.h>
@@ -146,7 +146,7 @@ void %{APPNAMELC}kmdi::setupActions()
 
 void %{APPNAMELC}kmdi::showTip() 
 {
-	KTipDialog::showTip(this,TQString::null,true);
+	KTipDialog::showTip(this,TQString(),true);
 }
 
 void %{APPNAMELC}kmdi::showTipOnStart()
@@ -204,7 +204,7 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current )
 	}
 
 	// switch to the corresponding document
-	if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) )
+	if ( m_views.tqcontains( (%{APPNAMELC}kmdiView*) current ) )
 	{
 		%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current;
 		//view->updateCaption();
@@ -243,7 +243,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 	}
 
 	%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v;
-	if ( m_views.contains( view ) )
+	if ( m_views.tqcontains( view ) )
 	{
 		m_views.remove( view );
 		if ( view->part()->queryClose() )
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h
index 8e80ab29..ca78c895 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h
@@ -28,6 +28,7 @@ class MiscProperties;
 class %{APPNAMELC}kmdi : public KMdiMainFrm
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		%{APPNAMELC}kmdi( KMdi::MdiMode mode );
 		virtual ~%{APPNAMELC}kmdi();
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
index d7c00001..232d6b44 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
@@ -13,8 +13,8 @@
 #include "%{APPNAMELC}kmdiView.h"
 
 
-	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name )
-: KMdiChildView( parentWidget, name )
+	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *tqparentWidget, const char *name )
+: KMdiChildView( tqparentWidget, name )
 {
 	m_part = NULL;
 
@@ -35,9 +35,9 @@
 			part()->widget()->setFocus();
 			setFocusProxy(part()->widget());
 
-			TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" );
+			TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" );
 			part()->widget()->reparent( this, TQPoint(0, 0) );
-			layout->addWidget( part()->widget() );
+			tqlayout->addWidget( part()->widget() );
 
 			// connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) );
 		}
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
index af05df48..31167035 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
@@ -15,8 +15,9 @@
 class %{APPNAMELC}kmdiView : public KMdiChildView 
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		%{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L );
+		%{APPNAMELC}kmdiView( TQWidget *tqparentWidget=0L, const char *name=0L );
 		virtual ~%{APPNAMELC}kmdiView();
 
 		KParts::ReadWritePart *part() { return m_part; }
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
index 5bd6b949..d0c856ec 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
@@ -12,7 +12,7 @@
 
 #include "kmdikonsole.h"
 
-kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name)
+kmdikonsole::kmdikonsole(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name)
 {
 	m_haskonsole = false;
 	respawn();
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
index ef5a2c1e..e97175c1 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
+++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
@@ -5,12 +5,13 @@
 
 #include <tqvbox.h>
 
-class kmdikonsole : public QVBox
+class kmdikonsole : public TQVBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		kmdikonsole( TQWidget* parent, const char* name=0);
+		kmdikonsole( TQWidget* tqparent, const char* name=0);
 		~kmdikonsole();
 
 	public slots:
diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh
index a36f5c93..7df00263 100755
--- a/languages/cpp/app_templates/kscons_kmdi/messages.sh
+++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh
@@ -34,14 +34,14 @@ fi
 echo "extracting the strings"
 
 # process the .ui and .rc files
-$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp
-$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp
+$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp
+$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp
 echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp
 
 # process the tips - $SRCDIR is supposed to be where the tips are living
 pushd $TIPSDIR; preparetips >tips.cpp; popd
 
-$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot
+$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot
 
 # remove the intermediate files
 rm -f $TIPSDIR/tips.cpp
diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui
index 5de638ef..8b3346de 100644
--- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui
+++ b/languages/cpp/app_templates/kscons_kmdi/prefs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>prefs</class>
-<widget class="QWidget">
+<widget class="TQWidget">
 <property name="name">
 <cstring>prefs</cstring>
 </property>
@@ -16,7 +16,7 @@
 <property name="name">
 <cstring>unnamed</cstring>
 </property>
-<widget class="QCheckBox" row="0" column="0">
+<widget class="TQCheckBox" row="0" column="0">
 <property name="name">
 <cstring>kcfg_showCloseTabsButton</cstring>
 </property>
@@ -26,5 +26,5 @@
 </widget>
 </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
index ceaf1bda..0ba306bb 100644
--- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
@@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html
 
 CONFIGURING AND COMPILING THE PROJECT(S)
 SCONS TIPS
-MOC PROCESSING
+TQMOC PROCESSING
 SCONS MINIMUM DISTRIBUTION
 MORE TIPS
 
@@ -61,20 +61,20 @@ checkinstall --fstrans=no --nodoc scons install
 To make scons run (much) faster, consult ./addons/README in bksys
 
 ------------------------------------------
-MOC PROCESSING
+TQMOC PROCESSING
 
 In qt programs, when a header 'foo.h' contains a class that has
-signals and slots, then 'foo.h' must contain the macro Q_OBJECT
-in order to compile. foo_moc.cpp is usually generated, and is 
-used to produce foo_moc.o which is linked with the 
+Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT
+in order to compile. foo_tqmoc.cpp is usually generated, and is 
+used to produce foo_tqmoc.o which is linked with the 
 program or the library.
 
-In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, 
+In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, 
 and it must be included at the very end of foo.cpp 
 (add #include "foo.moc" : this increases the speed of 
 compilation a *lot* and makes less object files.
 
-Both modes are provided though, see test6-mocfiesta/
+Both modes are provided though, see test6-tqmocfiesta/
 
 ------------------------------------------
 MINIMUM SCONS DISTRIBUTION
@@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags
 among others), so when you can work without libtool
 (small projects especially), just do it.
 
-** moc processing **
+** tqmoc processing **
 As stated above, you should always add #include "foo.moc"
 for your qt classes (Q_OBJECT) to save precious compilation time.
 
diff --git a/languages/cpp/app_templates/kscons_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src
index 02432be5..bc91cc0b 100644
--- a/languages/cpp/app_templates/kscons_kxt/SConscript-src
+++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src
@@ -33,7 +33,7 @@ myenv.KDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources )
 ## Customization
 
 ## Additional include paths for compiling the source files
-## Always add '../' (top-level directory) because moc makes code that needs it
+## Always add '../' (top-level directory) because tqmoc makes code that needs it
 myenv.KDEaddpaths_includes( "./ ../" )
 
 ## Necessary libraries to link against
diff --git a/languages/cpp/app_templates/kscons_kxt/SConstruct b/languages/cpp/app_templates/kscons_kxt/SConstruct
index b82de4e1..238a05b8 100644
--- a/languages/cpp/app_templates/kscons_kxt/SConstruct
+++ b/languages/cpp/app_templates/kscons_kxt/SConstruct
@@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS:
 	shutil.copytree(startdir, FOLDER)
 
 	## remove our object files first
-	os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
-	os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
+	os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f")
 	#os.popen("pushd %s && scons -c " % FOLDER) # TODO
 
 	## CVS cleanup
-	os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf")
-	os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf")
 
 	## Subversion cleanup
-	os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER)
+	os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER)
 
 	## GNU Arch cleanup
-	os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
-	os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf")
+	os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf")
 
 	## Create the tarball (coloured output)
 	print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m"
@@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS:
 	import os, shutil
 	if os.path.isdir(env['CACHEDIR']):
 		shutil.rmtree(env['CACHEDIR'])
-	os.popen("find . -name \"*.pyc\" | xargs rm -rf")
+	os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf")
 
 	env.Default(None)
 	env.Exit(0)
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 2a696ea0..ec892c11 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -158,7 +158,7 @@ void %{APPNAME}::changeCaption(const TQString& text)
 
 void %{APPNAME}::showTip()
 {
-    KTipDialog::showTip(this,TQString::null,true);
+    KTipDialog::showTip(this,TQString(),true);
 }
 
 void %{APPNAME}::showTipOnStart()
diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h
index e812716d..afc6d642 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.h
+++ b/languages/cpp/app_templates/kscons_kxt/app.h
@@ -29,6 +29,7 @@ class %{APPNAME} : public KMainWindow, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp
index 2bcc9c6a..a474e605 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAME}View::%{APPNAME}View(TQWidget *parent)
-    : %{APPNAME}view_base(parent)
+%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent)
+    : %{APPNAME}view_base(tqparent)
 {
 	settingsChanged();
 }
@@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h
index 8cd02bef..8d4517bd 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.h
+++ b/languages/cpp/app_templates/kscons_kxt/appview.h
@@ -22,11 +22,12 @@ class KURL;
 class %{APPNAME}View : public %{APPNAME}view_base
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAME}View(TQWidget *parent);
+    %{APPNAME}View(TQWidget *tqparent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kscons_kxt/appview_base.ui b/languages/cpp/app_templates/kscons_kxt/appview_base.ui
index 6cd36d2c..4604ca4b 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/appview_base.ui
@@ -2,7 +2,7 @@
 <class>%{APPNAME}view_base</class>
 <comment>%{CPP_TEMPLATE}</comment>
 <author>%{AUTHOR} &lt;%{EMAIL}&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAME}view_base</cstring>
     </property>
@@ -21,7 +21,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>sillyLabel</cstring>
             </property>
@@ -31,5 +31,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh
index a36f5c93..7df00263 100755
--- a/languages/cpp/app_templates/kscons_kxt/messages.sh
+++ b/languages/cpp/app_templates/kscons_kxt/messages.sh
@@ -34,14 +34,14 @@ fi
 echo "extracting the strings"
 
 # process the .ui and .rc files
-$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp
-$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp
+$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp
+$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp
 echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp
 
 # process the tips - $SRCDIR is supposed to be where the tips are living
 pushd $TIPSDIR; preparetips >tips.cpp; popd
 
-$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot
+$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot
 
 # remove the intermediate files
 rm -f $TIPSDIR/tips.cpp
diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
index 43ef8a5f..59403c40 100644
--- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
@@ -2,7 +2,7 @@
 <class>Prefs_base</class>
 <comment>%{CPP_TEMPLATE}</comment>
 <author>%{AUTHOR} &lt;%{EMAIL}&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Prefs_base</cstring>
     </property>
@@ -18,7 +18,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -34,7 +34,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <string>Project age:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -68,7 +68,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -85,14 +85,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="TQSpinBox" row="2" column="1">
             <property name="name">
                 <cstring>kcfg_val_time</cstring>
             </property>
@@ -113,7 +113,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -122,7 +122,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
index efdbf40b..855fb657 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
@@ -33,8 +33,8 @@ extern "C"
 
 //-----------------------------------------------------------------------------
 //! dialog to setup screen saver parameters
-%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name )
-        : %{APPNAME}UI( parent, name, TRUE )
+%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *tqparent, const char *name )
+        : %{APPNAME}UI( tqparent, name, TRUE )
 {
     /// @todo
     //Connect your signals and slots here to configure the screen saver.
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h
index a5d252a5..c8511d34 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h
@@ -9,6 +9,7 @@
 class %{APPNAME} : public KScreenSaver
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     %{APPNAME}( WId drawable );
     virtual ~%{APPNAME}();
@@ -20,8 +21,9 @@ private:
 class %{APPNAME}Setup : public %{APPNAME}UI
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL );
+    %{APPNAME}Setup( TQWidget *tqparent = NULL, const char *name = NULL );
 
 private slots:
     void slotOkPressed();
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
index c4a843d0..da84ab28 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
@@ -2,7 +2,7 @@
 <class>%{APPNAME}UI</class>
 <comment>This is the main UI for setting up your screen saver.</comment>
 <author>Ian Reinhart Geiser</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>%{APPNAMELC}cfg</cstring>
     </property>
@@ -17,7 +17,7 @@
     <property name="caption">
         <string>Screen Saver Config</string>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout2</cstring>
         </property>
@@ -33,7 +33,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QCheckBox" row="0" column="0">
+            <widget class="TQCheckBox" row="0" column="0">
                 <property name="name">
                     <cstring>CheckBox1</cstring>
                 </property>
@@ -41,7 +41,7 @@
                     <string>Set some setting</string>
                 </property>
             </widget>
-            <widget class="QLayoutWidget" row="1" column="0">
+            <widget class="TQLayoutWidget" row="1" column="0">
                 <property name="name">
                     <cstring>Layout1</cstring>
                 </property>
@@ -50,7 +50,7 @@
                         <cstring>unnamed</cstring>
                     </property>
 
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>OkayPushButton</cstring>
                         </property>
@@ -58,7 +58,7 @@
                             <string>&amp;OK</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>CancelPushButton</cstring>
                         </property>
@@ -74,6 +74,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am
index e19ffb77..e11ec0dc 100644
--- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/kscreensaver/src-Makefile.am
@@ -20,5 +20,5 @@ desktopdir = $(kde_appsdir)/System/ScreenSavers
 EXTRA_DIST = $(desktop_DATA)
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index 09f031c4..6ed2ab3d 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -27,6 +27,7 @@ class KURL;
 class %{APPNAMELC} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 30d627fe..0c82dd25 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
-    : %{APPNAMELC}view_base(parent)
+%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent)
+    : %{APPNAMELC}view_base(tqparent)
 {
 	settingsChanged();
 }
@@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h
index e0738ebe..897072a6 100644
--- a/languages/cpp/app_templates/kxt/appview.h
+++ b/languages/cpp/app_templates/kxt/appview.h
@@ -22,11 +22,12 @@ class KURL;
 class %{APPNAMELC}View : public %{APPNAMELC}view_base
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAMELC}View(TQWidget *parent);
+    %{APPNAMELC}View(TQWidget *tqparent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui
index 626d95df..5852f806 100644
--- a/languages/cpp/app_templates/kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kxt/appview_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAMELC}view_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
 <property name="name">
 <cstring>%{APPNAMELC}view_base</cstring>
 </property>
@@ -19,7 +19,7 @@
 <property name="name">
 <cstring>unnamed</cstring>
 </property>
-<widget class="QLabel" row="0" column="0">
+<widget class="TQLabel" row="0" column="0">
 <property name="name">
 <cstring>sillyLabel</cstring>
 </property>
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui
index 5c0fc860..8c8b9012 100644
--- a/languages/cpp/app_templates/kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kxt/prefs-base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Prefs_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Prefs_base</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Project age:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -83,14 +83,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="TQSpinBox" row="2" column="1">
             <property name="name">
                 <cstring>kcfg_val_time</cstring>
             </property>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 5f7936da..2a04da7e 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC}
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 # the library search path. 
@@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 7f4cda15..508f7cc9 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -74,9 +74,9 @@
     connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup()));
 
 
-    mVolume=new L33tSlider(0,100,10,0, Horizontal, this);
+    mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this);
     mVolume->setValue(napp->player()->volume());
-    mSeeker=new L33tSlider(0,1000,10,0, Horizontal, this);
+    mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this);
 
     mStatusBar=new KStatusBar(this);
 
@@ -86,7 +86,7 @@
     l->addWidget(mStop,0,1);
     l->addWidget(mPlay,0,2);
     l->addWidget(mForward,0,3);
-    l->addWidget(mPlaylist,0,4, Qt::AlignLeft);
+    l->addWidget(mPlaylist,0,4, TQt::AlignLeft);
     l->addWidget(mLoop,0,5);
     l->addWidget(mPopup,0,6);
     l->addColSpacing(4, buttonSize+8);
@@ -124,7 +124,7 @@
     connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden()));
 
     // Event Filter for the RMB
-    for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i)
+    for (TQPtrListIterator<TQObject> i(*tqchildren()); i.current(); ++i)
         (*i)->installEventFilter(this);
 
     setCaption("Noatun");
@@ -132,7 +132,7 @@
     show();
 
     // What it is now, stay.
-    setFixedSize(minimumSize());
+    setFixedSize(tqminimumSize());
 }
 
 %{APPNAME}UI::~%{APPNAME}UI()
@@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text)
 void %{APPNAME}UI::popup()
 {
     NoatunStdAction::ContextMenu::showContextMenu(
-        mapToGlobal(mPopup->geometry().bottomLeft()) );
+        mapToGlobal(mPopup->tqgeometry().bottomLeft()) );
 }
 
 void %{APPNAME}UI::slotPlaying()
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h
index 476530f2..498864c6 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.h
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.h
@@ -26,6 +26,7 @@ class KStatusBar;
 class %{APPNAME}UI : public TQWidget, public UserInterface
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     %{APPNAME}UI();
     virtual ~%{APPNAME}UI();
diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am
index 95506569..f7c7b349 100644
--- a/languages/cpp/app_templates/noatunui/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunui/src-Makefile.am
@@ -20,5 +20,5 @@ plugins_DATA = %{APPNAMELC}.plugin
 # kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
index a25f1fd2..f84a4fd3 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp
@@ -117,7 +117,7 @@ void Bitmap<Type>::fadeStar()
             d++;
             x++;
         }
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -211,7 +211,7 @@ void %{APPNAME}View::checkInput()
             }
             break;
 
-        case SDL_QUIT:
+        case SDL_TQUIT:
             exit(0);
             break;
         }
@@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput()
 
 #define output2 ((unsigned char*)outputBmp.data)
 
-void %{APPNAME}View::repaint()
+void %{APPNAME}View::tqrepaint()
 {
     SDL_LockSurface(surface);
     TEST();
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.h b/languages/cpp/app_templates/noatunvisual/plugin_impl.h
index 2a7de7b1..a95845c9 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_impl.h
+++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.h
@@ -58,7 +58,7 @@ protected:
     void setupPalette(double dummy=0.0);
 
     /** Draw everything.  */
-    void repaint();
+    void tqrepaint();
 
 private:
     /** used for pipelining  */
diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
index 207fd8a8..8f649499 100644
--- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
@@ -15,5 +15,5 @@ plugins_DATA = %{APPNAMELC}.plugin
 # kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro
index f4111696..74323c7c 100644
--- a/languages/cpp/app_templates/opieapp/app.pro
+++ b/languages/cpp/app_templates/opieapp/app.pro
@@ -9,8 +9,8 @@ QMAKE_LIBDIR = $(OPIEDIR)/lib
 OPIE-SPEC=6
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-	contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+	tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
 		message( "foo" )
 	        system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp
index ebb4233c..6636116e 100644
--- a/languages/cpp/app_templates/opieapp/example.cpp
+++ b/languages/cpp/app_templates/opieapp/example.cpp
@@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory;
 OPIE_EXPORT_APP( %{APPNAME}Factory )
 
 /*
- *  Constructs a %{APPNAME} which is a child of 'parent', with the
+ *  Constructs a %{APPNAME} which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  */
-%{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
-    : %{APPNAME}Base( parent, name, fl )
+%{APPNAME}::%{APPNAME}( TQWidget* tqparent,  const char* name, WFlags fl )
+    : %{APPNAME}Base( tqparent, name, fl )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
@@ -20,7 +20,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory )
  */
 %{APPNAME}::~%{APPNAME}()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /*
diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h
index 2a9c9efa..0a8320c9 100644
--- a/languages/cpp/app_templates/opieapp/example.h
+++ b/languages/cpp/app_templates/opieapp/example.h
@@ -5,12 +5,13 @@
 class %{APPNAME} : public %{APPNAME}Base
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     static TQString appName() {
-        return TQString::fromLatin1("%{APPNAMELC}" );
+        return TQString::tqfromLatin1("%{APPNAMELC}" );
     }
-    %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}();
 
 private slots:
diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui
index b6b81b11..1243c341 100644
--- a/languages/cpp/app_templates/opieapp/examplebase.ui
+++ b/languages/cpp/app_templates/opieapp/examplebase.ui
@@ -7,7 +7,7 @@
         <cstring>%{APPNAME}Base</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro
index e1cc1e3b..696082d0 100644
--- a/languages/cpp/app_templates/opieapplet/app.pro
+++ b/languages/cpp/app_templates/opieapplet/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-        contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
index 3264314c..cc2a6a17 100644
--- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
@@ -2,14 +2,14 @@
 #include <tqpainter.h>
 #include <tqmessagebox.h>
 
-#include <qpe/applnk.h> // for AppLnk
-#include <qpe/resource.h> // for Resource loading
+#include <tqpe/applnk.h> // for AppLnk
+#include <tqpe/resource.h> // for Resource loading
 
 #include "%{APPNAMELC}.h"
 
 
-%{APPNAME}::%{APPNAME}(TQWidget *parent)
-    : TQWidget( parent,  "%{APPNAME} Applet" ) {
+%{APPNAME}::%{APPNAME}(TQWidget *tqparent)
+    : TQWidget( tqparent,  "%{APPNAME} Applet" ) {
 /*
  * we will load an Image, scale it for the right usage
  * remember your applet might be used by different
@@ -79,7 +79,7 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) {
 %{APPNAME}Impl::~%{APPNAME}Impl() {
     /*
      * we will delete our applets as well
-     * setAUtoDelete makes the QList free
+     * setAUtoDelete makes the TQList free
      * the objects behind the pointers
      */
     m_applets.setAutoDelete( true );
@@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) {
 /*
  * For the taskbar interface return a Widget
  */
-TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) {
+TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) {
     /*
      * There are problems with ownership. So we add
      * our ownlist and clear this;
      */
-    %{APPNAME}* ap = new %{APPNAME}( parent );
+    %{APPNAME}* ap = new %{APPNAME}( tqparent );
     m_applets.append( ap );
 
     return ap;
@@ -109,12 +109,12 @@ int %{APPNAME}Impl::position()const {
 
 
 /*
- * Now the important QUnkownInterface method without
+ * Now the important TQUnkownInterface method without
  * this one your applet won't load
  * @param uuid The uuid of the interface
  * @param iface The pointer to the interface ptr
  */
-QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** iface) {
+TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid& uuid, TQUnknownInterface** iface) {
     /* set the pointer to the interface to 0 */
     *iface = 0;
 
@@ -128,24 +128,24 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i
      * Now the caller knows that the Interface Pointer
      * is valid and the interface supported
      */
-    if ( uuid == IID_QUnknown )
+    if ( uuid == IID_TQUnknown )
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
     else
-        return QS_FALSE;
+        return TQS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
 
-    return QS_OK;
+    return TQS_OK;
 }
 
 
 /*
  * Finally we need to export the Interface.
  * CREATE_INSTANCE creates a interface and calls
- * queryInterface for the QUnknownInterface once
+ * queryInterface for the TQUnknownInterface once
  * With out this function the applet can't be loaded.
  *
  * NOTE: If your applet does not load it's likely you've an
@@ -156,7 +156,7 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i
  * The main(int argc, char* argv[] ) does not need to be
  * included in a library so it's ok that the linker complains
  */
-Q_EXPORT_INTERFACE() {
-    Q_CREATE_INSTANCE( %{APPNAME}Impl )
+TQ_EXPORT_INTERFACE() {
+    TQ_CREATE_INSTANCE( %{APPNAME}Impl )
 }
 
diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h
index 7cca8ee7..855aed57 100644
--- a/languages/cpp/app_templates/opieapplet/simpleimpl.h
+++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h
@@ -3,18 +3,18 @@
 
 
 /**
- * Opie and Qtopia uses a component system called QCOM
- * which was first part of the Qt 3.0 API but was made
- * prviate during the betas. Opie and Qtopia still use it
+ * Opie and TQtopia uses a component system called TQCOM
+ * which was first part of the TQt 3.0 API but was made
+ * prviate during the betas. Opie and TQtopia still use it
  * and we're happy with it.
- * Every starts with the QUnknownInterface. It supports functions
+ * Every starts with the TQUnknownInterface. It supports functions
  * for reference counting and the most important one
- * is for a query. Every QCOM interface got a global unique id ( GUID,UUID )
+ * is for a query. Every TQCOM interface got a global unique id ( GUID,UUID )
  * query is used to see if a interface is supported by
  * a dynamic shared object ( dso / plugin )
  * For tasks like loading Applications, InputMethods, Today, MenuButton,
  * Taskbar, Style, Email Client there are specefic Interfaces you
- * need to implement. The interfaces inherits from QUnknownInterface and
+ * need to implement. The interfaces inherits from TQUnknownInterface and
  * you'll need inherit from the interface.
  * As example we will use the Taskbar interface
  */
@@ -22,26 +22,27 @@
 
 /*
  * The taskbar applet interfaces wants us to implement position() and applet()
- * additionally we need to implement add(), release() and queryInterface for QUnknownInterface
+ * additionally we need to implement add(), release() and queryInterface for TQUnknownInterface
  * luckiy there is a macro for the reference counting
  * We provide an Implementation of the interface.
  */
 #include <tqwidget.h>
 #include <tqptrlist.h>
 
-#include <qpe/taskbarappletinterface.h>
+#include <tqpe/taskbarappletinterface.h>
 
 
 /*
  * Because we only draw an Icon in a fixed width and height
- * we declare and define  %{APPNAME} here and you could use QLabel
+ * we declare and define  %{APPNAME} here and you could use TQLabel
  * setPixmap or use TQWidget and draw yourself.
  * You might also want to reimplement mouse*Event to use some simple actions
  */
 class  %{APPNAME} : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
-     %{APPNAME}(TQWidget *parent);
+     %{APPNAME}(TQWidget *tqparent);
     ~%{APPNAME}();
 private:
     void mousePressEvent( TQMouseEvent* );
@@ -55,9 +56,9 @@ public:
     %{APPNAME}Impl();
     virtual ~%{APPNAME}Impl();
 
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
 
-    TQWidget *applet( TQWidget* parent );
+    TQWidget *applet( TQWidget* tqparent );
     int position()const;
 
     /*
@@ -65,10 +66,10 @@ public:
      * if reference drops to zero
      * delete this is called
      */
-    Q_REFCOUNT
+    TQ_REFCOUNT
 
 private:
-    QList<%{APPNAME}> m_applets;
+    TQList<%{APPNAME}> m_applets;
 };
 
 
diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro
index 1711c78f..5a3a7a40 100644
--- a/languages/cpp/app_templates/opieinput/app.pro
+++ b/languages/cpp/app_templates/opieinput/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-        contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
index db2e4285..ea178e59 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
@@ -3,7 +3,7 @@
 #include <tqlabel.h>
 #include <tqsignalmapper.h>
 #include <tqpushbutton.h>
-#include <qpe/resource.h>
+#include <tqpe/resource.h>
 
 #include "%{APPNAMELC}.h"
 
@@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){
 	
 	/*
 	 *  Send the key
-	 * ke is the unicode
+	 * ke is the tqunicode
 	 * _ke + 0x41 is the keycode
 	 *  m_state Normally the state 
 	 * down/up
@@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){
     delete m_icn;
 }
 
-TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, Qt::WFlags f )
+TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f )
 {
     if ( !m_pickboard )
-	m_pickboard = new %{APPNAME}( parent, f );
+	m_pickboard = new %{APPNAME}( tqparent, f );
     return m_pickboard;
 }
 
@@ -133,25 +133,25 @@ void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot )
 	TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
-#ifndef QT_NO_COMPONENT
-QRESULT %{APPNAME}Impl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+#ifndef TQT_NO_COMPONENT
+TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface )
 {
     *iface = 0;
-    if ( uuid == IID_QUnknown )
+    if ( uuid == IID_TQUnknown )
 	*iface = this;
     else if ( uuid == IID_InputMethod )
 	*iface = this;
     else
-	return QS_FALSE;
+	return TQS_FALSE;
 
     if ( *iface )
 	(*iface)->addRef();
-    return QS_OK;
+    return TQS_OK;
 }
 
-Q_EXPORT_INTERFACE()
+TQ_EXPORT_INTERFACE()
 {
-    Q_CREATE_INSTANCE( %{APPNAME}Impl )
+    TQ_CREATE_INSTANCE( %{APPNAME}Impl )
 }
 #endif
 
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h
index 6d7033f0..76af8138 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.h
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.h
@@ -3,12 +3,13 @@
 
 #include <tqhbox.h>
 
-#include <qpe/inputmethodinterface.h>
+#include <tqpe/inputmethodinterface.h>
 
 class TQPixmap;
 class TQCheckBox;
 class %{APPNAME} : public TQHBox {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	%{APPNAME}( TQWidget *par, WFlags f );
 	~%{APPNAME}();
@@ -31,12 +32,12 @@ public:
     %{APPNAME}Impl();
     virtual ~%{APPNAME}Impl();
 
-#ifndef QT_NO_COMPONENT
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
+#ifndef TQT_NO_COMPONENT
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
+    TQ_REFCOUNT
 #endif
 
-    virtual TQWidget *inputMethod( TQWidget *parent, Qt::WFlags f );
+    virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f );
     virtual void resetState();
     virtual TQPixmap *icon();
     virtual TQString name();
diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro
index 71bc208c..f9600bf4 100644
--- a/languages/cpp/app_templates/opiemenu/app.pro
+++ b/languages/cpp/app_templates/opiemenu/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-        contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp
index 17b59a3e..9d953663 100644
--- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp
@@ -1,7 +1,7 @@
 #include "%{APPNAMELC}.h"
 
-#include <qpe/applnk.h>
-#include <qpe/resource.h>
+#include <tqpe/applnk.h>
+#include <tqpe/resource.h>
 
 /* QT */
 #include <tqiconset.h>
@@ -57,22 +57,22 @@ void %{APPNAME}::activated()
 }
 
 
-QRESULT %{APPNAME}::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+TQRESULT %{APPNAME}::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface )
 {
     *iface = 0;
-    if ( uuid == IID_QUnknown )
+    if ( uuid == IID_TQUnknown )
         *iface = this;
     else if ( uuid == IID_MenuApplet )
         *iface = this;
     else
-	return QS_FALSE;
+	return TQS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
-    return QS_OK;
+    return TQS_OK;
 }
 
-Q_EXPORT_INTERFACE()
+TQ_EXPORT_INTERFACE()
 {
-    Q_CREATE_INSTANCE( %{APPNAME} )
+    TQ_CREATE_INSTANCE( %{APPNAME} )
 }
diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h
index b384ee2d..61c3cc5b 100644
--- a/languages/cpp/app_templates/opiemenu/simpleimpl.h
+++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h
@@ -1,7 +1,7 @@
 #ifndef %{APPNAME}_MENU_APPLET_H
 #define %{APPNAME}_MENU_APPLET_H
 
-#include <qpe/menuappletinterface.h>
+#include <tqpe/menuappletinterface.h>
 
 #include <tqobject.h>
 
@@ -9,13 +9,14 @@ class %{APPNAME} : public TQObject, public MenuAppletInterface
 {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     %{APPNAME} ( );
     virtual ~%{APPNAME} ( );
 
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
+    TQ_REFCOUNT
 
     virtual int position() const;
     
@@ -25,7 +26,7 @@ public:
     /* virtual TQString tr( const char* ) const;
     virtual TQString tr( const char*, const char* ) const;
     */
-    virtual TQPopupMenu *popup ( TQWidget *parent ) const;
+    virtual TQPopupMenu *popup ( TQWidget *tqparent ) const;
     virtual void activated ( );
 };
 
diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro
index 53fb6eea..df87650c 100644
--- a/languages/cpp/app_templates/opienet/app.pro
+++ b/languages/cpp/app_templates/opienet/app.pro
@@ -7,8 +7,8 @@ LIBS		      += -linterfaces
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-        contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h
index 7a8882b4..5c928ec9 100644
--- a/languages/cpp/app_templates/opienet/simmplemodule.h
+++ b/languages/cpp/app_templates/opienet/simmplemodule.h
@@ -12,19 +12,19 @@ public:
     VirtualModule();
     ~VirtualModule();
 
-    const TQString type() {return TQString::fromLatin1("vpn" );}
+    const TQString type() {return TQString::tqfromLatin1("vpn" );}
     void setProfile( const TQString& ) {}
     bool isOwner( Interface* );
     TQWidget *configure( Interface* );
     TQWidget *information(  Interface* );
-    QList<Interface> getInterfaces();
+    TQList<Interface> getInterfaces();
     void possibleNewInterfaces( TQMap<TQString, TQString>& );
     Interface *addNewInterface( const TQString& );
     bool remove( Interface* iface );
-    TQString getPixmapName( Interface*  ) {return TQString::fromLatin1("Tux"); }
+    TQString getPixmapName( Interface*  ) {return TQString::tqfromLatin1("Tux"); }
     void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen
 private:
-    QList<Interface> m_interfaces;
+    TQList<Interface> m_interfaces;
 };
 
 extern "C" {
diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp
index bbabcbda..9b38bc77 100644
--- a/languages/cpp/app_templates/opienet/simpleiface.cpp
+++ b/languages/cpp/app_templates/opienet/simpleiface.cpp
@@ -1,9 +1,9 @@
 #include "%{APPNAMELC}iface.h"
 
-%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent,
+%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent,
                                     const char* name,
                                     bool status )
-    : Interface(parent, name, status )
+    : Interface(tqparent, name, status )
 {
 }
 
@@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() {
 
 void %{APPNAME}Interface::start() {
 // call pptp
-    setStatus(true);
+    settqStatus(true);
     refresh();
     emit updateMessage("VPN started");
 }
 
 void %{APPNAME}Interface::stop() {
-    setStatus(false );
+    settqStatus(false );
     refresh();
     emit updateMessage("VPN halted");
 }
diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h
index ef514697..c38d884f 100644
--- a/languages/cpp/app_templates/opienet/simpleiface.h
+++ b/languages/cpp/app_templates/opienet/simpleiface.h
@@ -5,9 +5,10 @@
 
 class %{APPNAME}Interface : public Interface {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false );
+    %{APPNAME}Interface(TQObject* tqparent, const char* name = "vpn", bool up = false );
     ~%{APPNAME}Interface();
 
 public slots:
diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp
index 0a96c844..f8e963bd 100644
--- a/languages/cpp/app_templates/opienet/simplemodule.cpp
+++ b/languages/cpp/app_templates/opienet/simplemodule.cpp
@@ -29,7 +29,7 @@
  */
 bool %{APPNAME}Module::isOwner(  Interface* iface ) {
  /* check if it is our device */
-    return  m_interfaces.find(  iface ) != -1;
+    return  m_interfaces.tqfind(  iface ) != -1;
 }
 
 TQWidget*  %{APPNAME}Module::configure( Interface* ) {
@@ -41,7 +41,7 @@ TQWidget* %{APPNAME}Module::information(  Interface* iface ) {
     return  new InterfaceInformationImp(0, "Interface info", iface );
 }
 
-QList<Interface> %{APPNAME}Module::getInterfaces() {
+TQList<Interface> %{APPNAME}Module::getInterfaces() {
     return m_interfaces;
 }
 
diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h
index 4120d811..327c1d43 100644
--- a/languages/cpp/app_templates/opienet/simplemodule.h
+++ b/languages/cpp/app_templates/opienet/simplemodule.h
@@ -12,19 +12,19 @@ public:
     %{APPNAME}Module();
     ~%{APPNAME}Module();
 
-    const TQString type() {return TQString::fromLatin1("vpn" );}
+    const TQString type() {return TQString::tqfromLatin1("vpn" );}
     void setProfile( const TQString& ) {}
     bool isOwner( Interface* );
     TQWidget *configure( Interface* );
     TQWidget *information(  Interface* );
-    QList<Interface> getInterfaces();
+    TQList<Interface> getInterfaces();
     void possibleNewInterfaces( TQMap<TQString, TQString>& );
     Interface *addNewInterface( const TQString& );
     bool remove( Interface* iface );
-    TQString getPixmapName( Interface*  ) {return TQString::fromLatin1("Tux"); }
+    TQString getPixmapName( Interface*  ) {return TQString::tqfromLatin1("Tux"); }
     void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen
 private:
-    QList<Interface> m_interfaces;
+    TQList<Interface> m_interfaces;
 };
 
 extern "C" {
diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro
index 152dc6f6..73e03efb 100644
--- a/languages/cpp/app_templates/opietoday/app.pro
+++ b/languages/cpp/app_templates/opietoday/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-        contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
index c7df8069..d3dc37ab 100644
--- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp
+++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
@@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const {
 
 // this sets the image that will be shown on the left side of the plugin
 TQString %{APPNAME}::pixmapNameWidget() const {
-    return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}");
+    return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}");
 }
 
 TQWidget* %{APPNAME}::widget( TQWidget * wid ) {
@@ -36,13 +36,13 @@ TQString %{APPNAME}::pixmapNameConfig() const {
 }
 
 // No config widget yet, look at the datebook plugin for an example of that
-TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) {
+TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) {
     return 0l;
 }
 
 // add the binary name of the app to launch here
 TQString %{APPNAME}::appName() const {
-    return TQString::null;
+    return TQString();
 }
 
 // if the plugin should be excluded form the refresh cycles that can be set in the today app
diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp
index 3a9481f1..a4896308 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp
+++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp
@@ -14,17 +14,17 @@ TodayPluginObject* %{APPNAME}Impl::guiPart() {
     return examplePlugin;
 }
 
-QRESULT %{APPNAME}Impl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
+TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid & uuid,  TQUnknownInterface **iface ) {
     *iface = 0;
-    if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
+    if ( ( uuid == IID_TQUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
     }else
-	return QS_FALSE;
+	return TQS_FALSE;
 
-    return QS_OK;
+    return TQS_OK;
 
 }
 
-Q_EXPORT_INTERFACE() {
-    Q_CREATE_INSTANCE( %{APPNAME}Impl );
+TQ_EXPORT_INTERFACE() {
+    TQ_CREATE_INSTANCE( %{APPNAME}Impl );
 }
diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.h b/languages/cpp/app_templates/opietoday/examplepluginimpl.h
index ccb7c3b3..ddc63bc2 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginimpl.h
+++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.h
@@ -11,8 +11,8 @@ public:
     %{APPNAME}Impl();
     virtual ~%{APPNAME}Impl();
 
-    QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
-    Q_REFCOUNT
+    TQRESULT queryInterface( const TQUuid &,  TQUnknownInterface** );
+    TQ_REFCOUNT
 
     virtual TodayPluginObject *guiPart();
 
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
index a80dad81..98b19f9a 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
@@ -1,10 +1,10 @@
-#include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h>
+#include <tqpe/config.h>
+#include <tqpe/tqcopenvelope_qws.h>
 
 #include "%{APPNAMELC}widget.h"
 
-%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent,  const char* name)
-    : TQWidget(parent,  name ) {
+%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent,  const char* name)
+    : TQWidget(tqparent,  name ) {
 
     m_exampleLabel = 0l;
     m_layout = 0l;
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
index 53a67b18..f5e35d4e 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
@@ -8,9 +8,10 @@
 class %{APPNAME}Widget : public TQWidget {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{APPNAME}Widget( TQWidget *parent,  const char *name );
+    %{APPNAME}Widget( TQWidget *tqparent,  const char *name );
     ~%{APPNAME}Widget();
     
     void refresh();
diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c
index 0a34b6c4..e0317932 100644
--- a/languages/cpp/app_templates/prc-tool/palmhello.c
+++ b/languages/cpp/app_templates/prc-tool/palmhello.c
@@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e)
 	break;
 
     case menuEvent:
-	MenuEraseStatus(NULL);
+	MenuErasetqStatus(NULL);
 
 	switch(e->data.menu.itemID) {
 	}
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
index f3c5f7f2..4b78645a 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
@@ -11,7 +11,7 @@
 #include <tqtextedit.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <tqstatusbar.h>
+#include <statusbar.h>
 #include <tqmessagebox.h>
 #include <tqprinter.h>
 #include <tqapplication.h>
@@ -36,17 +36,17 @@
 
     openIcon = TQPixmap( fileopen );
     TQToolButton * fileOpen
-	= new TQToolButton( openIcon, tr("Open File"), TQString::null,
+	= new TQToolButton( openIcon, tr("Open File"), TQString(),
 			   this, TQT_SLOT(choose()), fileTools, "open file" );
 
     saveIcon = TQPixmap( filesave );
     TQToolButton * fileSave
-	= new TQToolButton( saveIcon, tr("Save File"), TQString::null,
+	= new TQToolButton( saveIcon, tr("Save File"), TQString(),
 			   this, TQT_SLOT(save()), fileTools, "save file" );
 
     printIcon = TQPixmap( fileprint );
     TQToolButton * filePrint
-	= new TQToolButton( printIcon, tr("Print File"), TQString::null,
+	= new TQToolButton( printIcon, tr("Print File"), TQString(),
 			   this, TQT_SLOT(print()), fileTools, "print file" );
 
 
@@ -103,7 +103,7 @@
 
     file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W );
 
-    file->insertItem( tr("&Quit"), qApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     menuBar()->insertSeparator();
 
@@ -111,7 +111,7 @@
     menuBar()->insertItem( tr("&Help"), help );
 
     help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 );
-    help->insertItem( tr("About &Qt"), this, TQT_SLOT(aboutQt()) );
+    help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) );
     help->insertSeparator();
     help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
 
@@ -134,13 +134,13 @@
 void %{APPNAME}::newDoc()
 {
     %{APPNAME} *ed = new %{APPNAME};
-    ed->setCaption(tr("Qt Example - Application"));
+    ed->setCaption(tr("TQt Example - Application"));
     ed->show();
 }
 
 void %{APPNAME}::choose()
 {
-    TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null,
+    TQString fn = TQFileDialog::getOpenFileName( TQString(), TQString(),
 					       this);
     if ( !fn.isEmpty() )
 	load( fn );
@@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName )
     e->setText( ts.read() );
     e->setModified( FALSE );
     setCaption( fileName );
-    statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 );
+    statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 );
 }
 
 
@@ -173,7 +173,7 @@ void %{APPNAME}::save()
     TQString text = e->text();
     TQFile f( filename );
     if ( !f.open( IO_WriteOnly ) ) {
-	statusBar()->message( tr("Could not write to %1").arg(filename),
+	statusBar()->message( tr("Could not write to %1").tqarg(filename),
 			      2000 );
 	return;
     }
@@ -186,13 +186,13 @@ void %{APPNAME}::save()
 
     setCaption( filename );
 
-    statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 );
+    statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 );
 }
 
 
 void %{APPNAME}::saveAs()
 {
-    TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null,
+    TQString fn = TQFileDialog::getSaveFileName( TQString(), TQString(),
 					       this );
     if ( !fn.isEmpty() ) {
 	filename = fn;
@@ -249,7 +249,7 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce )
 	return;
     }
 
-    switch( TQMessageBox::information( this, tr("Qt Application Example"),
+    switch( TQMessageBox::information( this, tr("TQt Application Example"),
 				      tr("Do you want to save the changes"
 				      " to the document?"),
 				      tr("Yes"), tr("No"), tr("Cancel"),
@@ -271,13 +271,13 @@ void %{APPNAME}::closeEvent( TQCloseEvent* ce )
 
 void %{APPNAME}::about()
 {
-    TQMessageBox::about( this, tr("Qt Application Example"),
+    TQMessageBox::about( this, tr("TQt Application Example"),
 			tr("This example demonstrates simple use of "
-			"TQMainWindow,\nQMenuBar and TQToolBar."));
+			"TQMainWindow,\nTQMenuBar and TQToolBar."));
 }
 
 
-void %{APPNAME}::aboutQt()
+void %{APPNAME}::aboutTQt()
 {
-    TQMessageBox::aboutQt( this, tr("Qt Application Example") );
+    TQMessageBox::aboutTQt( this, tr("TQt Application Example") );
 }
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h
index af12e1eb..bc8a2b93 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h
@@ -7,9 +7,10 @@
 
 class TQTextEdit;
 
-class %{APPNAME}: public QMainWindow
+class %{APPNAME}: public TQMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     %{APPNAME}();
@@ -27,7 +28,7 @@ private slots:
     void print();
 
     void about();
-    void aboutQt();
+    void aboutTQt();
 
 private:
     TQPrinter *printer;
diff --git a/languages/cpp/app_templates/qt4hello/main.cpp b/languages/cpp/app_templates/qt4hello/main.cpp
index cbff1d3c..59ee17d7 100644
--- a/languages/cpp/app_templates/qt4hello/main.cpp
+++ b/languages/cpp/app_templates/qt4hello/main.cpp
@@ -1,11 +1,11 @@
 %{CPP_TEMPLATE}
 
-#include <QCoreApplication>
+#include <TQCoreApplication>
 
 int main(int argc, char *argv[])
 {
-      QCoreApplication app(argc, argv);
-      qDebug("Hello from Qt 4!");
+      TQCoreApplication app(argc, argv);
+      qDebug("Hello from TQt 4!");
       return 0;
 }
 
diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp
index 4f6295a2..55f24795 100644
--- a/languages/cpp/app_templates/qt4makeapp/main.cpp
+++ b/languages/cpp/app_templates/qt4makeapp/main.cpp
@@ -5,7 +5,7 @@
 
 int main(int argc, char *argv[])
 {
-      Q_INIT_RESOURCE(application);
+      TQ_INIT_RESOURCE(application);
       TQApplication app(argc, argv);
       %{APPNAME} * mw = new %{APPNAME}();
       mw->show();
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp
index cdf18174..f2178d9d 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp
@@ -1,6 +1,6 @@
 %{CPP_TEMPLATE}
 
-#include <QtGui>
+#include <TQtGui>
 #include "%{APPNAMELC}.h"
 
 #include <TQTextEdit>
@@ -75,7 +75,7 @@ void %{APPNAME}::about()
 {
       TQMessageBox::about(this, tr("About Application"),
             tr("The <b>Application</b> example demonstrates how to "
-                  "write modern GUI applications using Qt, with a menu bar, "
+                  "write modern GUI applications using TQt, with a menu bar, "
                   "toolbars, and a status bar."));
 }
 
@@ -86,17 +86,17 @@ void %{APPNAME}::documentWasModified()
 
 void %{APPNAME}::createActions()
 {
-      newAct = new TQAction(QIcon(":/filenew.xpm"), tr("&New"), this);
+      newAct = new TQAction(TQIcon(":/filenew.xpm"), tr("&New"), this);
       newAct->setShortcut(tr("Ctrl+N"));
       newAct->setStatusTip(tr("Create a new file"));
       connect(newAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(newFile()));
 
-      openAct = new TQAction(QIcon(":/fileopen.xpm"), tr("&Open..."), this);
+      openAct = new TQAction(TQIcon(":/fileopen.xpm"), tr("&Open..."), this);
       openAct->setShortcut(tr("Ctrl+O"));
       openAct->setStatusTip(tr("Open an existing file"));
       connect(openAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(open()));
 
-      saveAct = new TQAction(QIcon(":/filesave.xpm"), tr("&Save"), this);
+      saveAct = new TQAction(TQIcon(":/filesave.xpm"), tr("&Save"), this);
       saveAct->setShortcut(tr("Ctrl+S"));
       saveAct->setStatusTip(tr("Save the document to disk"));
       connect(saveAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(save()));
@@ -110,19 +110,19 @@ void %{APPNAME}::createActions()
       exitAct->setStatusTip(tr("Exit the application"));
       connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close()));
 
-      cutAct = new TQAction(QIcon(":/editcut.xpm"), tr("Cu&t"), this);
+      cutAct = new TQAction(TQIcon(":/editcut.xpm"), tr("Cu&t"), this);
       cutAct->setShortcut(tr("Ctrl+X"));
       cutAct->setStatusTip(tr("Cut the current selection's contents to the "
                               "clipboard"));
       connect(cutAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(cut()));
 
-      copyAct = new TQAction(QIcon(":/editcopy.xpm"), tr("&Copy"), this);
+      copyAct = new TQAction(TQIcon(":/editcopy.xpm"), tr("&Copy"), this);
       copyAct->setShortcut(tr("Ctrl+C"));
       copyAct->setStatusTip(tr("Copy the current selection's contents to the "
                               "clipboard"));
       connect(copyAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(copy()));
 
-      pasteAct = new TQAction(QIcon(":/editpaste.xpm"), tr("&Paste"), this);
+      pasteAct = new TQAction(TQIcon(":/editpaste.xpm"), tr("&Paste"), this);
       pasteAct->setShortcut(tr("Ctrl+V"));
       pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
                               "selection"));
@@ -132,9 +132,9 @@ void %{APPNAME}::createActions()
       aboutAct->setStatusTip(tr("Show the application's About box"));
       connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about()));
 
-      aboutQtAct = new TQAction(tr("About &Qt"), this);
-      aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
-      connect(aboutQtAct, TQT_SIGNAL(triggered()), qApp, TQT_SLOT(aboutQt()));
+      aboutTQtAct = new TQAction(tr("About &TQt"), this);
+      aboutTQtAct->setStatusTip(tr("Show the TQt library's About box"));
+      connect(aboutTQtAct, TQT_SIGNAL(triggered()), tqApp, TQT_SLOT(aboutTQt()));
 
       cutAct->setEnabled(false);
       copyAct->setEnabled(false);
@@ -163,7 +163,7 @@ void %{APPNAME}::createMenus()
 
       helpMenu = menuBar()->addMenu(tr("&Help"));
       helpMenu->addAction(aboutAct);
-      helpMenu->addAction(aboutQtAct);
+      helpMenu->addAction(aboutTQtAct);
 }
 
 void %{APPNAME}::createToolBars()
@@ -223,13 +223,13 @@ void %{APPNAME}::loadFile(const TQString &fileName)
       if (!file.open(TQFile::ReadOnly | TQFile::Text)) {
             TQMessageBox::warning(this, tr("Application"),
                               tr("Cannot read file %1:\n%2.")
-                              .arg(fileName)
-                              .arg(file.errorString()));
+                              .tqarg(fileName)
+                              .tqarg(file.errorString()));
             return;
       }
 
       TQTextStream in(&file);
-      TQApplication::setOverrideCursor(Qt::WaitCursor);
+      TQApplication::setOverrideCursor(TQt::WaitCursor);
       textEdit->setPlainText(in.readAll());
       TQApplication::restoreOverrideCursor();
 
@@ -243,13 +243,13 @@ bool %{APPNAME}::saveFile(const TQString &fileName)
       if (!file.open(TQFile::WriteOnly | TQFile::Text)) {
             TQMessageBox::warning(this, tr("Application"),
                               tr("Cannot write file %1:\n%2.")
-                              .arg(fileName)
-                              .arg(file.errorString()));
+                              .tqarg(fileName)
+                              .tqarg(file.errorString()));
             return false;
       }
 
       TQTextStream out(&file);
-      TQApplication::setOverrideCursor(Qt::WaitCursor);
+      TQApplication::setOverrideCursor(TQt::WaitCursor);
       out << textEdit->toPlainText();
       TQApplication::restoreOverrideCursor();
 
@@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName)
       else
             shownName = strippedName(curFile);
 
-      setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application")));
+      setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application")));
 }
 
 TQString %{APPNAME}::strippedName(const TQString &fullFileName)
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h
index 14a40d99..65402c85 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h
@@ -7,12 +7,13 @@
 #include <TQCloseEvent>
 
 class TQAction;
-class QMenu;
+class TQMenu;
 class TQTextEdit;
 
-class %{APPNAME}:public QMainWindow
+class %{APPNAME}:public TQMainWindow
 {
       Q_OBJECT
+  TQ_OBJECT
 
 public:
       %{APPNAME}();
@@ -45,9 +46,9 @@ private:
       TQTextEdit *textEdit;
       TQString curFile;
 
-      QMenu *fileMenu;
-      QMenu *editMenu;
-      QMenu *helpMenu;
+      TQMenu *fileMenu;
+      TQMenu *editMenu;
+      TQMenu *helpMenu;
       TQToolBar *fileToolBar;
       TQToolBar *editToolBar;
       TQAction *newAct;
@@ -59,7 +60,7 @@ private:
       TQAction *copyAct;
       TQAction *pasteAct;
       TQAction *aboutAct;
-      TQAction *aboutQtAct;
+      TQAction *aboutTQtAct;
 };
 
 #endif
diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp
index 45331649..12c3f634 100644
--- a/languages/cpp/app_templates/qtopia4app/example.cpp
+++ b/languages/cpp/app_templates/qtopia4app/example.cpp
@@ -2,8 +2,8 @@
 #include "%{APPNAMELC}.h"
 #include <tqpushbutton.h>
 
-%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, Qt::WFlags f )
-    : TQWidget( parent, f )
+%{APPNAME}Base::%{APPNAME}Base( TQWidget *tqparent, TQt::WFlags f )
+    : TQWidget( tqparent, f )
 {
     setupUi( this );
 }
@@ -13,11 +13,11 @@
 }
 
 /* 
- *  Constructs a %{APPNAME} which is a child of 'parent', with the 
+ *  Constructs a %{APPNAME} which is a child of 'tqparent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-%{APPNAME}::%{APPNAME}( TQWidget *parent, Qt::WFlags f )
-    : %{APPNAME}Base( parent, f )
+%{APPNAME}::%{APPNAME}( TQWidget *tqparent, TQt::WFlags f )
+    : %{APPNAME}Base( tqparent, f )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
@@ -27,7 +27,7 @@
  */
 %{APPNAME}::~%{APPNAME}()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /*
diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h
index 5bfc69ba..e4c44a8f 100644
--- a/languages/cpp/app_templates/qtopia4app/example.h
+++ b/languages/cpp/app_templates/qtopia4app/example.h
@@ -6,15 +6,16 @@
 class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base
 {
 public:
-    %{APPNAME}Base( TQWidget *parent = 0, Qt::WFlags f = 0 );
+    %{APPNAME}Base( TQWidget *tqparent = 0, TQt::WFlags f = 0 );
     virtual ~%{APPNAME}Base();
 };
 
 class %{APPNAME} : public %{APPNAME}Base
 { 
     Q_OBJECT
+  TQ_OBJECT
 public:
-    %{APPNAME}( TQWidget *parent = 0, Qt::WFlags f = 0 );
+    %{APPNAME}( TQWidget *tqparent = 0, TQt::WFlags f = 0 );
     virtual ~%{APPNAME}();
 
 private slots:
diff --git a/languages/cpp/app_templates/qtopia4app/example.html b/languages/cpp/app_templates/qtopia4app/example.html
index 279a6106..9bcae99d 100644
--- a/languages/cpp/app_templates/qtopia4app/example.html
+++ b/languages/cpp/app_templates/qtopia4app/example.html
@@ -6,10 +6,10 @@
 <p>To user this application:
 
 <ol>
- <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the Qtopia launcher.
+ <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher.
  <li>Read the label.
  <li>Press the button.
  <li>Read the source code provided.
 </ol>
 
-Now you know how to make a Qtopia application!
+Now you know how to make a TQtopia application!
diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui
index 17d6bc20..76e7d49f 100644
--- a/languages/cpp/app_templates/qtopia4app/examplebase.ui
+++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui
@@ -3,7 +3,7 @@
   <comment></comment>
   <exportmacro></exportmacro>
   <class>%{APPNAME}Base</class>
-  <widget class="QWidget" name="%{APPNAME}Base" >
+  <widget class="TQWidget" name="%{APPNAME}Base" >
     <property name="geometry" >
       <rect>
         <x>0</x>
@@ -15,7 +15,7 @@
     <property name="windowTitle" >
       <string>%{APPNAME}</string>
     </property>
-    <layout class="QVBoxLayout" >
+    <tqlayout class="TQVBoxLayout" >
       <property name="margin" >
         <number>11</number>
       </property>
@@ -23,7 +23,7 @@
         <number>6</number>
       </property>
       <item>
-        <widget class="QLabel" name="TextLabel1" >
+        <widget class="TQLabel" name="TextLabel1" >
           <property name="text" >
             <string>This is just an %{APPNAME}. It doesn't do anything interesting at all.</string>
           </property>
@@ -33,12 +33,12 @@
         </widget>
       </item>
       <item>
-        <widget class="QPushButton" name="quit" >
+        <widget class="TQPushButton" name="quit" >
           <property name="text" >
             <string>Quit</string>
           </property>
         </widget>
       </item>
-    </layout>
+    </tqlayout>
   </widget>
 </ui>
diff --git a/languages/cpp/app_templates/qtopia4app/main.cpp b/languages/cpp/app_templates/qtopia4app/main.cpp
index 43dbb4ac..b4ccc5ca 100644
--- a/languages/cpp/app_templates/qtopia4app/main.cpp
+++ b/languages/cpp/app_templates/qtopia4app/main.cpp
@@ -1,7 +1,7 @@
 
 #include "%{APPNAMELC}.h"
-#include <qtopia/qtopiaapplication.h>
+#include <tqtopia/tqtopiaapplication.h>
 
-QTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME})
-QTOPIA_MAIN
+TQTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME})
+TQTOPIA_MAIN
 
diff --git a/languages/cpp/app_templates/qtopiaapp/example.control b/languages/cpp/app_templates/qtopiaapp/example.control
index d04f87ec..666968a3 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.control
+++ b/languages/cpp/app_templates/qtopiaapp/example.control
@@ -7,5 +7,5 @@ Arch: $DEVICE_ARCH
 Version: 1.0.0
 License: Public Domain
 Description: %{APPNAME} program
- An %{APPNAMELC} program for the Qtopia environment.
+ An %{APPNAMELC} program for the TQtopia environment.
  Does nothing interesting.
diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp
index a849977d..85082508 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.cpp
+++ b/languages/cpp/app_templates/qtopiaapp/example.cpp
@@ -3,11 +3,11 @@
 #include <tqpushbutton.h>
 
 /*
- *  Constructs a %{APPNAME} which is a child of 'parent', with the
+ *  Constructs a %{APPNAME} which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  */
-%{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
-    : %{APPNAME}Base( parent, name, fl )
+%{APPNAME}::%{APPNAME}( TQWidget* tqparent,  const char* name, WFlags fl )
+    : %{APPNAME}Base( tqparent, name, fl )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
@@ -17,7 +17,7 @@
  */
 %{APPNAME}::~%{APPNAME}()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /*
diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h
index 42dfc2dd..64abf97c 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.h
+++ b/languages/cpp/app_templates/qtopiaapp/example.h
@@ -6,9 +6,10 @@
 class %{APPNAME} : public %{APPNAME}Base
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}();
 
 private slots:
diff --git a/languages/cpp/app_templates/qtopiaapp/example.html b/languages/cpp/app_templates/qtopiaapp/example.html
index 279a6106..9bcae99d 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.html
+++ b/languages/cpp/app_templates/qtopiaapp/example.html
@@ -6,10 +6,10 @@
 <p>To user this application:
 
 <ol>
- <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the Qtopia launcher.
+ <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher.
  <li>Read the label.
  <li>Press the button.
  <li>Read the source code provided.
 </ol>
 
-Now you know how to make a Qtopia application!
+Now you know how to make a TQtopia application!
diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
index b6b81b11..1243c341 100644
--- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui
+++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
@@ -7,7 +7,7 @@
         <cstring>%{APPNAME}Base</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/qtopiaapp/main.cpp b/languages/cpp/app_templates/qtopiaapp/main.cpp
index 0311a32e..ce7161b1 100644
--- a/languages/cpp/app_templates/qtopiaapp/main.cpp
+++ b/languages/cpp/app_templates/qtopiaapp/main.cpp
@@ -1,10 +1,10 @@
 
 #include "%{APPNAMELC}.h"
-#include <qpe/qpeapplication.h>
+#include <tqpe/tqpeapplication.h>
 
 int main( int argc, char ** argv )
 {
-    QPEApplication a( argc, argv );
+    TQPEApplication a( argc, argv );
 
     %{APPNAME} mw;
     a.showMainWidget( &mw );
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index a6ef1a2b..4c9d63d1 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -40,8 +40,8 @@ AST* findNodeAt( AST* node, int line, int column )
 	     ( line < endLine || ( line == endLine && column < endColumn ) ) )
 	{
 		
-		TQPtrList<AST> children = node->children();
-		TQPtrListIterator<AST> it( children );
+		TQPtrList<AST> tqchildren = node->tqchildren();
+		TQPtrListIterator<AST> it( tqchildren );
 		while ( it.current() )
 		{
 			AST * a = it.current();
@@ -63,8 +63,8 @@ void scopeOfNode( AST* ast, TQStringList& scope )
 	if ( !ast )
 		return ;
 	
-	if ( ast->parent() )
-		scopeOfNode( ast->parent(), scope );
+	if ( ast->tqparent() )
+		scopeOfNode( ast->tqparent(), scope );
 	
 	TQString s;
 	switch ( ast->nodeType() )
@@ -73,7 +73,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
 		if ( ( ( ClassSpecifierAST* ) ast ) ->name() )
 		{
 			s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text();
-			s = s.isEmpty() ? TQString::fromLatin1( "<unnamed>" ) : s;
+			s = s.isEmpty() ? TQString::tqfromLatin1( "<unnamed>" ) : s;
 			scope.push_back( s );
 		}
 		break;
@@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
 	case NodeType_Namespace:
 		{
 			AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName();
-			s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "<unnamed>" );
+			s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1( "<unnamed>" );
 			scope.push_back( s );
 		}
 		break;
@@ -116,15 +116,15 @@ void scopeOfNode( AST* ast, TQStringList& scope )
 TQString typeSpecToString( TypeSpecifierAST* typeSpec )   /// @todo remove
 {
 	if ( !typeSpec )
-		return TQString::null;
+		return TQString();
 	
-	return typeSpec->text().replace( TQRegExp( " :: " ), "::" );
+	return typeSpec->text().tqreplace( TQRegExp( " :: " ), "::" );
 }
 
 TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp )
 {
 	if ( !declarator )
-		return TQString::null;
+		return TQString();
 	
 	TQString text;
 	
@@ -141,7 +141,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
 	text += scope;
 	
 	if ( declarator->subDeclarator() )
-		text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" );
+		text += TQString::tqfromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::tqfromLatin1( ")" );
 	
 	if ( declarator->declaratorId() )
 		text += declarator->declaratorId() ->text();
@@ -185,6 +185,6 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
 			text += " const";
 	}
 
-	return text.replace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace();
+	return text.tqreplace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace();
 }
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/ast_utils.h b/languages/cpp/ast_utils.h
index 7e6d44e3..a960abad 100644
--- a/languages/cpp/ast_utils.h
+++ b/languages/cpp/ast_utils.h
@@ -27,7 +27,7 @@ namespace KTextEditor
 AST* findNodeAt( AST* unit, int line, int column );
 void scopeOfNode( AST* ast, TQStringList& );
 TQString typeSpecToString( TypeSpecifierAST* typeSpec );
-TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString::null, bool skipPtrOp = false );
+TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString(), bool skipPtrOp = false );
 
 #endif // __ast_utils_h 
 // kate: indent-mode csands; tab-width 4;
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index d3f9c2ee..4e22dcc7 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -53,7 +53,7 @@ private:
 class KDevSourceProvider: public SourceProvider
 {
 public:
-	//Deadlock is a mutex that is locked when KDevSourceProvider::contents(..) is used, and that should be unlocked before TQApplication is locked(that way a deadlock where the thread that holds the QApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the QApplication-mutex, cannot happen)
+	//Deadlock is a mutex that is locked when KDevSourceProvider::contents(..) is used, and that should be unlocked before TQApplication is locked(that way a deadlock where the thread that holds the TQApplication-mutex and tries to lock the given mutex, while the thread that calls contents(..) and holds the given mutex and tries to lock the TQApplication-mutex, cannot happen)
 	KDevSourceProvider( CppSupportPart* cppSupport, TQMutex& deadlock )
 		: m_cppSupport( cppSupport ),
 		m_readFromDisk( false ),
@@ -71,7 +71,7 @@ public:
 	
 	virtual TQString contents( const TQString& fileName )
 	{
-		TQString contents = TQString::null;
+		TQString contents = TQString();
 		
 		if ( !m_readFromDisk )
 		{
@@ -105,7 +105,7 @@ public:
 			//kdDebug(9007) << "-------> kapp unlocked" << endl;
 		}
 		
-		if( m_readFromDisk || contents == TQString::null )
+		if( m_readFromDisk || contents == TQString() )
 		{
 			TQFile f( fileName );
 			if ( f.open( IO_ReadOnly ) )
@@ -149,7 +149,7 @@ typedef std::string SafeString;
 
 class SynchronizedFileList
 {
-  typedef std::list< QPair<SafeString, bool> > ListType;
+  typedef std::list< TQPair<SafeString, bool> > ListType;
 public:
 	SynchronizedFileList()
 	{}
@@ -166,7 +166,7 @@ public:
 		return m_fileList.size();
 	}
 	
-	QPair<SafeString, bool> front() const
+	TQPair<SafeString, bool> front() const
 	{
 		TQMutexLocker locker( &m_mutex );
 		return m_fileList.front();
@@ -182,14 +182,14 @@ public:
 	{
 		SafeString s( fileName.ascii() );
 		TQMutexLocker locker( &m_mutex );
-		m_fileList.push_front( qMakePair( s, readFromDisk ) );
+		m_fileList.push_front( tqMakePair( s, readFromDisk ) );
 	}
 
 	void push_back( const TQString& fileName, bool readFromDisk = false )
 	{
 	        SafeString s( fileName.ascii() );
 		TQMutexLocker locker( &m_mutex );
-		m_fileList.push_back( qMakePair( s, readFromDisk ) );
+		m_fileList.push_back( tqMakePair( s, readFromDisk ) );
 	}
 	
 	void pop_front()
@@ -212,15 +212,15 @@ public:
 		return c;
 	}
 
-  QPair<SafeString, bool> takeFront()
+  TQPair<SafeString, bool> takeFront()
   {
     TQMutexLocker locker( &m_mutex );
-    QPair<SafeString, bool> ret = m_fileList.front();
+    TQPair<SafeString, bool> ret = m_fileList.front();
     m_fileList.pop_front();
     return ret;
   }
 	
-	bool contains( const TQString& fileName ) const
+	bool tqcontains( const TQString& fileName ) const
 	{
 		TQMutexLocker locker( &m_mutex );
 		ListType::const_iterator it = m_fileList.begin();
@@ -283,7 +283,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk )
 	TQString fn = deepCopy( fileName );
 	
   //bool added = false;
-	/*if ( !m_fileList->contains( fn ) )
+	/*if ( !m_fileList->tqcontains( fn ) )
 	{
 		m_fileList->push_back( fn, readFromDisk );
 		added = true;
@@ -299,7 +299,7 @@ void BackgroundParser::addFileFront( const TQString& fileName, bool readFromDisk
 	TQString fn = deepCopy( fileName );
 	
 	bool added = false;
-	/*if ( m_fileList->contains( fn ) )
+	/*if ( m_fileList->tqcontains( fn ) )
 		m_fileList->remove( fn );*/
 
 	m_fileList->push_front( fn, readFromDisk );
@@ -387,15 +387,15 @@ void BackgroundParser::fileParsed( ParsedFile& file ) {
 	ParsedFilePointer translationUnitUnsafe = m_driver->takeTranslationUnit( file.fileName() );
 	//now file and translationUnitUnsafe are the same
 	ParsedFilePointer translationUnit;
-	//Since the lexer-cache keeps many QStrings like macro-names used in the background, everything must be copied here. The safest solution is just
+	//Since the lexer-cache keeps many TQStrings like macro-names used in the background, everything must be copied here. The safest solution is just
 	//serializing and deserializing the whole thing(the serialization does not respect the AST, but that can be copied later because that's safe)
 	TQMemArray<char> data;
 	{
-	  TQDataStream stream( data, IO_WriteOnly );
+		TQDataStream stream( TQByteArray(data), IO_WriteOnly );
 	  translationUnitUnsafe->write( stream );
 	}
 	{
-	  TQDataStream stream( data, IO_ReadOnly );
+		TQDataStream stream( TQByteArray(data), IO_ReadOnly );
 	  translationUnit = new ParsedFile( stream );
 	}
 
@@ -410,7 +410,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) {
 	
 	static_cast<KDevSourceProvider*>( m_driver->sourceProvider() ) ->setReadFromDisk( false );
 	
-	if ( m_unitDict.find( file.fileName() ) != m_unitDict.end() )
+	if ( m_unitDict.tqfind( file.fileName() ) != m_unitDict.end() )
 	{
 		Unit * u = m_unitDict[ file.fileName() ];
 		m_unitDict.remove( file.fileName() );
@@ -422,7 +422,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) {
 	
 	KApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) );
 	
-	m_currentFile = TQString::null;
+	m_currentFile = TQString();
 	
   if ( m_fileList->isEmpty() )
 		m_isEmpty.wakeAll();	
@@ -430,12 +430,12 @@ void BackgroundParser::fileParsed( ParsedFile& file ) {
 
 Unit* BackgroundParser::findUnit( const TQString& fileName )
 {
-	TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName );
+	TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName );
 	return it != m_unitDict.end() ? *it : 0;
 }
 
 bool BackgroundParser::hasTranslationUnit( const TQString& fileName ) {
-	TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName );
+	TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName );
 	return it != m_unitDict.end();
 }
 
@@ -526,7 +526,7 @@ void BackgroundParser::run()
 		if ( m_close )
 			break;
 		
-		QPair<SafeString, bool> entry = m_fileList->takeFront();
+		TQPair<SafeString, bool> entry = m_fileList->takeFront();
 		TQString fileName = entry.first.c_str();
 		bool readFromDisk = entry.second;
 		m_currentFile = deepCopy(fileName);
@@ -534,7 +534,7 @@ void BackgroundParser::run()
 		( void ) parseFile( fileName, readFromDisk, true );
 
 		
-		m_currentFile = TQString::null;
+		m_currentFile = TQString();
 	}
 	
 	kdDebug( 9007 ) << "!!!!!!!!!!!!!!!!!! BG PARSER DESTROYED !!!!!!!!!!!!" << endl;
diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h
index 6bbec3fc..f3cd86fd 100644
--- a/languages/cpp/backgroundparser.h
+++ b/languages/cpp/backgroundparser.h
@@ -44,7 +44,7 @@ protected:
 	void operator = ( const Unit& source );
 };
 
-class BackgroundParser: public QThread
+class BackgroundParser: public TQThread
 {
 public:
 	BackgroundParser( CppSupportPart*, TQWaitCondition* consumed );
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 44ce91c2..f3400a28 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -60,8 +60,8 @@
 using namespace std;
 
 
-CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const char* name )
-		: CCConfigWidgetBase( parent, name )
+CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* tqparent, const char* name )
+		: CCConfigWidgetBase( tqparent, name )
 {
 	m_pPart = part;
 	connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ),
@@ -70,12 +70,12 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch
 	         this, TQT_SLOT( catalogUnregistered( Catalog* ) ) );
 
 	connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)),
-		 this, TQT_SLOT(isValidQtDir(const TQString &)));
+		 this, TQT_SLOT(isValidTQtDir(const TQString &)));
 	connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)),
-		 this, TQT_SLOT(isValidQtDir(const TQString &)));
+		 this, TQT_SLOT(isValidTQtDir(const TQString &)));
 
 	initGeneralTab( );
-	initQtTab();
+	initTQtTab();
 	initCodeCompletionTab( );
 	initGetterSetterTab( );
 	initSplitTab();
@@ -104,7 +104,7 @@ CCConfigWidget::~CCConfigWidget( )
 void CCConfigWidget::accept( )
 {
 	saveFileTemplatesTab();
-	saveQtTab();
+	saveTQtTab();
 	saveCodeCompletionTab();
 	saveGetterSetterTab();
 	saveSplitTab();
@@ -230,7 +230,7 @@ void CCConfigWidget::slotRemovePCS()
 		return ;
 
 	TQString db = advancedOptions->selectedItem() ->text( 0 );
-	TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db );
+	TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).tqarg( db );
 
 	KStandardDirs *dirs = m_pPart->instance() ->dirs();
 	TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db";
@@ -314,7 +314,7 @@ void CCConfigWidget::slotGetterSetterValuesChanged( )
 		m_edtExampleSet->setPaletteForegroundColor( TQColor( "black" ) );
 	}
 
-	TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) );
+	TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().tqreplace( " ", "" ) );
 	unsigned int len = 0;
 	TQStringList::ConstIterator theend = prefixes.end();
 	for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci )
@@ -355,7 +355,7 @@ void CCConfigWidget::saveGetterSetterTab( )
 
 	config->setPrefixGet( m_edtGet->text() );
 	config->setPrefixSet( m_edtSet->text() );
-	config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) );
+	config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().tqreplace( " ", "" ) ) );
 	config->setParameterName( m_edtParameterName->text() );
 	config->store();
 }
@@ -393,11 +393,11 @@ void CCConfigWidget::saveSplitTab( )
 	config->store();
 }
 
-void CCConfigWidget::initQtTab()
+void CCConfigWidget::initTQtTab()
 {
 	m_qtDir->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 
-	QtBuildConfig* c = m_pPart->qtBuildConfig();
+	TQtBuildConfig* c = m_pPart->qtBuildConfig();
 	c->init();
 
 	m_qtUsed->setChecked( c->isUsed() );
@@ -435,7 +435,7 @@ void CCConfigWidget::initQtTab()
 		m_qtStyleVersion3->setChecked( true );
 	}
 	m_qtDir->setURL( c->root() );
-	isValidQtDir(m_qtDir->url());
+	isValidTQtDir(m_qtDir->url());
     m_qmakePath->setURL( c->qmakePath() );
     isExecutable( m_qmakePath->url() );
     m_designerPath->setURL( c->designerPath() );
@@ -460,7 +460,7 @@ bool CCConfigWidget::isExecutable( const TQString& path )
     return ( fi.exists() && fi.isExecutable()  );
 }
 
-void CCConfigWidget::isQMakeExecutable( const TQString& path )
+void CCConfigWidget::isTQMakeExecutable( const TQString& path )
 {
     if( !isExecutable( path ) )
     {
@@ -482,9 +482,9 @@ void CCConfigWidget::isDesignerExecutable( const TQString& path )
     }
 }
 
-void CCConfigWidget::saveQtTab()
+void CCConfigWidget::saveTQtTab()
 {
-	QtBuildConfig* c = m_pPart->qtBuildConfig();
+	TQtBuildConfig* c = m_pPart->qtBuildConfig();
 
 	c->setUsed( m_qtUsed->isChecked() );
 	if( m_versionQt4->isChecked() )
@@ -503,7 +503,7 @@ void CCConfigWidget::saveQtTab()
 		c->setIncludeStyle( 3 );
 	}
 	c->setRoot( m_qtDir->url() );
-    c->setQMakePath( m_qmakePath->url() );
+    c->setTQMakePath( m_qmakePath->url() );
     c->setDesignerPath( m_designerPath->url() );
 	if( m_kdevembedded->isChecked() )
 	{
@@ -519,7 +519,7 @@ void CCConfigWidget::saveQtTab()
 	c->store();
 }
 
-void CCConfigWidget::isValidQtDir( const TQString &dir )
+void CCConfigWidget::isValidTQtDir( const TQString &dir )
 {
 	TQFileInfo inc( dir + TQString( TQChar( TQDir::separator() ) )+
 			"include"+TQString( TQChar( TQDir::separator() ) )+
@@ -533,7 +533,7 @@ void CCConfigWidget::isValidQtDir( const TQString &dir )
 	}
 }
 
-void CCConfigWidget::toggleQtVersion( bool )
+void CCConfigWidget::toggleTQtVersion( bool )
 {
   if ( m_versionQt3->isChecked() )
   {
@@ -551,17 +551,17 @@ void CCConfigWidget::toggleQtVersion( bool )
     m_kdevexternal->setEnabled( false );
     pluginPaths->setEnabled( true );
   }
-  isValidQtDir( m_qtDir->url() );
-  isQMakeExecutable( m_qmakePath->url() );
+  isValidTQtDir( m_qtDir->url() );
+  isTQMakeExecutable( m_qmakePath->url() );
   isDesignerExecutable( m_designerPath->url() );
 }
 
 void CCConfigWidget::openPluginPaths()
 {
     kdDebug(9024) << "Plugin paths opened" << endl;
-    QtBuildConfig* c = m_pPart->qtBuildConfig();
+    TQtBuildConfig* c = m_pPart->qtBuildConfig();
     KDialog d( this );
-    TQVBoxLayout* mainlayout = new TQVBoxLayout( &d );
+    TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d );
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
     connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept()));
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d );
@@ -571,13 +571,13 @@ void CCConfigWidget::openPluginPaths()
     btns->addWidget(ok);
     btns->addWidget(cancel);
 
-    d.setCaption( i18n( "Edit Qt4 Designer Plugin Paths" ) );
+    d.setCaption( i18n( "Edit TQt4 Designer Plugin Paths" ) );
     KURLRequester * req = new KURLRequester( &d );
     req->setMode( KFile::Directory );
     KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d );
     p->insertStringList( c->designerPluginPaths() );
-    mainlayout->addWidget( p );
-    mainlayout->addLayout( btns );
+    maintqlayout->addWidget( p );
+    maintqlayout->addLayout( btns );
     d.resize( 450, 250 );
     if( d.exec() == TQDialog::Accepted)
     {
diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h
index ea6c6d4a..3cf2f89b 100644
--- a/languages/cpp/ccconfigwidget.h
+++ b/languages/cpp/ccconfigwidget.h
@@ -23,9 +23,10 @@ class KEditListBox;
 class CCConfigWidget : public CCConfigWidgetBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	CCConfigWidget( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 );
+	CCConfigWidget( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 );
 	virtual ~CCConfigWidget( );
 
 public slots:
@@ -39,10 +40,10 @@ protected slots:
 private slots:
 	void catalogRegistered( Catalog* c );
 	void catalogUnregistered( Catalog* c );
-	void isValidQtDir( const TQString & );
+	void isValidTQtDir( const TQString & );
     void isDesignerExecutable( const TQString& );
-    void isQMakeExecutable( const TQString& );
-    void toggleQtVersion( bool );
+    void isTQMakeExecutable( const TQString& );
+    void toggleTQtVersion( bool );
     void openPluginPaths( );
 
 private:
@@ -51,8 +52,8 @@ private:
 	void initGeneralTab();
 	void saveFileTemplatesTab();
 
-	void initQtTab();
-	void saveQtTab();
+	void initTQtTab();
+	void saveTQtTab();
 
 	void initCodeCompletionTab();
 	void saveCodeCompletionTab();
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index b7efc7d0..5b7e5aa5 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CCConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CCConfigWidgetBase</cstring>
     </property>
@@ -19,11 +19,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>cpp_options</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>codeCompletionPage</cstring>
                 </property>
@@ -34,15 +34,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox4</cstring>
                                 </property>
@@ -53,7 +53,7 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkAutomaticCodeCompletion</cstring>
                                         </property>
@@ -75,9 +75,9 @@
                                             <string>Offer options to complete what you are typing.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout13</cstring>
+                                            <cstring>tqlayout13</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -93,7 +93,7 @@
                                                 <property name="sizeType">
                                                     <enum>Fixed</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>30</width>
                                                         <height>20</height>
@@ -116,7 +116,7 @@
                                                     <string>How long after a key press to offer suggestions</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>textLabel1</cstring>
                                                 </property>
@@ -134,7 +134,7 @@
                                             </widget>
                                         </hbox>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkListGlobalItems</cstring>
                                         </property>
@@ -161,7 +161,7 @@ This may bloat the completion-list
 and create a significant delay.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkCompleteReturnType</cstring>
                                         </property>
@@ -183,7 +183,7 @@ of member-functions) in the
 completion-box.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkCompleteArgumentType</cstring>
                                         </property>
@@ -203,7 +203,7 @@ completion-box.</string>
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox8_2</cstring>
                                 </property>
@@ -214,7 +214,7 @@ completion-box.</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkAutomaticArgumentsHint</cstring>
                                         </property>
@@ -225,9 +225,9 @@ completion-box.</string>
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout14</cstring>
+                                            <cstring>tqlayout14</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -243,7 +243,7 @@ completion-box.</string>
                                                 <property name="sizeType">
                                                     <enum>Fixed</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>30</width>
                                                         <height>20</height>
@@ -263,7 +263,7 @@ completion-box.</string>
                                                     </sizepolicy>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>textLabel1_2</cstring>
                                                 </property>
@@ -281,7 +281,7 @@ completion-box.</string>
                                             </widget>
                                         </hbox>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>checkShowCommentInArgumentHint</cstring>
                                         </property>
@@ -297,15 +297,15 @@ argument hint</string>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout12</cstring>
+                            <cstring>tqlayout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QButtonGroup">
+                            <widget class="TQButtonGroup">
                                 <property name="name">
                                     <cstring>buttonGroup6</cstring>
                                 </property>
@@ -316,7 +316,7 @@ argument hint</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton" row="0" column="0">
+                                    <widget class="TQRadioButton" row="0" column="0">
                                         <property name="name">
                                             <cstring>radioButton13</cstring>
                                         </property>
@@ -327,7 +327,7 @@ argument hint</string>
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton" row="2" column="0">
+                                    <widget class="TQRadioButton" row="2" column="0">
                                         <property name="name">
                                             <cstring>checkParseMissingHeaders</cstring>
                                         </property>
@@ -341,7 +341,7 @@ into a special completion-database. To reparse the headers delete
 the database and reopen the project.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton" row="1" column="0">
+                                    <widget class="TQRadioButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>checkPreprocessIncludedHeaders</cstring>
                                         </property>
@@ -359,7 +359,7 @@ Note: Parsing may become very slow when this is enabled
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox5</cstring>
                                 </property>
@@ -373,7 +373,7 @@ Note: Parsing may become very slow when this is enabled
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QListView">
+                                    <widget class="TQListView">
                                         <column>
                                             <property name="text">
                                                 <string>Column 1</string>
@@ -395,9 +395,9 @@ Note: Parsing may become very slow when this is enabled
                                             <enum>LastColumn</enum>
                                         </property>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout6</cstring>
+                                            <cstring>tqlayout6</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -413,14 +413,14 @@ Note: Parsing may become very slow when this is enabled
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>31</height>
                                                     </size>
                                                 </property>
                                             </spacer>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>newPCSButton</cstring>
                                                 </property>
@@ -431,7 +431,7 @@ Note: Parsing may become very slow when this is enabled
                                                     <string>Click to start the Code Completion database creation wizard.</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>removePCSButton</cstring>
                                                 </property>
@@ -449,7 +449,7 @@ Note: Parsing may become very slow when this is enabled
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>31</height>
@@ -462,7 +462,7 @@ Note: Parsing may become very slow when this is enabled
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox9_2</cstring>
                         </property>
@@ -473,7 +473,7 @@ Note: Parsing may become very slow when this is enabled
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>checkResolveIncludePaths</cstring>
                                 </property>
@@ -496,7 +496,7 @@ This also works with cmake, and maybe some other build-systems that build on mak
 The project needs to be compiled or at least configured before this system may work.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>checkShowTypeEvaluationInStatusBar</cstring>
                                 </property>
@@ -530,7 +530,7 @@ example: "std&lt;&lt;_GLIBCXX_STD;NewNamespaceName=OldNamespaceName; &lt;&lt; So
 if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_6</cstring>
                                 </property>
@@ -538,7 +538,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                                     <string>Custom include paths:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_3</cstring>
                                 </property>
@@ -558,7 +558,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -567,7 +567,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>navigationTab</cstring>
                 </property>
@@ -578,7 +578,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox12</cstring>
                         </property>
@@ -589,7 +589,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>m_splitEnable</cstring>
                                 </property>
@@ -603,15 +603,15 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                                     <string>Check to have header and source appear in the same page.</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout6</cstring>
+                                    <cstring>tqlayout6</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>m_splitSync</cstring>
                                         </property>
@@ -632,7 +632,7 @@ navigate the header and vice versa</string>
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="QButtonGroup">
+                            <widget class="TQButtonGroup">
                                 <property name="name">
                                     <cstring>m_splitOrientationBox</cstring>
                                 </property>
@@ -640,7 +640,7 @@ navigate the header and vice versa</string>
                                     <bool>false</bool>
                                 </property>
                                 <property name="title">
-                                    <string>Orientation</string>
+                                    <string>Qt::Orientation</string>
                                 </property>
                                 <property name="exclusive">
                                     <bool>true</bool>
@@ -652,7 +652,7 @@ navigate the header and vice versa</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_splitVertical</cstring>
                                         </property>
@@ -666,7 +666,7 @@ navigate the header and vice versa</string>
                                             <string>Select this if your project is using Qt version 3.x.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_splitHorizontal</cstring>
                                         </property>
@@ -691,14 +691,14 @@ navigate the header and vice versa</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>400</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox21</cstring>
                         </property>
@@ -709,7 +709,7 @@ navigate the header and vice versa</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>m_switchShouldMatch</cstring>
                                 </property>
@@ -732,7 +732,7 @@ cursor with the matching declaration/definition.
 </string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>m_showContextMenuExplosion</cstring>
                                 </property>
@@ -754,7 +754,7 @@ for the current file and its matching
 header/implementation file.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBox18</cstring>
                                 </property>
@@ -776,7 +776,7 @@ plugin enabled to have use all options.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>classWizardPage</cstring>
                 </property>
@@ -787,7 +787,7 @@ plugin enabled to have use all options.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>options</cstring>
                         </property>
@@ -819,7 +819,7 @@ plugin enabled to have use all options.</string>
                                     <cstring>implementation_suffix</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel3</cstring>
                                 </property>
@@ -830,7 +830,7 @@ plugin enabled to have use all options.</string>
                                     <cstring>interface_suffix</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel4</cstring>
                                 </property>
@@ -853,7 +853,7 @@ plugin enabled to have use all options.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>337</height>
@@ -862,7 +862,7 @@ plugin enabled to have use all options.</string>
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>qtPage</cstring>
                 </property>
@@ -873,7 +873,7 @@ plugin enabled to have use all options.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>m_qtUsed</cstring>
                         </property>
@@ -881,7 +881,7 @@ plugin enabled to have use all options.</string>
                             <string>Enable Qt opt&amp;ions</string>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>m_qtVersionDirectoryBox</cstring>
                         </property>
@@ -903,15 +903,15 @@ This option only applies to QMake projects.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_versionQt3</cstring>
                                         </property>
@@ -928,7 +928,7 @@ This option only applies to QMake projects.</string>
                                             <string>Select this if your project is using Qt version 3.x.&lt;br&gt;When this is changed the project needs to be closed and re-opened.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_versionQt4</cstring>
                                         </property>
@@ -942,14 +942,14 @@ This option only applies to QMake projects.</string>
                                             <string>Select this if your project is using Qt version 4.x.&lt;br&gt;When this is changed the project needs to be closed and re-opened.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>textLabel1_5</cstring>
                                         </property>
                                         <property name="text">
                                             <string>(After changing the project needs to be re-opened)</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter</set>
                                         </property>
                                     </widget>
@@ -963,7 +963,7 @@ This option only applies to QMake projects.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>470</width>
                                                 <height>20</height>
@@ -972,15 +972,15 @@ This option only applies to QMake projects.</string>
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>m_txtQtDir</cstring>
                                         </property>
@@ -1004,15 +1004,15 @@ This option only applies to QMake projects.</string>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout8</cstring>
+                                    <cstring>tqlayout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>m_txtQMake</cstring>
                                         </property>
@@ -1032,7 +1032,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>m_qtStyleBox</cstring>
                         </property>
@@ -1052,7 +1052,7 @@ This option only applies to QMake projects.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>m_qtStyleVersion3</cstring>
                                 </property>
@@ -1069,7 +1069,7 @@ This option only applies to QMake projects.</string>
                                     <string>Select this if your project is using include style as known from Qt version 3.x.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>m_qtStyleVersion4</cstring>
                                 </property>
@@ -1085,7 +1085,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>m_designerBox</cstring>
                         </property>
@@ -1105,7 +1105,7 @@ This option only applies to QMake projects.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>m_kdevembedded</cstring>
                                 </property>
@@ -1119,7 +1119,7 @@ This option only applies to QMake projects.</string>
                                     <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to integrate the UI designer into KDevelop.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>m_kdevexternal</cstring>
                                 </property>
@@ -1133,7 +1133,7 @@ This option only applies to QMake projects.</string>
                                     <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to run KDevelop's UI designer as a separate program.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>m_qtdesigner</cstring>
                                 </property>
@@ -1147,15 +1147,15 @@ This option only applies to QMake projects.</string>
                                     <string>Check this button if you wish to use Qt Designer rather than KDevelop's integrated designer.</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>m_txtDesigner</cstring>
                                         </property>
@@ -1176,15 +1176,15 @@ This option only applies to QMake projects.</string>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout10</cstring>
+                                    <cstring>tqlayout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>textLabel1_4</cstring>
                                         </property>
@@ -1217,7 +1217,7 @@ This option only applies to QMake projects.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>70</height>
@@ -1226,7 +1226,7 @@ This option only applies to QMake projects.</string>
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>accessorPage</cstring>
                 </property>
@@ -1237,7 +1237,7 @@ This option only applies to QMake projects.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox8</cstring>
                         </property>
@@ -1248,15 +1248,15 @@ This option only applies to QMake projects.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>layout5_2</cstring>
+                                    <cstring>tqlayout5_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>m_lblVariableName</cstring>
                                         </property>
@@ -1282,7 +1282,7 @@ This option only applies to QMake projects.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>61</width>
                                                 <height>20</height>
@@ -1313,7 +1313,7 @@ This option only applies to QMake projects.</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel7</cstring>
                                 </property>
@@ -1321,7 +1321,7 @@ This option only applies to QMake projects.</string>
                                     <string>Get method:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>textLabel8</cstring>
                                 </property>
@@ -1331,7 +1331,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox9</cstring>
                         </property>
@@ -1367,7 +1367,7 @@ right mouse button context menu only when
 you right click on a variable in a header file.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>m_lblGet</cstring>
                                 </property>
@@ -1393,7 +1393,7 @@ right mouse button context menu only when
 you right click on a variable in a header file.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>m_lblSet</cstring>
                                 </property>
@@ -1409,7 +1409,7 @@ you right click on a variable in a header file.</string>
                                     <string>m_</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>m_lblRemovePrefix</cstring>
                                 </property>
@@ -1435,14 +1435,14 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>87</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLabel" row="2" column="2" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>m_lblParameterName</cstring>
                                 </property>
@@ -1460,7 +1460,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>87</width>
                                         <height>20</height>
@@ -1477,7 +1477,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>92</width>
                                         <height>20</height>
@@ -1494,7 +1494,7 @@ you right click on a variable in a header file.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>92</width>
                                         <height>20</height>
@@ -1513,7 +1513,7 @@ you right click on a variable in a header file.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>91</height>
@@ -1758,7 +1758,7 @@ you right click on a variable in a header file.</string>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">implementationFile()</slot>
     <slot access="protected">interfaceFile()</slot>
     <slot access="protected">slotAddPPPath()</slot>
@@ -1779,9 +1779,9 @@ you right click on a variable in a header file.</string>
     <slot>isQMakeExecutable(const QString&amp;)</slot>
     <slot>isValidQtDir(const QString&amp;)</slot>
     <slot>openPluginPaths()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp
index 70ad5d10..963faa71 100644
--- a/languages/cpp/classgeneratorconfig.cpp
+++ b/languages/cpp/classgeneratorconfig.cpp
@@ -21,8 +21,8 @@
 #include "cppsupportfactory.h"
 #include "classgeneratorconfig.h"
 
-ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* parent, const char* name, WFlags fl )
-		: ClassGeneratorConfigBase( parent, name, fl )
+ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* tqparent, const char* name, WFlags fl )
+		: ClassGeneratorConfigBase( tqparent, name, fl )
 {
 	readConfig();
 	currTemplate = &cppHeaderText;
@@ -34,8 +34,8 @@ ClassGeneratorConfig::ClassGeneratorConfig( TQString v_cppHeaderText, TQString v
         TQString v_gtkHeaderText, TQString v_gtkSourceText,
         NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase,
         bool v_showAuthor, bool v_genDoc, bool v_reformat,
-        TQWidget* parent, const char* name, WFlags fl )
-		: ClassGeneratorConfigBase( parent, name, fl ),
+        TQWidget* tqparent, const char* name, WFlags fl )
+		: ClassGeneratorConfigBase( tqparent, name, fl ),
 		cppHeaderText( v_cppHeaderText ), cppSourceText( v_cppSourceText ),
 		objcHeaderText( v_objcHeaderText ), objcSourceText( v_objcSourceText ),
 		gtkHeaderText( v_gtkHeaderText ), gtkSourceText( v_gtkSourceText )
diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h
index 783934d4..f9a82752 100644
--- a/languages/cpp/classgeneratorconfig.h
+++ b/languages/cpp/classgeneratorconfig.h
@@ -17,18 +17,19 @@
 class ClassGeneratorConfig : public ClassGeneratorConfigBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	enum NameCase { LowerCase, UpperCase, SameAsClassCase, SameAsFileCase };
 
-	ClassGeneratorConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+	ClassGeneratorConfig( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
 	ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText,
 	                      TQString v_objcHeaderText, TQString v_objcSourceText,
 	                      TQString v_gtkHeaderText, TQString v_gtkSourceText,
 	                      NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase,
 	                      bool v_showAuthor, bool v_genDoc, bool v_reformat,
-	                      TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+	                      TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
 	~ClassGeneratorConfig();
 	/*$PUBLIC_FUNCTIONS$*/
diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui
index 566e9eb2..1bb25fe6 100644
--- a/languages/cpp/classgeneratorconfigbase.ui
+++ b/languages/cpp/classgeneratorconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ClassGeneratorConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ClassGeneratorConfigBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox7_2</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="0" column="0">
+                <widget class="TQComboBox" row="0" column="0">
                     <item>
                         <property name="text">
                             <string>Cpp Header</string>
@@ -65,14 +65,14 @@
                         <cstring>templatename_box</cstring>
                     </property>
                 </widget>
-                <widget class="QTextEdit" row="1" column="0">
+                <widget class="TQTextEdit" row="1" column="0">
                     <property name="name">
                         <cstring>template_edit</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox10</cstring>
             </property>
@@ -91,7 +91,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>textLabel3_2</cstring>
                     </property>
@@ -102,7 +102,7 @@
                         <cstring>defcase_box</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -113,7 +113,7 @@
                         <cstring>filecase_box</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="0">
+                <widget class="TQComboBox" row="1" column="0">
                     <item>
                         <property name="text">
                             <string>Lowercase</string>
@@ -133,7 +133,7 @@
                         <cstring>filecase_box</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>Lowercase</string>
@@ -161,7 +161,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="2">
+                <widget class="TQComboBox" row="1" column="2">
                     <item>
                         <property name="text">
                             <string>Lowercase</string>
@@ -181,7 +181,7 @@
                         <cstring>supercase_box</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>textLabel3_3</cstring>
                     </property>
@@ -194,7 +194,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>groupBox9</cstring>
             </property>
@@ -205,7 +205,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>author_box</cstring>
                     </property>
@@ -213,7 +213,7 @@
                         <string>Include &amp;author name in class documentation</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>doc_box</cstring>
                     </property>
@@ -223,7 +223,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="3" column="0">
+        <widget class="TQCheckBox" row="3" column="0">
             <property name="name">
                 <cstring>reformat_box</cstring>
             </property>
@@ -253,9 +253,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">templateTypeChanged(int type)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp
index e71f3a66..3533dd73 100644
--- a/languages/cpp/codeinformationrepository.cpp
+++ b/languages/cpp/codeinformationrepository.cpp
@@ -30,7 +30,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList )
 		              e.text + " " +
 		              e.prefix + " " +
 		              e.postfix + " ";
-		if ( map.find( key ) == map.end() )
+		if ( map.tqfind( key ) == map.end() )
 		{
 			map[ key ] = TRUE;
 			l << e;
@@ -265,7 +265,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC
                             {
                                     TQString argName = argumentNames[ i ];
                                     if ( !argName.isEmpty() ) 
-                                        signature += TQString::fromLatin1( " " ) + argName;
+                                        signature += TQString::tqfromLatin1( " " ) + argName;
                                     
                             }
                             
@@ -286,12 +286,12 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC
 			if ( completionMode == CppCodeCompletion::VirtualDeclCompletion )
 			{
 				entry.text += entry.postfix + ";";
-				entry.postfix = TQString::null;
+				entry.postfix = TQString();
 			}
 			else if ( completionMode != CppCodeCompletion::NormalCompletion )
 			{
 				entry.text += entry.postfix;
-				entry.postfix = TQString::null;
+				entry.postfix = TQString();
 			}
 
 			TQString comment = tag.attribute( "description" ).toString();
diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h
index 2c5f4cb2..e7e2c649 100644
--- a/languages/cpp/codeinformationrepository.h
+++ b/languages/cpp/codeinformationrepository.h
@@ -20,7 +20,7 @@
 
 struct TypeProcessor {
     virtual TQString processType( const TQString& type ) = 0;
-    virtual TQString parentType() = 0;
+    virtual TQString tqparentType() = 0;
 };
 
 class KDevCodeRepository;
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index 8f632d69..3d7ff152 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -26,10 +26,10 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin>( "kdevgccoptions" ) )
 
-class GeneralTab : public QWidget
+class GeneralTab : public TQWidget
 {
 public:
-	GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 );
+	GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 );
 	~GeneralTab();
 
 	void readFlags( TQStringList *str );
@@ -40,10 +40,10 @@ private:
 };
 
 
-class OptimizationTab : public QWidget
+class OptimizationTab : public TQWidget
 {
 public:
-	OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 );
+	OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 );
 	~OptimizationTab();
 
 	void readFlags( TQStringList *str );
@@ -55,10 +55,10 @@ private:
 };
 
 
-class G77Tab : public QWidget
+class G77Tab : public TQWidget
 {
 public:
-	G77Tab( TQWidget *parent = 0, const char *name = 0 );
+	G77Tab( TQWidget *tqparent = 0, const char *name = 0 );
 	~G77Tab();
 
 	void readFlags( TQStringList *str );
@@ -69,10 +69,10 @@ private:
 };
 
 
-class Warnings1Tab : public QWidget
+class Warnings1Tab : public TQWidget
 {
 public:
-	Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 );
+	Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 );
 	~Warnings1Tab();
 
 	void readFlags( TQStringList *str );
@@ -84,10 +84,10 @@ private:
 };
 
 
-class Warnings2Tab : public QWidget
+class Warnings2Tab : public TQWidget
 {
 public:
-	Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 );
+	Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 );
 	~Warnings2Tab();
 
 	void readFlags( TQStringList *str );
@@ -98,12 +98,12 @@ private:
 };
 
 
-GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
-		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
+GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name )
+		: TQWidget( tqparent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	layout->setAutoAdd( true );
-	layout->addSpacing( 10 );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	tqlayout->setAutoAdd( true );
+	tqlayout->addSpacing( 10 );
 
 	TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this );
 	new FlagCheckBox( output_group, controller,
@@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
 	                  "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	layout->addSpacing( 10 );
+	tqlayout->addSpacing( 10 );
 
 	TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
 	if ( type != GccOptionsPlugin::GPP )
@@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
 	                  "-short-double", i18n( "Make 'double' the same as 'float'" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	layout->addStretch();
+	tqlayout->addStretch();
 }
 
 
@@ -164,11 +164,11 @@ void GeneralTab::writeFlags( TQStringList *list )
 }
 
 
-OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
-		: TQWidget( parent, name )
+OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name )
+		: TQWidget( tqparent, name )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	layout->setAutoAdd( true );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	tqlayout->setAutoAdd( true );
 
 	TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this );
 	Odefault = new TQRadioButton( i18n( "Default" ), group );
@@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent,
 	}
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	layout->addStretch();
+	tqlayout->addStretch();
 }
 
 
@@ -224,21 +224,21 @@ void OptimizationTab::readFlags( TQStringList *list )
 	optBox->readFlags( list );
 
 	TQStringList::Iterator sli;
-	sli = list->find( "-O0" );
+	sli = list->tqfind( "-O0" );
 	if ( sli != list->end() )
 	{
 		O0->setChecked( true );
 		list->remove
 		( sli );
 	}
-	sli = list->find( "-O1" );
+	sli = list->tqfind( "-O1" );
 	if ( sli != list->end() )
 	{
 		O1->setChecked( true );
 		list->remove
 		( sli );
 	}
-	sli = list->find( "-O2" );
+	sli = list->tqfind( "-O2" );
 	if ( sli != list->end() )
 	{
 		O2->setChecked( true );
@@ -261,12 +261,12 @@ void OptimizationTab::writeFlags( TQStringList *list )
 }
 
 
-G77Tab::G77Tab( TQWidget *parent, const char *name )
-		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
+G77Tab::G77Tab( TQWidget *tqparent, const char *name )
+		: TQWidget( tqparent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	layout->setAutoAdd( true );
-	layout->addSpacing( 10 );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	tqlayout->setAutoAdd( true );
+	tqlayout->addSpacing( 10 );
 
 	TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this );
 	new FlagCheckBox( dialect_group, controller,
@@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
 	                  "-fonetrip", i18n( "DO loops are executed at least once" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	layout->addSpacing( 10 );
+	tqlayout->addSpacing( 10 );
 
 	TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
 	new FlagCheckBox( codegen_group, controller,
@@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
 	                  "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	layout->addStretch();
+	tqlayout->addStretch();
 }
 
 
@@ -316,11 +316,11 @@ void G77Tab::writeFlags( TQStringList *list )
 }
 
 
-Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
-		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
+Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name )
+		: TQWidget( tqparent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	layout->setAutoAdd( true );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	tqlayout->setAutoAdd( true );
 
 	new FlagCheckBox( this, controller,
 	                  "-w", i18n( "Inhibit all warnings" ) );
@@ -366,7 +366,7 @@ Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
 	new FlagListItem( wallBox,
 	                  "-Wmissing-braces", i18n( "<qt>Warn if an aggregate or union initializer is not fully bracketed</qt>" ) );
 	new FlagListItem( wallBox,
-	                  "-Wparentheses", i18n( "<qt>Warn when parentheses are omitted in certain contexts</qt>" ) );
+	                  "-Wtqparentheses", i18n( "<qt>Warn when tqparentheses are omitted in certain contexts</qt>" ) );
 	new FlagListItem( wallBox,
 	                  "-Wsequence-point", i18n( "<qt>Warn about code that may have undefined semantics because of\n"
 	                                            "violations of sequence point rules in the C standard</qt>" ) );
@@ -414,11 +414,11 @@ void Warnings1Tab::writeFlags( TQStringList *list )
 }
 
 
-Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
-		: TQWidget( parent, name )
+Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name )
+		: TQWidget( tqparent, name )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	layout->setAutoAdd( true );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	tqlayout->setAutoAdd( true );
 
 	wrestBox = new FlagListBox( this );
 
@@ -438,7 +438,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
 	                                       "qualifier from the target type</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wcast-align", i18n( "<qt>Warn whenever a pointer is cast such that the required\n"
-	                                        "alignment of the target is increased</qt>" ) );
+	                                        "tqalignment of the target is increased</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wwrite-strings", i18n( "<qt>Warn when the address of a string constant is cast\n"
 	                                           "into a non-const <i>char *</i> pointer</qt>" ) );
@@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
 	                        "deprecated by using the 'deprecated' attribute</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wpacked", i18n( "<qt>Warn if a structure is given the packed attribute, but the packed\n"
-	                                    "attribute has no effect on the layout or size of the structure</qt>" ) );
+	                                    "attribute has no effect on the tqlayout or size of the structure</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wpadded", i18n( "<qt>Warn if padding is included in a structure, either to align an\n"
 	                                    "element of the structure or to align the whole structure</qt>" ) );
@@ -572,8 +572,8 @@ void Warnings2Tab::writeFlags( TQStringList *list )
 
 
 // Last but not least... :-)
-GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
-		: KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, parent, name, true )
+GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name )
+		: KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, tqparent, name, true )
 {
 	TQVBox * vbox;
 
@@ -649,8 +649,8 @@ TQString GccOptionsDialog::flags() const
 }
 
 
-GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args )
-		: KDevCompilerOptions( parent, name )
+GccOptionsPlugin::GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args )
+		: KDevCompilerOptions( tqparent, name )
 {
 	gcctype = Unknown;
 
@@ -683,16 +683,16 @@ TQString GccOptionsPlugin::captionForType( Type type )
 	case G77:
 		return i18n( "GNU Fortran 77 Compiler Options" );
 	default:
-		return TQString::null;
+		return TQString();
 	}
 }
 
 
-TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags )
+TQString GccOptionsPlugin::exec( TQWidget *tqparent, const TQString &flags )
 {
 	if ( gcctype == Unknown )
-		return TQString::null;
-	GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, parent, "gcc options dialog" );
+		return TQString();
+	GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, tqparent, "gcc options dialog" );
 	TQString newFlags = flags;
 	dlg->setFlags( flags );
 	if ( dlg->exec() == TQDialog::Accepted )
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
index e5144e01..0ac93c23 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
@@ -27,15 +27,16 @@ class Warnings2Tab;
 class GccOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { GCC, GPP, G77, Unknown };
-    GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args );
+    GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
     ~GccOptionsPlugin();
 
     static TQString captionForType(Type type);
     
-    virtual TQString exec(TQWidget *parent, const TQString &flags);
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags);
 
 private:
     Type gcctype;
@@ -45,7 +46,7 @@ private:
 class GccOptionsDialog : public KDialogBase
 {
 public:
-    GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 );
+    GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 );
     ~GccOptionsDialog();
 
     void setFlags(const TQString &flags);
diff --git a/languages/cpp/computerecoverypoints.h b/languages/cpp/computerecoverypoints.h
index 4e2056d5..a7cfaea5 100644
--- a/languages/cpp/computerecoverypoints.h
+++ b/languages/cpp/computerecoverypoints.h
@@ -31,7 +31,7 @@
 static TQString toSimpleName( NameAST* name )
 {
   if ( !name )
-    return TQString::null;
+    return TQString();
   
   TQString s;
   TQPtrList<ClassOrNamespaceNameAST> l = name->classOrNamespaceNameList();
diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui
index 164d6693..6a2ab252 100644
--- a/languages/cpp/configproblemreporter.ui
+++ b/languages/cpp/configproblemreporter.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigureProblemReporter</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigureProblemReporter</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3_2</cstring>
             </property>
@@ -31,7 +31,7 @@ They will be displayed in the 'Problems' output view and as markers in the edito
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>problemReporterCheckbox</cstring>
                     </property>
@@ -41,7 +41,7 @@ They will be displayed in the 'Problems' output view and as markers in the edito
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -60,15 +60,15 @@ If disabled, the parser will typically only run when the file is saved.</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>bgParserCheckbox</cstring>
                             </property>
@@ -76,7 +76,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
                                 <string>Enable &amp;background parsing</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>delayLabel</cstring>
                             </property>
@@ -91,13 +91,13 @@ If disabled, the parser will typically only run when the file is saved.</string>
                             <property name="text">
                                 <string>msec</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QSlider">
+                <widget class="TQSlider">
                     <property name="name">
                         <cstring>delaySlider</cstring>
                     </property>
@@ -125,7 +125,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -139,7 +139,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>specialHeader</cstring>
                     </property>
@@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string>
 <variables>
     <variable>CppSupportPart* m_part;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>setPart( CppSupportPart * part )</slot>
     <slot>accept()</slot>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
     <slot access="protected">setDelayLabel( int delay )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 842e0c69..1931c66f 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -92,7 +92,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
 
 void ConfigureProblemReporter::setDelayLabel( int delay )
 {
-	delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) );
+	delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) );
 }
 // kate: indent-mode csands; tab-width 4;
 
diff --git a/languages/cpp/cpp_tags.h b/languages/cpp/cpp_tags.h
index a82ac758..12a0199f 100644
--- a/languages/cpp/cpp_tags.h
+++ b/languages/cpp/cpp_tags.h
@@ -46,7 +46,7 @@ public:
 
 	static TQString format( const Tag& tag )
 	{
-		return TQString::null;
+		return TQString();
 	}
 
 	int access() const
@@ -137,7 +137,7 @@ public:
 
 	static TQString format( const Tag& tag )
 	{
-		return TQString::null;
+		return TQString();
 	}
 
 	int access() const
@@ -241,7 +241,7 @@ public:
 
 	static TQString format( const Tag& tag )
 	{
-		return TQString::null;
+		return TQString();
 	}
 
 	int access() const
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 266c3878..08f6aa1e 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -134,7 +134,7 @@ CppCodeCompletion* cppCompletionInstance = 0;
 
 //file global functions, must be before any "using namespace"
 TQString cleanForMenu( TQString txt ) {
-  return txt.replace( "&", "&&" ).replace( "	", "    " );
+  return txt.tqreplace( "&", "&&" ).tqreplace( "	", "    " );
 }
 
 TQString buildSignature( TypePointer currType ) {
@@ -254,7 +254,7 @@ static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) {
                     e.prefix + " " +
                     e.text + " " +
                     e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace();
-    if ( map.find( key ) == map.end() ) {
+    if ( map.tqfind( key ) == map.end() ) {
       map[ key ] = TRUE;
       l << e;
     }
@@ -269,7 +269,7 @@ static TQStringList unique( const TQStringList& entryList ) {
   TQStringList::ConstIterator it = entryList.begin();
   while ( it != entryList.end() ) {
     TQString e = *it++;
-    if ( map.find( e ) == map.end() ) {
+    if ( map.tqfind( e ) == map.end() ) {
       map[ e ] = TRUE;
       l << e;
     }
@@ -285,7 +285,7 @@ static TQStringList unique( const TQValueList<TQStringList>& entryList ) {
   while ( it != entryList.end() ) {
     TQStringList li = ( *it++ );
     TQString e = li.join( "\n" );
-    if ( map.find( e ) == map.end() ) {
+    if ( map.tqfind( e ) == map.end() ) {
       map[ e ] = TRUE;
       l += li;
     }
@@ -348,7 +348,7 @@ struct PopupFillerHelpStruct {
 
 	TQMap<TQString, TQPopupMenu*> m_namespacePopupCache;
 
-  void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) {
+  void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) {
     Q_UNUSED(prefix);
 
     TQString memType = d.memberTypeToString();
@@ -356,13 +356,13 @@ struct PopupFillerHelpStruct {
     if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" )
       memType = "enum";
 
-    TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
-    int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) );
+    TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) );
+    int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) );
 
     receiver->m_popupActions.insert( id, d.decl );
   }
 
-  void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) {
+  void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) {
     Debug dbg( "#insert# ", 10 );
 
     TQString txt1, txt2;
@@ -374,14 +374,14 @@ struct PopupFillerHelpStruct {
         for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) {
 	        SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() );
 	        if ( cm && cm->item() ) {
-	          TQPopupMenu * m = PopupTracker::createPopup( parent );
+	          TQPopupMenu * m = PopupTracker::createPopup( tqparent );
 	          TQString scope = cm->scope().join("::");
-	          TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope );
+	          TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.tqfind( scope );
 	          if( it != m_namespacePopupCache.end() ) {
-		          parent->insertItem( "Imported Namespace " +  scope, *it );
+		          tqparent->insertItem( "Imported Namespace " +  scope, *it );
 		          delete m;
 	          } else {
-		          parent->insertItem( "Imported Namespace " +  scope, m );
+		          tqparent->insertItem( "Imported Namespace " +  scope, m );
 
 							insertItem( m, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix );
 		          m_namespacePopupCache.insert( scope, m );
@@ -390,7 +390,7 @@ struct PopupFillerHelpStruct {
 		        SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() );
 		        if( cn ) {
 			        TypePointer t = new SimpleTypeNamespace( cn ); //To avoid endless recursion, this needs to be done(the dynamic-cast above fails)
-			        insertItem( parent, t->desc(), prefix );
+			        insertItem( tqparent, t->desc(), prefix );
 		        }
 	        }
         }
@@ -423,7 +423,7 @@ struct PopupFillerHelpStruct {
 			        int sLine, sCol, eLine, eCol;
 			        i->getStartPosition( &sLine, &sCol );
 			        i->getEndPosition( &eLine, &eCol );
-		        	insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion.
+		        	insertItem( tqparent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion.
 		        }
 
 	        }
@@ -434,10 +434,10 @@ struct PopupFillerHelpStruct {
 
     if ( d.resolved() ) {
       if ( d.resolved() ->asFunction() ) {
-	      txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) );
-	      txt2 = prefix + i18n( "Jump to definition of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) );
+	      txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) );
+	      txt2 = prefix + i18n( "Jump to definition of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) );
       } else {
-        txt1 = prefix + i18n( "Jump to %1" ).arg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) );
+        txt1 = prefix + i18n( "Jump to %1" ).tqarg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) );
       }
     } else {
 			if( !BuiltinTypes::isBuiltin( d ) ) {
@@ -447,12 +447,12 @@ struct PopupFillerHelpStruct {
 			}
     }
 
-    int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) );
+    int id = tqparent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) );
     if ( d.resolved() )
       receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() );
 
     if ( !txt2.isEmpty() ) {
-      int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) );
+      int id2 = tqparent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) );
       if ( d.resolved() )
         receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() );
     }
@@ -523,7 +523,7 @@ struct PopupClassViewFillerHelpStruct {
 		return false;
 	}
 
-  void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) {
+  void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) {
     Q_UNUSED(prefix);
     FileDom f = receiver->m_pSupport->codeModel() ->fileByName( d.decl.file );
     if ( !f )
@@ -536,13 +536,13 @@ struct PopupClassViewFillerHelpStruct {
     if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" )
       memType = "enum";
 
-    TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) );
-    int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
+    TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) );
+    int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
 
     receiver->m_popupClassViewActions.insert( id, dom );
   }
 
-  void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) {
+  void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) {
     Debug dbg( "#insert# ", 10 );
 
     TQString txt;
@@ -565,12 +565,12 @@ struct PopupClassViewFillerHelpStruct {
           for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) {
 	          SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() );
 	          if ( cm && cm->item() ) {
-              insertItem( parent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix );
+              insertItem( tqparent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix );
 	          }  else {
 		          SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() );
 		          if( cn ) {
 			          TypePointer t = new SimpleTypeNamespace( cn ); //to avoid endless recursion (caching would be better)
-			          insertItem( parent, t->desc(), prefix );
+			          insertItem( tqparent, t->desc(), prefix );
 		          }
 	          }
           }
@@ -583,7 +583,7 @@ struct PopupClassViewFillerHelpStruct {
           if ( d.resolved() ->asFunction() ) {
             n = buildSignature( d.resolved() );
           }
-          txt = prefix + i18n( "Show %1" ).arg( cleanForMenu( n ) );
+          txt = prefix + i18n( "Show %1" ).tqarg( cleanForMenu( n ) );
         } else {
           txt = prefix + d.name() + " not in code-model";
         }
@@ -596,7 +596,7 @@ struct PopupClassViewFillerHelpStruct {
 			}
     }
 
-    int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
+    int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) );
 
     if ( dom )
       receiver->m_popupClassViewActions.insert( id, dom );
@@ -612,13 +612,13 @@ class PopupFiller {
     PopupFiller( HelpStruct str , TQString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {}
 
 	    
-		void  fillIncludes( const DeclarationInfo& decl, TQPopupMenu* parent, bool& needSeparator ) {
+		void  fillIncludes( const DeclarationInfo& decl, TQPopupMenu* tqparent, bool& needSeparator ) {
 			if( !struk.receiver->getIncludeFiles()[ HashedString( decl.file ) ] ) {
 				TQString file = decl.file;
 				//The include-file seems to be missing
 				if( needSeparator ) {
 					needSeparator = false;
-					parent->insertSeparator();
+					tqparent->insertSeparator();
 				}
 
 				TQString includeFile = file;
@@ -644,7 +644,7 @@ class PopupFiller {
 
 					//kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl;
 				}
-				int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) );
+				int id = tqparent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) );
 				DeclarationInfo fakeDec;
 				fakeDec.name = decl.name;
 				fakeDec.file = includeFile;
@@ -653,7 +653,7 @@ class PopupFiller {
 			}
 		}
 	
-    void fill( TQPopupMenu * parent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) {
+    void fill( TQPopupMenu * tqparent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) {
       Debug dbg( "#fl# ", 10 )
       ;
 
@@ -670,32 +670,32 @@ class PopupFiller {
         f.type = d.desc();
         f.memberType = SimpleTypeImpl::MemberInfo::Variable;
 
-        /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
+        /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
 
         m_popupActions.insert( id, type.sourceVariable );*/
-        struk.insertItem( parent, f, prefix );
+        struk.insertItem( tqparent, f, prefix );
 
-        parent->insertSeparator();
+        tqparent->insertSeparator();
 
         if ( !sourceVariable.comment.isEmpty() ) {
-          TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m );
+          TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+          tqparent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m );
           TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 );
           for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
             m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
           }
-          parent->insertSeparator();
+          tqparent->insertSeparator();
         }
       }
 
-      struk.insertItem( parent, d, prefix );
+      struk.insertItem( tqparent, d, prefix );
 
 	    if( d->resolved() && !d->resolved()->specialization().isEmpty() ) {
-		    SimpleType p = d->resolved()->parent();
+		    SimpleType p = d->resolved()->tqparent();
 		    LocateResult r = p->locateDecType( d->name() );
 		    if( r ) {
-			    TQPopupMenu * m = PopupTracker::createPopup( parent );
-			    parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m );
+			    TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+			    tqparent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m );
 					fill( m, r );
 		    }
 	    }
@@ -703,11 +703,11 @@ class PopupFiller {
       TypeDesc::TemplateParams p = d->templateParams();
       for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) {
         //if( (*it)->resolved() ) {
-        TQPopupMenu * m = PopupTracker::createPopup( parent );
-        parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
+        TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+        tqparent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
         fill( m, **it );
         /*} else {
-           fill( parent, **it, prefix + depthAdd );
+           fill( tqparent, **it, prefix + depthAdd );
          }*/
       }
 
@@ -715,16 +715,16 @@ class PopupFiller {
         if ( d->resolved() ->asFunction() ) {
           LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() );
           if ( rt ) {
-            TQPopupMenu * m = PopupTracker::createPopup( parent );
-            parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m );
+            TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+            tqparent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m );
             fill( m, rt );
           }
 
           TQValueList<TypeDesc> args = d->resolved() ->asFunction() ->getArgumentTypes();
           TQStringList argNames = d->resolved() ->asFunction() ->getArgumentNames();
           if ( !args.isEmpty() ) {
-            TQPopupMenu * m = PopupTracker::createPopup( parent );
-            parent->insertItem( i18n( "Argument-types" ), m );
+            TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+            tqparent->insertItem( i18n( "Argument-types" ), m );
             TQStringList::iterator it2 = argNames.begin();
             for ( TQValueList<TypeDesc>::iterator it = args.begin(); it != args.end(); ++it ) {
               LocateResult at = d->resolved() ->locateDecType( *it );
@@ -734,7 +734,7 @@ class PopupFiller {
                 ++it2;
               }
               TQPopupMenu * mo = PopupTracker::createPopup( m );
-              m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo );
+              m->insertItem( i18n( "Argument \"%1\"" ).tqarg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo );
               fill( mo, at );
 
             }
@@ -743,17 +743,17 @@ class PopupFiller {
       }
 #ifndef DISABLE_TRACING
       if ( d.trace() ) {
-        TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace();
+        TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace();
         if ( !trace.isEmpty() ) {
-          TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Trace" ), m );
+          TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+          tqparent->insertItem( i18n( "Trace" ), m );
 
-          for ( TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) {
+          for ( TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) {
             TQPopupMenu * mo = PopupTracker::createPopup( m );
             TQString tail = ( *it ).second.fullNameChain();
             if ( !tail.isEmpty() )
               tail = "::" + tail;
-            m->insertItem( i18n( "%1 -> %2" ).arg( cleanForMenu( ( *it ).first.name + tail ) ).arg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo );
+            m->insertItem( i18n( "%1 -> %2" ).tqarg( cleanForMenu( ( *it ).first.name + tail ) ).tqarg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo );
 
             struk.insertItem( mo, ( *it ).first, prefix );
 
@@ -778,21 +778,21 @@ class PopupFiller {
       if ( d->resolved() ) {
         TQValueList<LocateResult> bases = d->resolved() ->getBases();
         for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) {
-          TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Base-class \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
+          TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+          tqparent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m );
           fill( m, *it );
         }
 
-        if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) {
-          TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Nested in \"%1\"" ).arg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m );
-          fill( m, d->resolved() ->parent() ->desc() );
+        if ( d->resolved() ->tqparent() && d->resolved() ->tqparent() ->desc() ) {
+          TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+          tqparent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->tqparent() ->fullTypeResolved() ) ), m );
+          fill( m, d->resolved() ->tqparent() ->desc() );
         }
 
         if ( !d->resolved() ->comment().isEmpty() ) {
-          parent->insertSeparator();
-          TQPopupMenu * m = PopupTracker::createPopup( parent );
-          parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m );
+          tqparent->insertSeparator();
+          TQPopupMenu * m = PopupTracker::createPopup( tqparent );
+          tqparent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m );
           TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 );
           for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) {
             m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) );
@@ -805,18 +805,18 @@ class PopupFiller {
 					bool needSeparator = true;
 					//Show the include-files for the whole trace, because usually the first in the trace should be the one to include
 					if ( d.trace() ) {
-						TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace();
+						TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace();
 						if ( !trace.isEmpty() ) {
-							for ( TQValueList<QPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) {
+							for ( TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) {
 								if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() &&  !(*it).first.decl.file.operator TQString().isEmpty() )
-									fillIncludes( (*it).first.decl, parent, needSeparator );
+									fillIncludes( (*it).first.decl, tqparent, needSeparator );
 							}
 						}
 					}
 
 		    	//Show the include-file for the item itself
 				 	if( d->resolved() && !d->resolved()->isNamespace() && struk.receiver->cppSupport() ) {
-						fillIncludes( d->resolved()->getDeclarationInfo(), parent, needSeparator );
+						fillIncludes( d->resolved()->getDeclarationInfo(), tqparent, needSeparator );
 					}
     	}
     }
@@ -828,7 +828,7 @@ struct CompTypeProcessor : public TypeProcessor {
 
   CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {}
 
-  virtual TQString parentType() {
+  virtual TQString tqparentType() {
     return m_scope->fullType();
   }
 
@@ -855,14 +855,14 @@ struct CppCodeCompletionData {
     if ( recoveryPoints.count() == 0 )
       return 0;
 
-    QPair<int, int> pt = qMakePair( line, column );
+    TQPair<int, int> pt = tqMakePair( line, column );
 
     TQPtrListIterator<RecoveryPoint> it( recoveryPoints );
     RecoveryPoint* recPt = 0;
 
     while ( it.current() ) {
-      QPair<int, int> startPt = qMakePair( it.current() ->startLine, it.current() ->startColumn );
-      QPair<int, int> endPt = qMakePair( it.current() ->endLine, it.current() ->endColumn );
+      TQPair<int, int> startPt = tqMakePair( it.current() ->startLine, it.current() ->startColumn );
+      TQPair<int, int> endPt = tqMakePair( it.current() ->endLine, it.current() ->endColumn );
 
       if ( pt < startPt ) {
         break;
@@ -969,7 +969,7 @@ CppCodeCompletion::~CppCodeCompletion( ) {
 }
 
 void CppCodeCompletion::addStatusText( TQString text, int timeout ) {
-  m_statusTextList.append( QPair<int, TQString>( timeout, text ) );
+  m_statusTextList.append( TQPair<int, TQString>( timeout, text ) );
   if ( !m_showStatusTextTimer->isActive() ) {
     slotStatusTextTimeout();
   }
@@ -1055,7 +1055,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) {
 
   kdDebug( 9007 ) << k_funcinfo << endl;
 
-  m_activeFileName = TQString::null;
+  m_activeFileName = TQString();
 
   KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part );
   if ( !doc )
@@ -1121,7 +1121,7 @@ void CppCodeCompletion::slotTextChanged() {
   // !!WARNING!! This is very hackish, but KTE doesn't offer a way
   // to tell the completion box to _go_away_
   if ( ch.simplifyWhiteSpace().isEmpty() &&
-       !strCurLine.simplifyWhiteSpace().contains( "virtual" ) &&
+       !strCurLine.simplifyWhiteSpace().tqcontains( "virtual" ) &&
        m_bCompletionBoxShow ) {
     TQValueList<KTextEditor::CompletionEntry> entryList;
     m_bCompletionBoxShow = true;
@@ -1139,7 +1139,7 @@ void CppCodeCompletion::slotTextChanged() {
   // m_codeCompleteCh2Rx completes on "->" and "::"
 
   if ( ( argsHint && ch == "(" ) ||
-       ( codeComplete && strCurLine.simplifyWhiteSpace().contains( "virtual" ) ) ||
+       ( codeComplete && strCurLine.simplifyWhiteSpace().tqcontains( "virtual" ) ) ||
        ( codeComplete && ( m_codeCompleteChRx.search( ch ) != -1 ||
                            m_codeCompleteCh2Rx.search( ch2 ) != -1 ) ) ||
        ( headComplete && ( ch == "\"" || ch == "<" ) && m_includeRx.search( strCurLine ) != -1 ) ) {
@@ -1238,7 +1238,7 @@ TQString CppCodeCompletion::replaceCppComments( const TQString& contents ) {
       after.fill( ' ', before.length() - 5 );
       after.prepend( "/*" );
       after.append( "*/" );
-      text.replace( pos, before.length() - 1, after );
+      text.tqreplace( pos, before.length() - 1, after );
       pos += after.length();
     } else {
       pos += m_cppCodeCommentsRx.matchedLength();
@@ -1444,12 +1444,12 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column ,
 }
 
 void CppCodeCompletion::popupAction( int number ) {
-  PopupActions::iterator it = m_popupActions.find( number );
+  PopupActions::iterator it = m_popupActions.tqfind( number );
   if ( it != m_popupActions.end() ) {
     TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString();
 	  if( (*it).startLine == -1 ) {
 		  //startLine -1 indicates that the file should be added to the include-files
-		  m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) );
+		  m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").tqarg( fileName ).tqarg( (*it).name ) );
 	  } else {
     	m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine );
 	  }
@@ -1459,7 +1459,7 @@ void CppCodeCompletion::popupAction( int number ) {
 }
 
 void CppCodeCompletion::popupDefinitionAction( int number ) {
-  PopupActions::iterator it = m_popupDefinitionActions.find( number );
+  PopupActions::iterator it = m_popupDefinitionActions.tqfind( number );
   if ( it != m_popupDefinitionActions.end() ) {
     TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString();
     if ( !m_pSupport->switchHeaderImpl( fileName, ( *it ).startLine, ( *it ).startCol ) )
@@ -1481,7 +1481,7 @@ void CppCodeCompletion::selectItem( ItemDom item ) {
 }
 
 void CppCodeCompletion::popupClassViewAction( int number ) {
-  PopupClassViewActions::iterator it = m_popupClassViewActions.find( number );
+  PopupClassViewActions::iterator it = m_popupClassViewActions.tqfind( number );
   if ( it != m_popupClassViewActions.end() ) {
     if ( ( *it ) )
       selectItem( *it );
@@ -1532,11 +1532,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 		TQPopupMenu * m = PopupTracker::createPopup( popup );
 		int gid;
 		if ( contextMenuEntriesAtTop )
-			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ );
+			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ );
 		else
-			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m );
+			gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m );
 
-		int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) );
+		int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) );
 		TQPopupMenu * b = PopupTracker::createPopup( m );
 		m->insertItem( i18n( "Body" ), b );
 
@@ -1564,11 +1564,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 			int gid;
 			TQPopupMenu * m = PopupTracker::createPopup( popup );
 			if ( contextMenuEntriesAtTop )
-				gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ );
+				gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m, 5, cpos++ );
 			else
-				gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m );
+				gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m );
 
-			int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) );
+			int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) );
 
 			DeclarationInfo i;
 			i.file = includeFilePath;
@@ -1585,9 +1585,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
 		} else {
 			///Could not find include-file
 			if ( contextMenuEntriesAtTop )
-				popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ), 5, cpos++ );
+				popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ), 5, cpos++ );
 			else
-				popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ) );
+				popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ) );
 		}
 	}
 
@@ -1609,14 +1609,14 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
     TQPopupMenu * m = PopupTracker::createPopup( popup );
     int gid;
     if ( contextMenuEntriesAtTop )
-      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ );
+      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 5, cpos++ );
     else
-      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m );
+      gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m );
 
-    popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
+    popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) );
 
     /*if( type.sourceVariable && type.sourceVariable.name != "this" ) {
-    	int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
+    	int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) );
 
     	m_popupActions.insert( id, type.sourceVariable );
     }*/
@@ -1629,11 +1629,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte
       TQPopupMenu * m = PopupTracker::createPopup( popup );
       int gid;
       if ( contextMenuEntriesAtTop )
-        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ );
+        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 6, cpos++ );
       else
-        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m );
+        gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m );
 
-      popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
+      popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) );
 
       PopupClassViewFillerHelpStruct h( this );
       PopupFiller<PopupClassViewFillerHelpStruct> filler( h, "" );
@@ -1691,7 +1691,7 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) {
     	}
     	text += "type: \"" + type.resultType->fullTypeResolved() + "\"";
     }
-    if( type.resultType->parent()) text += "\nnested in: \"" + type.resultType->parent()->fullTypeResolvedWithScope() + "\"";
+    if( type.resultType->tqparent()) text += "\nnested in: \"" + type.resultType->tqparent()->fullTypeResolvedWithScope() + "\"";
     DeclarationInfo i = type.resultType->getDeclarationInfo();
     if( i ) text += "\n" + i.locationToText();
 
@@ -1703,27 +1703,27 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) {
   const int timeout = 2000;
 
   if ( type->resolved() ) {
-    addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), timeout );
+    addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), timeout );
     if ( type.sourceVariable && !type.sourceVariable.comment.isEmpty() ) {
-      addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).arg( type.sourceVariable.name ).arg( type.sourceVariable.comment ) , 10000 );
+      addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).tqarg( type.sourceVariable.name ).tqarg( type.sourceVariable.comment ) , 10000 );
     }
     if ( !type->resolved() ->comment().isEmpty() ) {
-      addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).arg( type->name() ).arg( type->resolved() ->comment() ) , 10000 );
+      addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).tqarg( type->name() ).tqarg( type->resolved() ->comment() ) , 10000 );
     }
     if ( type->resolved() ->comment().isEmpty() ) {
-      addStatusText( i18n( "\"%1\" has no comment" ).arg( type->name() ) , timeout );
+      addStatusText( i18n( "\"%1\" has no comment" ).tqarg( type->name() ) , timeout );
     }
   } else {
     if ( type ) {
 			if( !BuiltinTypes::isBuiltin( type.resultType ) ) {
-				addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), 2 * timeout );
+				addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), 2 * timeout );
 			} else {
-				addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).arg( type.expr.expr() ).arg( type->fullNameChain() ).arg(BuiltinTypes::comment( type.resultType )), 2 * timeout );
+				addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ).tqarg(BuiltinTypes::comment( type.resultType )), 2 * timeout );
 			}
 
 
     } else {
-      addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).arg( type.expr.expr() ).arg( type.expr.typeAsString() ), 2 * timeout );
+      addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type.expr.typeAsString() ), 2 * timeout );
     }
   }
 
@@ -1744,7 +1744,7 @@ bool CppCodeCompletion::isTypeExpression( const TQString& expr ) {
 
 bool CppCodeCompletion::mayBeTypeTail( int line, int column, TQString& append, bool inFunction ) {
   TQString tail = clearComments( m_activeEditor->text( line, column + 1, line + 10 > ( int ) m_activeEditor->numLines() ? ( int ) m_activeEditor->numLines() : line + 10, 0 ) );
-  tail.replace( "\n", " " );
+  tail.tqreplace( "\n", " " );
   SafetyCounter s ( 100 );
   bool hadSpace = false;
   while ( !tail.isEmpty() && s ) {
@@ -1830,7 +1830,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st
 
     //make this a regexp
     TQString e = ret.expr();
-    if ( e.contains( "." ) || e.contains( "->" ) || e.contains( "(" ) || e.contains( ")" ) || e.contains( "=" ) || e.contains( "-" ) )
+    if ( e.tqcontains( "." ) || e.tqcontains( "->" ) || e.tqcontains( "(" ) || e.tqcontains( ")" ) || e.tqcontains( "=" ) || e.tqcontains( "-" ) )
       mayBeType = false;
 
     if ( mayBeType ) {
@@ -1904,26 +1904,26 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin
 
 
       if ( !scope.isEmpty() ) {
-        SimpleType parentType;
+        SimpleType tqparentType;
         /* if( !m_cachedFromContext ) {
           TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();;
           if( t )
-            parentType = SimpleType( t.data() );
+            tqparentType = SimpleType( t.data() );
           else
-            parentType = SimpleType( scope );
+            tqparentType = SimpleType( scope );
         } else {*/
-	      parentType = SimpleType( scope, getIncludeFiles() );
+	      tqparentType = SimpleType( scope, getIncludeFiles() );
         //}
-        parentType->descForEdit().setTotalPointerDepth( 1 );
-        ctx->setContainer( parentType );
+        tqparentType->descForEdit().setTotalPointerDepth( 1 );
+        ctx->setContainer( tqparentType );
       }
 
       SimpleType global = ctx->global();
 
 	    if( dynamic_cast<SimpleTypeNamespace*>( &(*global) ) ) {
         SimpleTypeNamespace* globalNs = static_cast <SimpleTypeNamespace*>( &(*global) );
-				TQValueList<QPair<TQString, TQString> > localImports = ctx->imports();
-				for( TQValueList<QPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it )
+				TQValueList<TQPair<TQString, TQString> > localImports = ctx->imports();
+				for( TQValueList<TQPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it )
 					globalNs->addAliasMap( (*it).first, (*it).second );
 	    }
 
@@ -1988,8 +1988,8 @@ bool CppCodeCompletion::functionContains( FunctionDom f , int line, int col ) {
   if ( t.isEmpty() )
     return false;
 
-	//int i = t.find( '{' );
-	int i = t.find( '(' ); //This now includes the argument-list
+	//int i = t.tqfind( '{' );
+	int i = t.tqfind( '(' ); //This now includes the argument-list
 	if ( i == -1 )
     return false;
   int lineCols = 0;
@@ -2017,7 +2017,7 @@ void CppCodeCompletion::getFunctionBody( FunctionDom f , int& line, int& col ) {
 	if ( t.isEmpty() )
 		return;
 
-	int i = t.find( '{' );
+	int i = t.tqfind( '{' );
 	if ( i == -1 )
 		return;
 	i++;
@@ -2059,14 +2059,14 @@ void CppCodeCompletion::needRecoveryPoints() {
     if ( !ast ) {
       kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl;
 	    m_pSupport->parseFileAndDependencies( m_activeFileName, true );
-// 	    m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 );
+// 	    m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).tqarg( m_activeFileName ), 2000 );
 	    return;
     } else {
       computeRecoveryPointsLocked();
     }
 	  if ( this->d->recoveryPoints.isEmpty() ) {
 		  kdDebug( 9007 ) << "Failed to compute recovery-points for " << m_activeFileName << endl;
-// 		  m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).arg( m_activeFileName ), 1000 );
+// 		  m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).tqarg( m_activeFileName ), 1000 );
 	  } else {
 		  kdDebug( 9007 ) << "successfully computed recovery-points for " << m_activeFileName << endl;
 	  }
@@ -2080,7 +2080,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
   FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName );
 
   if ( !file ) {
-//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 );
+//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 );
     kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n";
     return SimpleType();
   }
@@ -2113,7 +2113,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
       c = strCurLine[ --pos ];
 
     if ( !( c.isLetterOrNumber() || c == '_' || c == ')' || c == ']' || c == '>' ) ) {
-      conf.invalidate();
+      conf.tqinvalidate();
       return SimpleType();
     }
   }
@@ -2280,7 +2280,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column
 
   CppCodeCompletionConfig * cfg = m_pSupport->codeCompletionConfig();
   if( cfg->usePermanentCaching() && contextItem ) {
-    conf.invalidate();
+    conf.tqinvalidate();
     m_cachedFromContext = contextItem;
   }
 
@@ -2323,7 +2323,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
   FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName );
 
   if ( !file ) {
-//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 );
+//     m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 );
     kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n";
     return ;
   }
@@ -2508,7 +2508,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
               --end_expr;
 
             if ( contents[ end_expr ] != ',' ) {
-              expr = TQString::null;
+              expr = TQString();
             } else {
               start_expr = expressionAt( contents, end_expr );
               expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace();
@@ -2555,8 +2555,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
             }
 						if( dynamic_cast<SimpleTypeNamespace*>( SimpleType::globalNamespace().data() ) ) {
 							SimpleTypeNamespace* globalNs = static_cast <SimpleTypeNamespace*>( SimpleType::globalNamespace().data() );
-							TQValueList<QPair<TQString, TQString> > localImports = ctx->imports();
-							for( TQValueList<QPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it )
+							TQValueList<TQPair<TQString, TQString> > localImports = ctx->imports();
+							for( TQValueList<TQPair<TQString, TQString> >::const_iterator it = localImports.begin(); it != localImports.end(); ++it )
 								globalNs->addAliasMap( (*it).first, (*it).second );
 						}
           } else {
@@ -2564,7 +2564,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
           }
 
           if ( !scope.isEmpty() ) {
-            SimpleType parentType;
+            SimpleType tqparentType;
 
 	          /*if( !m_cachedFromContext ) {
 		          TypePointer t = createGlobalNamespace();
@@ -2584,14 +2584,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
 	            d.setIncludeFiles( getIncludeFiles() );
 	            SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data();
               if ( i ) {
-                parentType = i;
+                tqparentType = i;
               } else {
-	              parentType = SimpleType( scope, getIncludeFiles() );
+	              tqparentType = SimpleType( scope, getIncludeFiles() );
               }
             } else {
-	            parentType = SimpleType( scope, getIncludeFiles() );
+	            tqparentType = SimpleType( scope, getIncludeFiles() );
             }
-            this_type = parentType;
+            this_type = tqparentType;
             this_type->descForEdit().setTotalPointerDepth( 1 );
             ctx->setContainer( this_type );
           }
@@ -2673,7 +2673,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
                                                                       						kdDebug(9007) << "------> found virtual keyword for class specifier '"
                                                                       									<< clazz->text() << "'" << endl;
                                                                       					}*/
-        } else if ( TQString( "virtual" ).find( keyword ) != -1 )
+        } else if ( TQString( "virtual" ).tqfind( keyword ) != -1 )
           m_blockForKeyword = true;
         else
           m_blockForKeyword = false;
@@ -2713,7 +2713,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
             --end_expr;
 
           if ( contents[ end_expr ] != ',' ) {
-            expr = TQString::null;
+            expr = TQString();
           } else {
             start_expr = expressionAt( contents, end_expr );
             expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace();
@@ -2756,7 +2756,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
 
   if ( ch2 == "::" ) {
     TQString str = clearComments( expr );
-    if ( !str.contains( '.' ) && !str.contains( "->" ) )        ///Necessary, because the expression may also be like user->BaseUser::
+    if ( !str.tqcontains( '.' ) && !str.tqcontains( "->" ) )        ///Necessary, because the expression may also be like user->BaseUser::
       isInstance = false;
   }
 
@@ -2790,7 +2790,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
           }
 	       if( !t->isNamespace() || invokedOnDemand || alwaysIncludeNamespaces )
             computeCompletionEntryList( t, entryList, t->scope(), false, depth );
-          t = t->parent();
+          t = t->tqparent();
           depth++;
         }
       }
@@ -2807,7 +2807,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
           }
 	       if ( ( (t->isNamespace() && invokedOnDemand) || alwaysIncludeNamespaces ) || ( first && isInstance ) )
             computeCompletionEntryList( t, entryList, t->scope(), t->isNamespace() ? true : isInstance, depth );
-          t = t->parent();
+          t = t->tqparent();
           depth++;
           first = false;
         }
@@ -2890,7 +2890,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
       if ( method )
         signatureList += computeSignatureList( method );
       if ( t )
-        t = t->parent();
+        t = t->tqparent();
     } while ( !ready && s );
 
     if ( !signatureList.isEmpty() ) {
@@ -2905,7 +2905,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
   ctx = 0;
 
   if ( cfg->usePermanentCaching() ) {
-    conf.invalidate();
+    conf.tqinvalidate();
     m_cachedFromContext = contextItem;
   }
 }
@@ -2972,7 +2972,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) {
   if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor )
     return ;
 
-// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).arg( m_activeFileName ), 1000 );
+// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).tqarg( m_activeFileName ), 1000 );
 
   computeRecoveryPointsLocked();
 }
@@ -2981,7 +2981,7 @@ void CppCodeCompletion::slotFileParsed( const TQString& fileName ) {
   if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor )
     return ;
 
-// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).arg( m_activeFileName ), 1000 );
+// 	m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).tqarg( m_activeFileName ), 1000 );
 
   emptyCache(); ///The cache has to be emptied, because the code-model changed. @todo Better: Only refresh the code-model(tell all code-model-types to refresh themselves on demand)
 
@@ -3016,7 +3016,7 @@ SimpleContext* CppCodeCompletion::computeContext( FunctionDefinitionAST * ast, i
 
           var.ptrList = ptrList;
           var.type = param->typeSpec() ->text() + ptrList.join( "" );
-          var.name = declaratorToString( param->declarator(), TQString::null, true );
+          var.name = declaratorToString( param->declarator(), TQString(), true );
           var.comment = param->comment();
           param->getStartPosition( &var.startLine, &var.startCol );
           param->getEndPosition( &var.endLine, &var.endCol );
@@ -3173,7 +3173,7 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen
 			name = usingDecl->name()->text();
 
   		if( !name.isNull() )
-	  		ctx->addImport( QPair<TQString, TQString>( "", name ) );
+	  		ctx->addImport( TQPair<TQString, TQString>( "", name ) );
 		}
 	}
 
@@ -3182,7 +3182,7 @@ void CppCodeCompletion::computeContext( SimpleContext*& ctx, DeclarationStatemen
 		TQString name;
 
 		if( namespaceAlias ->namespaceName() && namespaceAlias->aliasName() ) {
-			ctx->addImport( QPair<TQString, TQString>( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) );
+			ctx->addImport( TQPair<TQString, TQString>( namespaceAlias->namespaceName()->text(), namespaceAlias->aliasName()->text() ) );
 		}
 	}
 
@@ -3293,7 +3293,7 @@ FunctionDefinitionAST * CppCodeCompletion::functionDefinition( AST* node ) {
   while ( node ) {
     if ( node->nodeType() == NodeType_FunctionDefinition )
       return static_cast<FunctionDefinitionAST*>( node );
-    node = node->parent();
+    node = node->tqparent();
   }
   return 0;
 }
@@ -3360,7 +3360,7 @@ TQString codeModelAccessToString( CodeModelItem::Access access ) {
 #define MAXCOMMENTCOLUMNS 45
 
 
-TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) {
+TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const ItemDom& item ) {
 	--m_maxComments;
 	static TQString maxReached = " ";
 	if( m_maxComments < 0 ) {
@@ -3371,8 +3371,8 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite
   item->getStartPosition( &line, &col );
 
 
-  if ( !parent->scope().isEmpty() ) {
-    ret += "Container: " + parent->fullTypeResolvedWithScope();
+  if ( !tqparent->scope().isEmpty() ) {
+    ret += "Container: " + tqparent->fullTypeResolvedWithScope();
   }
 
   if ( item->isEnum() ) {
@@ -3451,7 +3451,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite
     ret += "\nKind: Typedef";
     if ( t ) {
       ret += "\nType: " + t->type();
-      LocateResult r = parent->locateDecType( t->type() );
+      LocateResult r = tqparent->locateDecType( t->type() );
       if ( r.desc().resolved() )
         ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope();
       else
@@ -3463,13 +3463,13 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite
     ret += "\nKind: Class";
   }
 
-  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col );
+  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col );
   if ( !item->comment().isEmpty() )
     ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" );
   return ret;
 }
 
-TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) {
+TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag ) {
 	--m_maxComments;
 	static TQString maxReached = " ";
 	if( m_maxComments < 0 ) {
@@ -3480,8 +3480,8 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag )
   tag.getStartPosition( &line, &col );
   TQString ret; // = tag.comment();
 
-  if ( !parent->scope().isEmpty() ) {
-    ret += "Container: " + parent->fullTypeResolvedWithScope();
+  if ( !tqparent->scope().isEmpty() ) {
+    ret += "Container: " + tqparent->fullTypeResolvedWithScope();
   }
   /*
   if( tag.kind() == Tag::Kind_Enum ) {
@@ -3571,7 +3571,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag )
   if ( tag.kind() == Tag::Kind_Typedef ) {
     ret += "\nKind: Typedef";
     ret += "\nType: " + tagType( tag );
-    LocateResult r = parent->locateDecType( tagType( tag ) );
+    LocateResult r = tqparent->locateDecType( tagType( tag ) );
     if ( r.desc().resolved() )
       ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope();
     else
@@ -3585,7 +3585,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag )
     ret += "\nKind: Struct";
   }
 
-  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col );
+  ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col );
   if ( !tag.comment().isEmpty() ) {
     ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" );
   }
@@ -3687,8 +3687,8 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueLis
     args << Catalog::QueryArgument( "name", fullname );
 
 
-	  TQValueList<LocateResult> parents = typeR->getBases( );
-    for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) {
+	  TQValueList<LocateResult> tqparents = typeR->getBases( );
+    for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
       if ( !( *it ) ->resolved() )
         continue;
       SimpleType tp = SimpleType( ( *it ) ->resolved() );
@@ -3807,14 +3807,14 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
       break;
     }
 
-    e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting );
+    e.userdata = TQString( "%1%2%3%4%5" ).tqarg( num ).tqarg( depth ).tqarg( className ).tqarg( sortPosition ).tqarg( subSorting );
 
     if ( m_completionMode != SignalCompletion ) {
       if ( !type->isNamespace() ) {
         if ( num == 1 )
-          e.postfix += ";   (protected)"; // in " + proc.parentType() + ")";
+          e.postfix += ";   (protected)"; // in " + proc.tqparentType() + ")";
         if ( num == 2 )
-          e.postfix += ";   (private)"; // in " + proc.parentType() + ")";
+          e.postfix += ";   (private)"; // in " + proc.tqparentType() + ")";
       }
     }
 
@@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth );
   }
 
-	TQValueList<LocateResult> parents = type->getBases( );
+	TQValueList<LocateResult> tqparents = type->getBases( );
 
-	for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) {
+	for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
     if ( !( *it ) ->resolved() )
       continue;
 
@@ -3962,7 +3962,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     computeCompletionEntryList( type, entryList, scope->namespaceList(), isInstance, depth );
 }
 
-void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) {
+void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) {
   Debug d( "#cel#" );
   if ( !safetyCounter || !d )
     return ;
@@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
     if ( isInstance )
       continue;
 
-    entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 );
+    entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 6 );
 
     entryList << entry;
 
@@ -3993,7 +3993,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
   }
 }
 
-void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) {
+void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) {
   Debug d( "#cel#" );
   if ( !safetyCounter || !d )
     return ;
@@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType
     entry.prefix = stringMult( depth, "  " ) + entry.prefix.stripWhiteSpace();
     entry.text = klass->name();
     entry.comment = commentFromItem( type, klass.data() );
-    entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 );
+    entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 5 );
     entryList << entry;
   }
 }
@@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     if ( meth->isStatic() )
       subSorting = 5;
 
-    entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting );
+    entry.userdata += TQString( "%1%2%3%4%5" ).tqarg( meth->access() ).tqarg( depth ).tqarg( className ).tqarg( 1 ).tqarg( subSorting );
 
     if ( m_completionMode == VirtualDeclCompletion )
       entry.text += text + ";";
@@ -4187,7 +4187,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     CodeCompletionEntry entry;
     entry.text = attr->name();
     entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) );
-    entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 );
+    entry.userdata += TQString( "%1%2%3%4" ).tqarg( attr->access() ).tqarg( depth ).tqarg( className ).tqarg( 2 );
 
 
     if ( !attr->isEnumeratorVariable() ) {
@@ -4261,7 +4261,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim
 		}
 	}
 
-  addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).arg( expr.expr() ).arg( res->fullNameChain() ).arg( resolutionType ), 5000 );
+  addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).tqarg( expr.expr() ).tqarg( res->fullNameChain() ).tqarg( resolutionType ), 5000 );
 
   return res;
 }
@@ -4386,7 +4386,7 @@ void CppCodeCompletion::jumpCursorContext( FunctionType f )
 		}
 		// Unresolved, maybe its a named enumeration?
 		else if ( type && type.trace() ) {
-			TQValueList< QPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = type.trace()->trace();
+			TQValueList< TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = type.trace()->trace();
 			if ( !trace.isEmpty() ) {
 				if ( trace.begin() != trace.end() ) {
 					d = ( *trace.begin() ).first.decl;
@@ -4417,7 +4417,7 @@ TQString CppCodeCompletion::createTypeInfoString( int line, int column )
 	if ( type->resolved() ) 
 	{ 
 		TQString scope = type->resolved()->scope().join("::");
-		int pos = scope.findRev("::");
+		int pos = scope.tqfindRev("::");
 		if ( scope.isEmpty() || pos == -1 )
 		{
 			scope = "::";
@@ -4467,7 +4467,7 @@ bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQS
 		//It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>').
 		isIncludeDirective = true;
 		usedProjectFiles = false;
-		TQStringList captured = includeRx.capturedTexts();
+		TQStringList captured = includeRx.tqcapturedTexts();
 		if( captured.size() == 3 ) {
 			Dependence d;
 			d.first = captured[1];
diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h
index 67f7b10b..4b619984 100644
--- a/languages/cpp/cppcodecompletion.h
+++ b/languages/cpp/cppcodecompletion.h
@@ -46,14 +46,15 @@
 #include <tqpopupmenu.h>
 class PopupTracker : public TQObject {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	static PopupTracker* pt;
 	
 	static uint pendingPopups;
 	
-	static TQPopupMenu* createPopup( TQWidget* parent ) {
+	static TQPopupMenu* createPopup( TQWidget* tqparent ) {
 		if( !pt ) pt = new PopupTracker();
-		TQPopupMenu* m = new TQPopupMenu( parent );
+		TQPopupMenu* m = new TQPopupMenu( tqparent );
 		++pendingPopups;
 		connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) );
 		return m;
@@ -91,9 +92,10 @@ struct ExpressionInfo;
 
 typedef KSharedPtr<SimpleTypeImpl> TypePointer;
 
-class CppCodeCompletion : public QObject
+class CppCodeCompletion : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
     friend class SimpleType;
 	enum CompletionMode
@@ -187,8 +189,8 @@ private:
 	bool functionContains( FunctionDom f , int line, int col );
 	void getFunctionBody( FunctionDom f , int& line, int& col );
 	void selectItem( ItemDom item );
-    void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" );
-    void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" );
+    void addTypePopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" );
+    void addTypeClassPopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" );
   TQValueList<TQStringList> computeSignatureList( CppEvaluation::EvaluationResult function );
 	void integratePart( KParts::Part* part );
 	void setupCodeInformationRepository();
@@ -233,8 +235,8 @@ private:
 	void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, NamespaceDom scope, bool isInstance, int depth   );
 	void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const FunctionList& methods, bool isInstance, int depth );
 	void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const VariableList& attributes, bool isInstance, int depth );
-	void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth );
-	void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth );
+	void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth );
+	void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth );
 	void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const NamespaceList& lst, bool isInstance, int depth );
 
 	SimpleContext* computeContext( FunctionDefinitionAST* ast, int line, int col, int lineOffset, int colOffset );
@@ -266,7 +268,7 @@ private:
     TQGuardedPtr<CppSupportPart> m_pSupport;
 	TQTimer* m_ccTimer;
     TQTimer* m_showStatusTextTimer;
-    TQValueList<QPair<int, TQString> > m_statusTextList;
+    TQValueList<TQPair<int, TQString> > m_statusTextList;
 
     void fitContextItem( int nLine, int nColumn );
 	void needRecoveryPoints();
@@ -296,8 +298,8 @@ private:
     //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons)
     void setMaxComments( int count );
     
-    TQString commentFromItem( const SimpleType& parent, const ItemDom& item );
-    TQString commentFromTag( const SimpleType& parent, Tag& tag );
+    TQString commentFromItem( const SimpleType& tqparent, const ItemDom& item );
+    TQString commentFromTag( const SimpleType& tqparent, Tag& tag );
         
     ItemDom m_cachedFromContext;  ///Can be a function or a class, representing the position from where the last completion was started. Necessary as long as all imports are put into the global namespace.
 	
diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp
index 9ecca5f4..104f422c 100644
--- a/languages/cpp/cppcodecompletionconfig.cpp
+++ b/languages/cpp/cppcodecompletionconfig.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <tqdom.h>
 
-TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" );
+TQString CppCodeCompletionConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/codecompletion" );
 
 CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom )
 		: TQObject( part ), m_part( part ), m_dom( dom )
diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h
index 75f0d570..924f674d 100644
--- a/languages/cpp/cppcodecompletionconfig.h
+++ b/languages/cpp/cppcodecompletionconfig.h
@@ -22,9 +22,10 @@ class TQDomDocument;
 /**
 @author Roberto Raggi
 */
-class CppCodeCompletionConfig : public QObject
+class CppCodeCompletionConfig : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	CppCodeCompletionConfig( CppSupportPart* part, TQDomDocument* dom );
 	virtual ~CppCodeCompletionConfig();
diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp
index b84185f5..a20c2339 100644
--- a/languages/cpp/cppevaluation.cpp
+++ b/languages/cpp/cppevaluation.cpp
@@ -102,7 +102,7 @@ OperatorIdentification UnaryOperator::identify( TQString& str ) {
 
 EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) {
   if( !checkParams( params ) ) {
-  log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) );
+  log( TQString("parameter-check failed: %1 params: ").tqarg( params.size() ) + printTypeList( params ) );
     return EvaluationResult();
   } else {
     EvaluationResult t = unaryApply( params.front(), innerParams );
@@ -433,7 +433,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr,
       }
 
       depth++;
-			if( !ready ) current = current->parent();
+			if( !ready ) current = current->tqparent();
 		}
 	}
 	/*
@@ -455,7 +455,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr,
 
 		if( !bestRet ||
 		/** Did we find a constructor within a class? */
-		(type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->parent()->desc() && bestRet->resolved()->asFunction() ) ) ) {
+		(type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->tqparent()->desc() && bestRet->resolved()->asFunction() ) ) ) {
     /*if ( type && type->resolved() )
     {*/
       EvaluationResult ret = type;
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 7b2d98cd..b67597e6 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -37,27 +37,27 @@
 #include <filetemplate.h>
 
 CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part,
-        TQWidget *parent, const char *name, bool modal )
-		: ImplementationWidget( part, parent, name, modal )
+        TQWidget *tqparent, const char *name, bool modal )
+		: ImplementationWidget( part, tqparent, name, modal )
 {}
 
 TQStringList CppImplementationWidget::createClassFiles()
 {
-	TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\npublic:\n    $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n";
-	TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n    :$BASECLASSNAME$(parent, name)\n{\n}\n";
+	TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nTQ_OBJECT\npublic:\n    $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n";
+	TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *tqparent, const char *name)\n    :$BASECLASSNAME$(tqparent, name)\n{\n}\n";
 	if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem )
-		template_cpp += "\n#include \"$MOCINCLUDE$\"\n";
+		template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n";
 
 	TQFileInfo formInfo( m_formName );
-	template_h.replace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" );
-	template_h.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() );
-	template_h.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName );
-	template_h.replace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() );
+	template_h.tqreplace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" );
+	template_h.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() );
+	template_h.tqreplace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName );
+	template_h.tqreplace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() );
 
-	template_cpp.replace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" );
-	template_cpp.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() );
-	template_cpp.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName );
-	template_cpp.replace( TQRegExp( "\\$MOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" );
+	template_cpp.tqreplace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" );
+	template_cpp.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() );
+	template_cpp.tqreplace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName );
+	template_cpp.tqreplace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".tqmoc" );
 
 	template_h = FileTemplate::read( m_part, "h" ) + template_h;
 	template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp;
diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h
index b79b0aff..da1ef71b 100644
--- a/languages/cpp/cppimplementationwidget.h
+++ b/languages/cpp/cppimplementationwidget.h
@@ -30,8 +30,9 @@ class CppSupportPart;
 class CppImplementationWidget : public ImplementationWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false );
+	CppImplementationWidget( KDevLanguageSupport *part, TQWidget* tqparent = 0, const char* name = 0, bool modal = false );
 
 protected:
 	virtual TQStringList createClassFiles();
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index fc338900..773f36ae 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -52,28 +52,13 @@
 
 #include "classgeneratorconfig.h"
 
-TQString QRegExp_escape( const TQString& str )
+TQString TQRegExp_escape( const TQString& str )
 {
-#if QT_VERSION >= 0x030100
 	return TQRegExp::escape( str );
-#else
-	// this block is copyrighted by Trolltech AS (GPL)
-	static const char meta[] = "$()*+.?[\\]^{|}";
-	TQString quoted = str;
-	int i = 0;
-
-	while ( i < ( int ) quoted.length() )
-	{
-		if ( strchr( meta, quoted[ i ].latin1() ) != 0 )
-			quoted.insert( i++, "\\" );
-		i++;
-	}
-	return quoted;
-#endif
 }
 
-CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name )
-		: CppNewClassDialogBase( parent, name ), myModel( 0 )
+CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent, const char *name )
+		: CppNewClassDialogBase( tqparent, name ), myModel( 0 )
 {
 	headerModified = false;
 	baseincludeModified = false;
@@ -161,7 +146,7 @@ TQStringList& gres( TQStringList &list, const TQRegExp & rx, const TQString & af
 	TQStringList::Iterator it = list.begin();
 	while ( it != list.end() )
 	{
-		( *it ).replace( rx, after );
+		( *it ).tqreplace( rx, after );
 		++it;
 	}
 	return list;
@@ -175,13 +160,7 @@ void CppNewClassDialog::addCompletionBasenameNamespacesRecursive( const Namespac
 
 	if ( ! namespaceParent.isEmpty() )
 	{
-#if QT_VERSION >= 0x030200
 		classList.gres( TQRegExp( "^" ), namespaceParent + "::" );
-#else
-
-		gres( classList, TQRegExp( "^" ), namespaceParent + "::" );
-#endif
-
 	}
 
 	compBasename -> insertItems( classList );
@@ -247,13 +226,13 @@ void CppNewClassDialog::classNameChanged( const TQString &text )
 		default:
 			;
 		}
-		header = header.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" );
+		header = header.tqreplace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" );
 		header_edit->setText( header );
 	}
 	if ( !implementationModified )
 	{
 		TQString implementation;
-		if ( str.contains( "template" ) )
+		if ( str.tqcontains( "template" ) )
 			implementation = str + "_impl" + interface_suffix;
 		else
 			implementation = str + implementation_suffix;
@@ -268,7 +247,7 @@ void CppNewClassDialog::classNameChanged( const TQString &text )
 		default:
 			;
 		}
-		implementation = implementation.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" );
+		implementation = implementation.tqreplace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" );
 		implementation_edit->setText( implementation );
 	}
 }
@@ -286,7 +265,7 @@ void CppNewClassDialog::baseclassname_changed( const TQString &text )
 	{
 		TQString header = text;
 
-		// handle Qt classes in a special way.
+		// handle TQt classes in a special way.
 		if( m_part->qtBuildConfig()->isUsed() && header.startsWith( "Q" ) )
 		{
 			if( m_part->qtBuildConfig()->version() == 3 )
@@ -300,9 +279,9 @@ void CppNewClassDialog::baseclassname_changed( const TQString &text )
 		}
 		else
 		{
-			if ( header.contains( TQRegExp( "::" ) ) )
-				header = header.mid( header.findRev( TQRegExp( "::" ) ) + 2 );
-			header = header.replace( TQRegExp( " *<.*>" ), "" );
+			if ( header.tqcontains( TQRegExp( "::" ) ) )
+				header = header.mid( header.tqfindRev( TQRegExp( "::" ) ) + 2 );
+			header = header.tqreplace( TQRegExp( " *<.*>" ), "" );
 			header += interface_suffix;
 
 			switch ( gen_config->superCase() )
@@ -369,7 +348,7 @@ void CppNewClassDialog::checkObjCInheritance( int val )
 			objc_box->setChecked( false );
 }
 
-void CppNewClassDialog::checkQWidgetInheritance( int val )
+void CppNewClassDialog::checkTQWidgetInheritance( int val )
 {
 	if ( val )
 	{
@@ -395,11 +374,11 @@ void CppNewClassDialog::checkQWidgetInheritance( int val )
 		if ( baseclasses_view->childCount() == 0 )
 		{
 			addBaseClass();
-			basename_edit->setText( "TQWidget" );
+			basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING );
 		}
 		/*        constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() +
-		            "(TQWidget *parent, const char *name):\n    TQWidget(parent, name)\n{\n}\n");
-		        constructors_h_edit->append(classname_edit->text() + "(TQWidget *parent, const char *name);\n");*/
+		            "(TQWidget *tqparent, const char *name):\n    TQWidget(tqparent, name)\n{\n}\n");
+		        constructors_h_edit->append(classname_edit->text() + "(TQWidget *tqparent, const char *name);\n");*/
 	}
 
 	if ( val && ( baseclasses_view->childCount() > 1 ) )
@@ -417,7 +396,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val )
 	if ( baseclasses_view->childCount() == 0 )
 	{
 		addBaseClass();
-		basename_edit->setText( "TQObject" );
+		basename_edit->setText( TQOBJECT_OBJECT_NAME_STRING );
 	}
 
 
@@ -482,11 +461,11 @@ void CppNewClassDialog::addBaseClass()
 	if ( baseclasses_view->selectedItem() )
 		baseclasses_view->selectedItem() ->setSelected( false );
 	TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(),
-	                                       TQString::null, "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString::null, "false" );
+	                                       TQString(), "public", TQString( "%1" ).tqarg( scope_box->currentItem() ), TQString(), "false" );
 	setStateOfInheritanceEditors( true );
 	public_button->setChecked( true );
 	virtual_box->setChecked( false );
-	basename_edit->setText( TQString::null );
+	basename_edit->setText( TQString() );
 	basename_edit->setFocus();
 	baseclasses_view->setSelected( it, true );
 }
@@ -537,23 +516,23 @@ void CppNewClassDialog::remBaseClassOnly()
 void CppNewClassDialog::remClassFromAdv( TQString text )
 {
 	// Strip off namespace qualification
-	if ( text.contains( "::" ) )
-		text = text.mid( text.findRev( "::" ) + 2 );
+	if ( text.tqcontains( "::" ) )
+		text = text.mid( text.tqfindRev( "::" ) + 2 );
 
 	removeTemplateParams( text );
 	TQListViewItem *it = 0;
-	if ( ( it = access_view->findItem( text, 0 ) ) )
+	if ( ( it = access_view->tqfindItem( text, 0 ) ) )
 		delete it;
-	if ( ( it = methods_view->findItem( text, 0 ) ) )
+	if ( ( it = methods_view->tqfindItem( text, 0 ) ) )
 		delete it;
-	if ( ( it = constructors_view->findItem( text, 0 ) ) )
+	if ( ( it = constructors_view->tqfindItem( text, 0 ) ) )
 	{
 		/// @todo changing constructors text in constructors_cpp_edit
 		// and constructors_h_edit must be implemented
 
 		/*        int *para = new int(1);
 		        int *index = new int(1);
-		        if (constructors_cpp_edit->find(text + "(", true, false, true, para, index))
+		        if (constructors_cpp_edit->tqfind(text + "(", true, false, true, para, index))
 		        {
 		            qWarning("%s( found", text.latin1());
 		            if (para) constructors_cpp_edit->removeParagraph(*para);
@@ -610,7 +589,7 @@ void CppNewClassDialog::scopeboxActivated( int value )
 {
 	if ( baseclasses_view->selectedItem() )
 	{
-		baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) );
+		baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).tqarg( value ) );
 	}
 }
 
@@ -636,19 +615,19 @@ void CppNewClassDialog::currBaseSelected( TQListViewItem *it )
 	basename_edit->setText( it->text( 0 ) );
 	baseinclude_edit->setText( it->text( 3 ) );
 	scope_box->setCurrentItem( it->text( 2 ).toInt() );
-	if ( it->text( 1 ).contains( "private" ) )
+	if ( it->text( 1 ).tqcontains( "private" ) )
 		private_button->setChecked( true );
 	else
 		private_button->setChecked( false );
-	if ( it->text( 1 ).contains( "protected" ) )
+	if ( it->text( 1 ).tqcontains( "protected" ) )
 		protected_button->setChecked( true );
 	else
 		protected_button->setChecked( false );
-	if ( it->text( 1 ).contains( "public" ) )
+	if ( it->text( 1 ).tqcontains( "public" ) )
 		public_button->setChecked( true );
 	else
 		public_button->setChecked( false );
-	if ( it->text( 1 ).contains( "virtual" ) )
+	if ( it->text( 1 ).tqcontains( "virtual" ) )
 		virtual_box->setChecked( true );
 	else
 		virtual_box->setChecked( false );
@@ -725,7 +704,7 @@ void CppNewClassDialog::updateConstructorsOrder()
 
 	while ( it.current() )
 	{
-		if ( ( c_it = constructors_view->findItem( it.current() ->text( 0 ), 0 ) ) )
+		if ( ( c_it = constructors_view->tqfindItem( it.current() ->text( 0 ), 0 ) ) )
 		{
 			c_it->moveItem( fc_it );
 			fc_it = c_it;
@@ -776,7 +755,7 @@ void CppNewClassDialog::changeToPublic()
 void CppNewClassDialog::changeToInherited()
 {
 	if ( access_view->selectedItem() )
-		access_view->selectedItem() ->setText( 2, TQString::null );
+		access_view->selectedItem() ->setText( 2, TQString() );
 }
 
 void CppNewClassDialog::newTabSelected( const TQString& /*text*/ )
@@ -817,11 +796,11 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance )
 	TQStringList clNamespace = currNamespace;
 	bool clFullQualified = false;
 
-	if ( clName.contains( "::" ) )
+	if ( clName.tqcontains( "::" ) )
 	{
 		// Full qualified, override imported namespace
 		clFullQualified = true;
-		int splitpoint = clName.findRev( "::" );
+		int splitpoint = clName.tqfindRev( "::" );
 		clNamespace = TQStringList::split( "::", clName.left( splitpoint ) );
 		clName = clName.mid( splitpoint + 2 );
 	}
@@ -870,10 +849,10 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance )
 		PListViewItem<ClassDom> *over = new PListViewItem<ClassDom>( *classIt, methods_view, ( *classIt ) ->name() );
 		over->templateAddition = templateAdd;
 		TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) );
-		TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) );
+		TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (TQt-specific)" ) );
 		PListViewItem<ClassDom> *access = new PListViewItem<ClassDom>( *classIt, access_view, ( *classIt ) ->name() );
 		TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) );
-		TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) );
+		TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (TQt-specific)" ) );
 		TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) );
 
 		FunctionList functionList = ( *classIt ) ->functionList();
@@ -896,13 +875,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance )
 
 					TQString inhModifier;
 					//protected inheritance gives protected attributes
-					if ( inheritance.contains( "protected" ) )
+					if ( inheritance.tqcontains( "protected" ) )
 						inhModifier = "protected";
 					//private inheritance gives private attributes
-					else if ( inheritance.contains( "private" ) )
+					else if ( inheritance.tqcontains( "private" ) )
 						inhModifier = "private";
 					//public inheritance gives protected and public attributes
-					else if ( inheritance.contains( "public" ) )
+					else if ( inheritance.tqcontains( "public" ) )
 						inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected";
 					addToUpgradeList( access_slots, *methodIt, inhModifier );
 				}
@@ -917,13 +896,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance )
 					// see what modifier is given for the base class
 					TQString inhModifier;
 					//protected inheritance gives protected methods
-					if ( inheritance.contains( "protected" ) )
+					if ( inheritance.tqcontains( "protected" ) )
 						inhModifier = "protected";
 					//private inheritance gives private methods
-					else if ( inheritance.contains( "private" ) )
+					else if ( inheritance.tqcontains( "private" ) )
 						inhModifier = "private";
 					//public inheritance gives protected and public methods
-					else if ( inheritance.contains( "public" ) )
+					else if ( inheritance.tqcontains( "public" ) )
 						inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected";
 					addToUpgradeList( access_methods, *methodIt, inhModifier );
 				}
@@ -938,13 +917,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance )
 			{
 				TQString inhModifier;
 				//protected inheritance gives protected attributes
-				if ( inheritance.contains( "protected" ) )
+				if ( inheritance.tqcontains( "protected" ) )
 					inhModifier = "protected";
 				//private inheritance gives private attributes
-				else if ( inheritance.contains( "private" ) )
+				else if ( inheritance.tqcontains( "private" ) )
 					inhModifier = "private";
 				//public inheritance gives protected and public attributes
-				else if ( inheritance.contains( "public" ) )
+				else if ( inheritance.tqcontains( "public" ) )
 					inhModifier = ( *varIt ) ->access() == CodeModelItem::Public ? "public" : "protected";
 				addToUpgradeList( access_attrs, *varIt, inhModifier );
 			}
@@ -958,8 +937,8 @@ bool CppNewClassDialog::isConstructor( TQString className, const FunctionDom &me
 	if ( ( className == method->name() ) )
 	{
 		qWarning( "1x" );
-		if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).contains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) )
-			//        if ( method->asString().contains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) )
+		if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).tqcontains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) )
+			//        if ( method->asString().tqcontains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) )
 			return false;
 		else
 			return true;
@@ -973,21 +952,21 @@ void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, Functio
 	new PCheckListItem<FunctionDom>( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton );
 }
 
-void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method )
+void CppNewClassDialog::addToMethodsList( TQListViewItem *tqparent, FunctionDom method )
 {
-	PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox );
-	method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) );
+	PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox );
+	method->isAbstract() ? it->setText( 1, i18n( "tqreplace" ) ) : it->setText( 1, i18n( "extend" ) );
 }
 
-void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier )
+void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier )
 {
-	PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ) );
+	PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ) );
 	it->setText( 1, modifier );
 }
 
-void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier )
+void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier )
 {
-	PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, parent, m_part->formatModelItem( attr.data() ) );
+	PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, tqparent, m_part->formatModelItem( attr.data() ) );
 	it->setText( 1, modifier );
 }
 
@@ -998,11 +977,11 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance )
 	TQStringList clNamespace = currNamespace;
 	bool clFullQualified = false;
 
-	if ( clName.contains( "::" ) )
+	if ( clName.tqcontains( "::" ) )
 	{
 		// Full qualified, override imported namespace
 		clFullQualified = true;
-		int splitpoint = clName.findRev( "::" );
+		int splitpoint = clName.tqfindRev( "::" );
 		clNamespace = TQStringList::split( "::", clName.left( splitpoint ) );
 		clName = clName.mid( splitpoint + 2 );
 	}
@@ -1029,10 +1008,10 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance )
 		PListViewItem<ClassDom> *over = new PListViewItem<ClassDom>( *classIt, methods_view, ( *classIt ) ->name() );
 		over->templateAddition = templateAdd;
 		TQListViewItem *over_methods = new TQListViewItem( over, i18n( "Methods" ) );
-		TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (Qt-specific)" ) );
+		TQListViewItem *over_slots = new TQListViewItem( over, i18n( "Slots (TQt-specific)" ) );
 		PListViewItem<ClassDom> *access = new PListViewItem<ClassDom>( *classIt, access_view, ( *classIt ) ->name() );
 		TQListViewItem *access_methods = new TQListViewItem( access, i18n( "Methods" ) );
-		TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (Qt-specific)" ) );
+		TQListViewItem *access_slots = new TQListViewItem( access, i18n( "Slots (TQt-specific)" ) );
 		TQListViewItem *access_attrs = new TQListViewItem( access, i18n( "Attributes" ) );
 
 		FunctionList functionList = ( *classIt ) ->functionList();
@@ -1055,13 +1034,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance )
 
 					TQString inhModifier;
 					//protected inheritance gives protected attributes
-					if ( inheritance.contains( "protected" ) )
+					if ( inheritance.tqcontains( "protected" ) )
 						inhModifier = "protected";
 					//private inheritance gives private attributes
-					else if ( inheritance.contains( "private" ) )
+					else if ( inheritance.tqcontains( "private" ) )
 						inhModifier = "private";
 					//public inheritance gives protected and public attributes
-					else if ( inheritance.contains( "public" ) )
+					else if ( inheritance.tqcontains( "public" ) )
 						inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected";
 					addToUpgradeList( access_slots, *methodIt, inhModifier );
 				}
@@ -1076,13 +1055,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance )
 					//see what modifier is given for the base class
 					TQString inhModifier;
 					//protected inheritance gives protected methods
-					if ( inheritance.contains( "protected" ) )
+					if ( inheritance.tqcontains( "protected" ) )
 						inhModifier = "protected";
 					//private inheritance gives private methods
-					else if ( inheritance.contains( "private" ) )
+					else if ( inheritance.tqcontains( "private" ) )
 						inhModifier = "private";
 					//public inheritance gives protected and public methods
-					else if ( inheritance.contains( "public" ) )
+					else if ( inheritance.tqcontains( "public" ) )
 						inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected";
 					addToUpgradeList( access_methods, *methodIt, inhModifier );
 				}
@@ -1097,13 +1076,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance )
 			{
 				TQString inhModifier;
 				//protected inheritance gives protected attributes
-				if ( inheritance.contains( "protected" ) )
+				if ( inheritance.tqcontains( "protected" ) )
 					inhModifier = "protected";
 				//private inheritance gives private attributes
-				else if ( inheritance.contains( "private" ) )
+				else if ( inheritance.tqcontains( "private" ) )
 					inhModifier = "private";
 				//public inheritance gives protected and public attributes
-				else if ( inheritance.contains( "public" ) )
+				else if ( inheritance.tqcontains( "public" ) )
 					inhModifier = ( *varIt ) ->access() == CodeModelItem::Public ? "public" : "protected";
 				addToUpgradeList( access_attrs, *varIt, inhModifier );
 			}
@@ -1132,7 +1111,7 @@ void CppNewClassDialog::clearConstructorsList( bool clean )
 	        TQListViewItemIterator it( constructors_view );
 	        while ( it.current() )
 	        {
-	            if ( ! currBaseClasses.contains(it.current().text(0)) )
+	            if ( ! currBaseClasses.tqcontains(it.current().text(0)) )
 	                delete it.current();
 	            ++it;
 	        }
@@ -1160,9 +1139,9 @@ void CppNewClassDialog::setAccessForItem( TQListViewItem *curr, TQString newAcce
 	if ( !curr->text( 2 ).isEmpty() )
 	{
 		if ( ( curr->text( 2 ) == "private" ) && ( ( newAccess == "public" ) || ( newAccess == "protected" ) ) )
-			curr->setText( 2, TQString::null );
+			curr->setText( 2, TQString() );
 		if ( ( curr->text( 2 ) == "protected" ) && ( ( newAccess == "public" ) && ( isPublic ) ) )
-			curr->setText( 2, TQString::null );
+			curr->setText( 2, TQString() );
 	}
 }
 
@@ -1170,7 +1149,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess
 {
 	TQListViewItem * base;
 
-	if ( ( base = access_view->findItem( baseclass, 0 ) ) )
+	if ( ( base = access_view->tqfindItem( baseclass, 0 ) ) )
 	{
 		TQListViewItemIterator it( base );
 		while ( it.current() )
@@ -1192,7 +1171,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess
 
 void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ )
 {
-	if ( item && ( ( button == LeftButton ) || ( button == RightButton ) ) && ( item->depth() > 1 ) )
+	if ( item && ( ( button == Qt::LeftButton ) || ( button == Qt::RightButton ) ) && ( item->depth() > 1 ) )
 	{
 		accessMenu->setItemEnabled( 1, true );
 		accessMenu->setItemEnabled( 2, true );
@@ -1217,7 +1196,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewIt
 
 void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ )
 {
-	if ( item && ( button == RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) )
+	if ( item && ( button == Qt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) )
 	{
 		overMenu->exec( p );
 	}
@@ -1232,7 +1211,7 @@ void CppNewClassDialog::extendFunctionality()
 void CppNewClassDialog::replaceFunctionality()
 {
 	if ( methods_view->selectedItem() )
-		methods_view->selectedItem() ->setText( 1, i18n( "replace" ) );
+		methods_view->selectedItem() ->setText( 1, i18n( "tqreplace" ) );
 }
 
 void CppNewClassDialog::selectall_button_clicked()
@@ -1249,7 +1228,7 @@ void CppNewClassDialog::selectall_button_clicked()
 
 void CppNewClassDialog::to_constructors_list_clicked()
 {
-	TQString templateAdd = templateStrFormatted().isEmpty() ? TQString::null : templateStrFormatted() + "\n";
+	TQString templateAdd = templateStrFormatted().isEmpty() ? TQString() : templateStrFormatted() + "\n";
 	TQString constructor_h = classNameFormatted();
 	TQString constructor_cpp = templateAdd + classNameFormatted() + templateParamsFormatted() + "::" + classNameFormatted();
 	constructor_h += "(";
@@ -1265,13 +1244,13 @@ void CppNewClassDialog::to_constructors_list_clicked()
 		PCheckListItem<FunctionDom> *curr;
 		if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) )
 		{
-			if ( curr->isOn() && curr->parent() )
+			if ( curr->isOn() && curr->tqparent() )
 			{
 				//fill the base classes list
 				base += base.isEmpty() ? ": " : ", ";
-				base += curr->parent() ->text( 0 );
+				base += curr->tqparent() ->text( 0 );
 				PCheckListItem<ClassDom> *p;
-				if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->parent() ) ) )
+				if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->tqparent() ) ) )
 				{
 					base += p->templateAddition;
 				}
@@ -1289,8 +1268,8 @@ void CppNewClassDialog::to_constructors_list_clicked()
 					cparams += ( *argIt ) ->type() + " ";
 					if ( ( *argIt ) ->name().isEmpty() )
 					{
-						cparams += TQString( "arg%1" ).arg( unnamed );
-						bparams += TQString( "arg%1" ).arg( unnamed++ );
+						cparams += TQString( "arg%1" ).tqarg( unnamed );
+						bparams += TQString( "arg%1" ).tqarg( unnamed++ );
 					}
 					else
 					{
@@ -1334,13 +1313,13 @@ bool CppNewClassDialog::ClassGenerator::validateInput()
 {
 	className = dlg.classname_edit->text().simplifyWhiteSpace();
 	TQString temp = className;
-	className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" );
-	templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" );
-	templateStr.replace( TQRegExp( " *class *$" ), "" );
+	className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" );
+	templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" );
+	templateStr.tqreplace( TQRegExp( " *class *$" ), "" );
 
 	templateParams = templateStr;
-	templateParams.replace( TQRegExp( "^ *template *" ), "" );
-	templateParams.replace( TQRegExp( " *class *" ), "" );
+	templateParams.tqreplace( TQRegExp( "^ *template *" ), "" );
+	templateParams.tqreplace( TQRegExp( " *class *" ), "" );
 	templateParams.simplifyWhiteSpace();
 
 	if ( className.isEmpty() )
@@ -1363,7 +1342,7 @@ bool CppNewClassDialog::ClassGenerator::validateInput()
 	}
 
 	/// \FIXME
-    if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesQMakeBuildSystem) )
+    if ( ( header.tqfind( '/' ) != -1 || implementation.tqfind( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) )
 	{
 		KMessageBox::error( &dlg, i18n( "Generated files will always be added to the "
 		                                "active directory, so you must not give an "
@@ -1397,7 +1376,7 @@ bool CppNewClassDialog::ClassGenerator::generate()
 		return false;
 	}
 
-    if( ( dlg.m_part->project() ->options() & KDevProject::UsesQMakeBuildSystem) )
+    if( ( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) )
     {
         TQDir dir( TQFileInfo( project->projectDirectory()+TQString( TQChar( TQDir::separator() ) )+project->activeDirectory() + TQString( TQChar( TQDir::separator() ) ) + header ).dirPath() );
         kdDebug(9024) << "Dir for new file:" << dir.absPath() << endl;
@@ -1458,7 +1437,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
 	headeronly = dlg.headeronly_box->isChecked();
 
 	if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass )
-		new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" );
+		new TQListViewItem( dlg.baseclasses_view, TQWIDGET_OBJECT_NAME_STRING, "public" );
 	if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) )
 		new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" );
 
@@ -1476,7 +1455,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
 		TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" );
 		TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" );
 		if( !email.isEmpty() )
-			author += TQString( " <%1>" ).arg( email );
+			author += TQString( " <%1>" ).tqarg( email );
 
 		if ( dlg.gen_config->author_box->isChecked() )
 			doc.append( "\t@author " + author + "\n" );
@@ -1498,29 +1477,29 @@ void CppNewClassDialog::ClassGenerator::common_text()
 
 	//advanced constructor creation
 
-	advConstructorsHeader = TQString::null;
-	advConstructorsSource = TQString::null;
+	advConstructorsHeader = TQString();
+	advConstructorsSource = TQString();
 	if ( !dlg.constructors_h_edit->text().isEmpty() )
 	{
 		advConstructorsHeader = "    " + dlg.constructors_h_edit->text();
-		advConstructorsHeader.replace( TQRegExp( "\n" ), "\n    " );
+		advConstructorsHeader.tqreplace( TQRegExp( "\n" ), "\n    " );
 	}
 	if ( !dlg.constructors_cpp_edit->text().isEmpty() )
 	{
 		advConstructorsSource = dlg.constructors_cpp_edit->text();
 	}
-	advConstructorsHeader.replace( TQRegExp( "[\\n ]*$" ), TQString::null );
-	advConstructorsSource.replace( TQRegExp( "[\\n ]*$" ), TQString::null );
+	advConstructorsHeader.tqreplace( TQRegExp( "[\\n ]*$" ), TQString() );
+	advConstructorsSource.tqreplace( TQRegExp( "[\\n ]*$" ), TQString() );
 
 	//advanced method overriding
 
-	advH_public = TQString::null;
-	advH_public_slots = TQString::null;
-	advH_protected = TQString::null;
-	advH_protected_slots = TQString::null;
-	advH_private = TQString::null;
-	advH_private_slots = TQString::null;
-	advCpp = TQString::null;
+	advH_public = TQString();
+	advH_public_slots = TQString();
+	advH_protected = TQString();
+	advH_protected_slots = TQString();
+	advH_private = TQString();
+	advH_private_slots = TQString();
+	advCpp = TQString();
 
 	TQListViewItemIterator it( dlg.methods_view );
 	while ( it.current() )
@@ -1528,7 +1507,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
 		PCheckListItem<FunctionDom> *curr;
 		if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) )
 		{
-			if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) )
+			if ( curr->isOn() && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) )
 			{
 				TQString * adv_h = 0;
 				if ( curr->item() ->access() == CodeModelItem::Private )
@@ -1540,9 +1519,9 @@ void CppNewClassDialog::ClassGenerator::common_text()
 
 				//        if (advCpp.isEmpty()) advCpp += "\n\n";
 
-				TQString bcName = curr->parent() ->parent() ->text( 0 );
+				TQString bcName = curr->tqparent() ->tqparent() ->text( 0 );
 				PListViewItem<ClassDom> *bc;
-				if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->parent() ->parent() ) ) )
+				if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->tqparent() ->tqparent() ) ) )
 				{
 					bcName += bc->templateAddition;
 				}
@@ -1561,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text()
 		PListViewItem<FunctionDom> *curr_m;
 		if ( ( curr = dynamic_cast<PListViewItem<VariableDom>* >( ita.current() ) ) )
 		{
-			if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) )
+			if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) )
 			{
 				TQString * adv_h = 0;
 				if ( curr->text( 2 ) == "private" )
@@ -1574,12 +1553,12 @@ void CppNewClassDialog::ClassGenerator::common_text()
 				/*    if ((*adv_h).isEmpty())
 				            *adv_h += "\n\n";*/
 				if ( adv_h )
-					*adv_h += TQString( "    using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n";
+					*adv_h += TQString( "    using " ) + curr->tqparent() ->tqparent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n";
 			}
 		}
 		else if ( ( curr_m = dynamic_cast<PListViewItem<FunctionDom>* >( ita.current() ) ) )
 		{
-			if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->parent() ) && ( curr_m->parent() ->parent() ) )
+			if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->tqparent() ) && ( curr_m->tqparent() ->tqparent() ) )
 			{
 				TQString * adv_h = 0;
 				if ( curr_m->text( 2 ) == "private" )
@@ -1593,22 +1572,22 @@ void CppNewClassDialog::ClassGenerator::common_text()
 				        *adv_h += "\n\n";*/
 
 				TQString methodName = curr_m->item() ->name();
-				if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) )
+				if ( !methodName.tqcontains( TQRegExp( "^[a-zA-z_]" ) ) )
 					methodName = "operator" + methodName;
-				*adv_h += "    using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n";
+				*adv_h += "    using " + curr_m->tqparent() ->tqparent() ->text( 0 ) + "::" + methodName + ";\n";
 			}
 		}
 		++ita;
 	}
 
 	TQRegExp e( "[\\n ]*$" );
-	advH_public.replace( e, TQString::null );
-	advH_public_slots.replace( e, TQString::null );
-	advH_protected.replace( e, TQString::null );
-	advH_protected_slots.replace( e, TQString::null );
-	advH_private.replace( e, TQString::null );
-	advH_private_slots.replace( e, TQString::null );
-	advCpp.replace( e, TQString::null );
+	advH_public.tqreplace( e, TQString() );
+	advH_public_slots.tqreplace( e, TQString() );
+	advH_protected.tqreplace( e, TQString() );
+	advH_protected_slots.tqreplace( e, TQString() );
+	advH_private.tqreplace( e, TQString() );
+	advH_private_slots.tqreplace( e, TQString() );
+	advCpp.tqreplace( e, TQString() );
 }
 
 void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method,
@@ -1617,7 +1596,7 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method
 	/*    if ((*adv_h).isEmpty())
 	        *adv_h += "\n\n";*/
 	TQString methodName = method->name();
-	if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) )
+	if ( !methodName.tqcontains( TQRegExp( "^[a-zA-z_]" ) ) )
 		methodName = "operator" + methodName;
 	*adv_h += "    " + ( method->isVirtual() ? TQString( "virtual " ) : TQString( "" ) )
 	          + ( method->isStatic() ? TQString( "static " ) : TQString( "" ) )
@@ -1639,8 +1618,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method
 		cparams += ( *argIt ) ->type() + " ";
 		if ( ( *argIt ) ->name().isEmpty() )
 		{
-			cparams += TQString( "arg%1" ).arg( unnamed );
-			bparams += TQString( "arg%1" ).arg( unnamed++ );
+			cparams += TQString( "arg%1" ).tqarg( unnamed );
+			bparams += TQString( "arg%1" ).tqarg( unnamed++ );
 		}
 		else
 		{
@@ -1678,8 +1657,8 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 		classImpl = FileTemplate::read( dlg.m_part, fi.extension( true ) );
 	}
 
-	classImpl.replace( TQRegExp( "\\$MODULE\\$" ), module );
-	classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename );
+	classImpl.tqreplace( TQRegExp( "\\$MODULE\\$" ), module );
+	classImpl.tqreplace( TQRegExp( "\\$FILENAME\\$" ), basefilename );
 
 	if ( objc )
 	{
@@ -1710,7 +1689,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 	}
 
 	TQString relPath;
-	for ( int i = implementation.findRev( '/' ); i != -1; i = implementation.findRev( '/', --i ) )
+	for ( int i = implementation.tqfindRev( '/' ); i != -1; i = implementation.tqfindRev( '/', --i ) )
 		relPath += "../";
 
 	TQString constructors = ( advConstructorsSource.isEmpty() ? TQString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n"
@@ -1728,26 +1707,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 	{
 		if( dlg.m_part->qtBuildConfig()->version() == 3 )
 		{
-			argsH = "TQWidget *parent = 0, const char *name = 0";
-			argsCpp = "TQWidget *parent, const char *name";
+			argsH = "TQWidget *tqparent = 0, const char *name = 0";
+			argsCpp = "TQWidget *tqparent, const char *name";
 		}
 		else
 		{
-			argsH = "TQWidget *parent = 0";
-			argsCpp = "TQWidget *parent";
+			argsH = "TQWidget *tqparent = 0";
+			argsCpp = "TQWidget *tqparent";
 		}
 	}
 	else if ( qobject )
 	{
 		if( dlg.m_part->qtBuildConfig()->version() == 3 )
 		{
-			argsH = "TQObject *parent = 0, const char *name = 0";
-			argsCpp = "TQObject *parent, const char *name";
+			argsH = "TQObject *tqparent = 0, const char *name = 0";
+			argsCpp = "TQObject *tqparent, const char *name";
 		}
 		else
 		{
-			argsH = "TQObject *parent = 0";
-			argsCpp = "TQObject *parent";
+			argsH = "TQObject *tqparent = 0";
+			argsCpp = "TQObject *tqparent";
 		}
 	}
 	else
@@ -1760,16 +1739,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 	if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) )
 	{
 		if( dlg.m_part->qtBuildConfig()->version() == 3 )
-			baseInitializer = "  : TQWidget(parent, name)";
+			baseInitializer = "  : TQWidget(tqparent, name)";
 		else
-			baseInitializer = "  : TQWidget(parent)";
+			baseInitializer = "  : TQWidget(tqparent)";
 	}
 	else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) )
 	{
 		if( dlg.m_part->qtBuildConfig()->version() == 3 )
-			baseInitializer = "  : TQObject(parent, name)";
+			baseInitializer = "  : TQObject(tqparent, name)";
 		else
-			baseInitializer = "  : TQObject(parent)";
+			baseInitializer = "  : TQObject(tqparent)";
 	}
 	else if ( dlg.baseclasses_view->childCount() != 0 )
 	{
@@ -1787,16 +1766,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 				if ( childClass && ( baseInitializer == " : " ) )
 				{
 					if( dlg.m_part->qtBuildConfig()->version() == 3 )
-						baseInitializer += it.current()->text( 0 ) + "(parent, name)";
+						baseInitializer += it.current()->text( 0 ) + "(tqparent, name)";
 					else
-						baseInitializer += it.current()->text( 0 ) + "(parent)";
+						baseInitializer += it.current()->text( 0 ) + "(tqparent)";
 				}
 				else if ( qobject && ( baseInitializer == " : " ) )
 				{
 					if( dlg.m_part->qtBuildConfig()->version() == 3 )
-						baseInitializer += it.current()->text( 0 ) + "(parent, name)";
+						baseInitializer += it.current()->text( 0 ) + "(tqparent, name)";
 					else
-						baseInitializer += it.current()->text( 0 ) + "(parent)";
+						baseInitializer += it.current()->text( 0 ) + "(tqparent)";
 				}
 				else
 				{
@@ -1808,22 +1787,22 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 		baseInitializer += "\n";
 	}
 
-	constructors.replace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer );
-	constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className );
+	constructors.tqreplace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer );
+	constructors.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className );
 	//  qWarning("NEW CLASS: constructors = %s", constructors.latin1());
 	if ( templateStr.isEmpty() )
 	{
-		constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" );
-		constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" );
+		constructors.tqreplace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" );
+		constructors.tqreplace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" );
 	}
 	else
 	{
-		constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr );
-		constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams );
-		classImpl.replace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" );
+		constructors.tqreplace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr );
+		constructors.tqreplace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams );
+		classImpl.tqreplace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" );
 	}
 	//  qWarning("NEW CLASS: constructors = %s", constructors.latin1());
-	constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsCpp );
+	constructors.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsCpp );
 	//  qWarning("NEW CLASS: constructors = %s", constructors.latin1());
 
 
@@ -1831,19 +1810,19 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 	TQString hp = relPath + header;
 	beautifySource( classImpl, hp, className, namespaceBeg, constructors, advCpp, namespaceEnd, implementation );
 
-	classImpl.replace( TQRegExp( "\\$HEADER\\$" ), relPath + header );
-	classImpl.replace( TQRegExp( "\\$CLASSNAME\\$" ), className );
-	classImpl.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg );
-	classImpl.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors );
-	classImpl.replace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp );
-	classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd );
-	classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation );
+	classImpl.tqreplace( TQRegExp( "\\$HEADER\\$" ), relPath + header );
+	classImpl.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className );
+	classImpl.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg );
+	classImpl.tqreplace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors );
+	classImpl.tqreplace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp );
+	classImpl.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd );
+	classImpl.tqreplace( TQRegExp( "\\$FILENAME\\$" ), implementation );
 
 	if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) )
 	{
-		TQString moc = header;
-		moc.replace( TQRegExp( "\\..*" ), ".moc" );
-		classImpl += "#include \"" + moc + "\"\n";
+		TQString tqmoc = header;
+		tqmoc.tqreplace( TQRegExp( "\\..*" ), ".tqmoc" );
+		classImpl += "#include \"" + tqmoc + "\"\n";
 	}
 
 	if ( dlg.gen_config->reformat_box->isChecked() )
@@ -1889,8 +1868,8 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 		classIntf = FileTemplate::read( dlg.m_part, fi.extension( true ) );
 	}
 
-	classIntf.replace( TQRegExp( "\\$MODULE\\$" ), module );
-	classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename );
+	classIntf.tqreplace( TQRegExp( "\\$MODULE\\$" ), module );
+	classIntf.tqreplace( TQRegExp( "\\$FILENAME\\$" ), basefilename );
 
 	if ( objc )
 	{
@@ -1912,16 +1891,16 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 		      + namespaceBeg
 		      + TQString("class $CLASSNAME$$INHERITANCE$\n"
 				"{\n"
-				"$QOBJECT$"
+				"$TQOBJECT$"
 				"public:\n")
 		      + ( advConstructorsHeader.isEmpty() ? TQString("    $CLASSNAME$($ARGS$);\n") : advConstructorsHeader )
 		      + TQString("\n    ~$CLASSNAME$();\n")
 		      + advH_public
-		      + (advH_public_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots))
-		      + (advH_protected.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected:" + advH_protected))
-		      + (advH_protected_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots))
-		      + (advH_private.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate:" + advH_private))
-		      + (advH_private_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots))
+		      + (advH_public_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\npublic slots:" + advH_public_slots))
+		      + (advH_protected.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected:" + advH_protected))
+		      + (advH_protected_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots))
+		      + (advH_private.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate:" + advH_private))
+		      + (advH_private_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate slots:" + advH_private_slots))
 		      + TQString("};\n"
 				"\n")
 		      + namespaceEnd
@@ -1932,21 +1911,21 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 	switch ( dlg.gen_config->defCase() )
 	{
 	case ClassGeneratorConfig::UpperCase:
-        headerGuard = namespaceStr.upper() + header.mid( header.findRev( "/" )+1 ).upper();
+        headerGuard = namespaceStr.upper() + header.mid( header.tqfindRev( "/" )+1 ).upper();
 		break;
 	case ClassGeneratorConfig::LowerCase:
-        headerGuard = namespaceStr.lower() + header.mid( header.findRev( "/" )+1 ).lower();
+        headerGuard = namespaceStr.lower() + header.mid( header.tqfindRev( "/" )+1 ).lower();
 		break;
 	case ClassGeneratorConfig::SameAsFileCase:
-        headerGuard = dlg.header_edit->text().mid( dlg.header_edit->text().findRev( "/" )+1 );
+        headerGuard = dlg.header_edit->text().mid( dlg.header_edit->text().tqfindRev( "/" )+1 );
 		break;
 	case ClassGeneratorConfig::SameAsClassCase:
-        headerGuard = namespaceStr + header.mid( header.findRev( "/" )+1 );
+        headerGuard = namespaceStr + header.mid( header.tqfindRev( "/" )+1 );
 		break;
 	}
 
-	headerGuard.replace( TQRegExp( "\\." ), "_" );
-	headerGuard.replace( TQRegExp( "::" ), "_" );
+	headerGuard.tqreplace( TQRegExp( "\\." ), "_" );
+	headerGuard.tqreplace( TQRegExp( "::" ), "_" );
 	TQString includeBaseHeader;
 	if( dlg.m_part->qtBuildConfig()->isUsed() )
 	{
@@ -1983,8 +1962,8 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 		{
 			if ( !it.current() ->text( 0 ).isEmpty() )
 				if ( !it.current() ->text( 3 ).isEmpty() )
-					//          if ((!childClass) || (it.current()->text(0) != "TQWidget"))
-					includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) +
+					//          if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING))
+					includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::tqfromLatin1( "#include " ) +
 					                     ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) )
 					                     + it.current() ->text( 3 )
 					                     + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) );
@@ -1995,7 +1974,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 	TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" );
 	TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" );
 	if( !email.isEmpty() )
-		author += TQString( " <%1>" ).arg( email );
+		author += TQString( " <%1>" ).tqarg( email );
 
 	TQString inheritance;
 	if ( dlg.baseclasses_view->childCount() > 0 )
@@ -2009,13 +1988,13 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 			{
 				if ( inheritance != " : " )
 					inheritance += ", ";
-				if ( it.current() ->text( 1 ).contains( "virtual" ) )
+				if ( it.current() ->text( 1 ).tqcontains( "virtual" ) )
 					inheritance += "virtual ";
-				if ( it.current() ->text( 1 ).contains( "public" ) )
+				if ( it.current() ->text( 1 ).tqcontains( "public" ) )
 					inheritance += "public ";
-				if ( it.current() ->text( 1 ).contains( "protected" ) )
+				if ( it.current() ->text( 1 ).tqcontains( "protected" ) )
 					inheritance += "protected ";
-				if ( it.current() ->text( 1 ).contains( "private" ) )
+				if ( it.current() ->text( 1 ).tqcontains( "private" ) )
 					inheritance += "private ";
 				inheritance += it.current() ->text( 0 );
 			}
@@ -2029,12 +2008,12 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 	                                TQString( "    $CLASSNAME$($ARGS$);" ) : advConstructorsHeader )
 	                       + TQString( "\n\n    ~$CLASSNAME$();" );
 
-	constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className );
-	constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsH );
+	constructors.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className );
+	constructors.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsH );
 
 	TQString qobjectStr;
 	if ( childClass || qobject )
-		qobjectStr = "Q_OBJECT";
+		qobjectStr = "TQ_OBJECT";
 
 
 	TQString baseclass;
@@ -2047,30 +2026,30 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 	                advH_protected, advH_protected_slots, advH_private, advH_private_slots, namespaceEnd );
 
 
-	classIntf.replace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard );
-	classIntf.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader );
-	classIntf.replace( TQRegExp( "\\$AUTHOR\\$" ), author );
-	classIntf.replace( TQRegExp( "\\$DOC\\$" ), doc );
-	classIntf.replace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr );
-	classIntf.replace( TQRegExp( "\\$CLASSNAME\\$" ), className );
+	classIntf.tqreplace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard );
+	classIntf.tqreplace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader );
+	classIntf.tqreplace( TQRegExp( "\\$AUTHOR\\$" ), author );
+	classIntf.tqreplace( TQRegExp( "\\$DOC\\$" ), doc );
+	classIntf.tqreplace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr );
+	classIntf.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className );
 	if ( dlg.baseclasses_view->childCount() > 0 )
-		classIntf.replace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) );
-	classIntf.replace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance );
-	classIntf.replace( TQRegExp( "\\$QOBJECT\\$" ), qobjectStr );
-	classIntf.replace( TQRegExp( "\\$ARGS\\$" ), argsH );
-	classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), header );
-	classIntf.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg );
-	classIntf.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors );
-	classIntf.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public );
-	classIntf.replace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots );
-	classIntf.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected );
-	classIntf.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots );
-	classIntf.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private );
-	classIntf.replace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots );
-	classIntf.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd );
+		classIntf.tqreplace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) );
+	classIntf.tqreplace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance );
+	classIntf.tqreplace( TQRegExp( "\\$TQOBJECT\\$" ), qobjectStr );
+	classIntf.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsH );
+	classIntf.tqreplace( TQRegExp( "\\$FILENAME\\$" ), header );
+	classIntf.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg );
+	classIntf.tqreplace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors );
+	classIntf.tqreplace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public );
+	classIntf.tqreplace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots );
+	classIntf.tqreplace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected );
+	classIntf.tqreplace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots );
+	classIntf.tqreplace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private );
+	classIntf.tqreplace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots );
+	classIntf.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd );
 
 	if ( !templateStr.isEmpty() && (!headeronly) )
-		classIntf.replace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" );
+		classIntf.tqreplace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" );
 
 	if ( dlg.gen_config->reformat_box->isChecked() )
 	{
@@ -2102,45 +2081,45 @@ void CppNewClassDialog::ClassGenerator::beautifyHeader( TQString &templ, TQStrin
         TQString &namespaceEnd )
 {
 	if ( headerGuard.isEmpty() )
-		templ.replace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString() );
 	if ( includeBaseHeader.isEmpty() )
-		templ.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString() );
 	if ( author.isEmpty() )
-		templ.replace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString() );
 	if ( doc.isEmpty() )
-		templ.replace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString() );
 	if ( className.isEmpty() )
-		templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() );
 	if ( templateStr.isEmpty() )
-		templ.replace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString() );
 	if ( baseclass.isEmpty() )
-		templ.replace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString() );
 	if ( inheritance.isEmpty() )
-		templ.replace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString() );
 	if ( qobjectStr.isEmpty() )
-		templ.replace( TQRegExp( "\\$QOBJECT\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$TQOBJECT\\$[\\n ]*" ), TQString() );
 	if ( args.isEmpty() )
-		templ.replace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString() );
 	if ( header.isEmpty() )
-		templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() );
 	if ( namespaceBeg.isEmpty() )
-		templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() );
 	if ( constructors.isEmpty() )
-		templ.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString() );
 	if ( advH_public.isEmpty() )
-		templ.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString() );
 	if ( advH_public_slots.isEmpty() )
-		templ.replace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString() );
 	if ( advH_protected.isEmpty() )
-		templ.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString() );
 	if ( advH_protected_slots.isEmpty() )
-		templ.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString() );
 	if ( advH_private.isEmpty() )
-		templ.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString() );
 	if ( advH_private_slots.isEmpty() )
-		templ.replace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString() );
 	if ( namespaceEnd.isEmpty() )
-		templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() );
 }
 
 
@@ -2148,19 +2127,19 @@ void CppNewClassDialog::ClassGenerator::beautifySource( TQString &templ, TQStrin
         TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation )
 {
 	if ( header.isEmpty() )
-		templ.replace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString() );
 	if ( className.isEmpty() )
-		templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() );
 	if ( namespaceBeg.isEmpty() )
-		templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() );
 	if ( constructors.isEmpty() )
-		templ.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString() );
 	if ( advCpp.isEmpty() )
-		templ.replace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString() );
 	if ( namespaceEnd.isEmpty() )
-		templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() );
 	if ( implementation.isEmpty() )
-		templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString::null );
+		templ.tqreplace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() );
 }
 
 TQString CppNewClassDialog::classNameFormatted( )
@@ -2171,7 +2150,7 @@ TQString CppNewClassDialog::classNameFormatted( )
 TQString CppNewClassDialog::classNameFormatted( const TQString &name )
 {
 	TQString temp = name.simplifyWhiteSpace();
-	return temp.replace( TQRegExp( "template *<.*> *(class *)?" ), "" );
+	return temp.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" );
 }
 
 
@@ -2184,9 +2163,9 @@ TQString CppNewClassDialog::templateStrFormatted( const TQString &name )
 {
 	TQString className = name.simplifyWhiteSpace();
 	TQString temp = className;
-	className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" );
-	TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" );
-	templateStr.replace( TQRegExp( " *class *$" ), "" );
+	className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" );
+	TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" );
+	templateStr.tqreplace( TQRegExp( " *class *$" ), "" );
 	return templateStr;
 }
 
@@ -2199,13 +2178,13 @@ TQString CppNewClassDialog::templateParamsFormatted( const TQString &name )
 {
 	TQString className = name.simplifyWhiteSpace();
 	TQString temp = className;
-	className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" );
-	TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" );
-	templateStr.replace( TQRegExp( " *class *$" ), "" );
+	className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" );
+	TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" );
+	templateStr.tqreplace( TQRegExp( " *class *$" ), "" );
 
 	TQString templateParams = templateStr;
-	templateParams.replace( TQRegExp( "^ *template *" ), "" );
-	templateParams.replace( TQRegExp( " *class *" ), "" );
+	templateParams.tqreplace( TQRegExp( "^ *template *" ), "" );
+	templateParams.tqreplace( TQRegExp( " *class *" ), "" );
 	templateParams.simplifyWhiteSpace();
 
 	return templateParams;
@@ -2215,19 +2194,19 @@ TQString CppNewClassDialog::templateActualParamsFormatted( const TQString & name
 {
 	TQString className = name.simplifyWhiteSpace();
 	TQString temp = className;
-	className.replace( TQRegExp( "<.*> *" ), "" );
-	TQString templateStr = temp.replace( TQRegExp( QRegExp_escape( className ) ), "" );
+	className.tqreplace( TQRegExp( "<.*> *" ), "" );
+	TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" );
 	return templateStr;
 }
 
 void CppNewClassDialog::removeTemplateParams( TQString & name )
 {
-	name.replace( TQRegExp( "<.*> *" ), "" );
+	name.tqreplace( TQRegExp( "<.*> *" ), "" );
 }
 
 bool CppNewClassDialog::isDestructor( TQString className, const FunctionDom &method )
 {
-	if ( m_part->formatModelItem( method.data() ).contains( TQRegExp( " *~ *" + className ) ) )
+	if ( m_part->formatModelItem( method.data() ).tqcontains( TQRegExp( " *~ *" + className ) ) )
 		return true;
 	return false;
 }
@@ -2239,4 +2218,4 @@ void CppNewClassDialog::headeronly_box_stateChanged(int val)
 
 #include "cppnewclassdlg.moc"
 
-//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h
index fcff0bd0..39e9e458 100644
--- a/languages/cpp/cppnewclassdlg.h
+++ b/languages/cpp/cppnewclassdlg.h
@@ -31,40 +31,40 @@ class CodeModel;
 
 
 template <class T>
-class PCheckListItem: public QCheckListItem
+class PCheckListItem: public TQCheckListItem
 {
 public:
 
-	PCheckListItem ( T item, TQCheckListItem * parent, const TQString & text, Type tt = Controller ) :
-			TQCheckListItem ( parent, text, tt ), m_item( item )
+	PCheckListItem ( T item, TQCheckListItem * tqparent, const TQString & text, Type tt = Controller ) :
+			TQCheckListItem ( tqparent, text, tt ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQCheckListItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) :
-			TQCheckListItem ( parent, after, text, tt ), m_item( item )
+	PCheckListItem ( T item, TQCheckListItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) :
+			TQCheckListItem ( tqparent, after, text, tt ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, Type tt = Controller ) :
-			TQCheckListItem ( parent, text, tt ), m_item( item )
+	PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, Type tt = Controller ) :
+			TQCheckListItem ( tqparent, text, tt ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) :
-			TQCheckListItem ( parent, after, text, tt ), m_item( item )
+	PCheckListItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) :
+			TQCheckListItem ( tqparent, after, text, tt ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQListView * parent, const TQString & text, Type tt = Controller ) :
-			TQCheckListItem ( parent, text, tt ), m_item( item )
+	PCheckListItem ( T item, TQListView * tqparent, const TQString & text, Type tt = Controller ) :
+			TQCheckListItem ( tqparent, text, tt ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) :
-			TQCheckListItem ( parent, after, text, tt ), m_item( item )
+	PCheckListItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) :
+			TQCheckListItem ( tqparent, after, text, tt ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, const TQPixmap & p ) :
-			TQCheckListItem ( parent, text, p ), m_item( item )
+	PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, const TQPixmap & p ) :
+			TQCheckListItem ( tqparent, text, p ), m_item( item )
 	{}
 
-	PCheckListItem ( T item, TQListView * parent, const TQString & text, const TQPixmap & p ) :
-			TQCheckListItem ( parent, text, p ), m_item( item )
+	PCheckListItem ( T item, TQListView * tqparent, const TQString & text, const TQPixmap & p ) :
+			TQCheckListItem ( tqparent, text, p ), m_item( item )
 	{}
 
 	T item()
@@ -79,24 +79,24 @@ private:
 };
 
 template <class T>
-class PListViewItem: public QListViewItem
+class PListViewItem: public TQListViewItem
 {
 public:
 
-	PListViewItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text ) :
-			TQListViewItem ( parent, after, text ), m_item( item )
+	PListViewItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text ) :
+			TQListViewItem ( tqparent, after, text ), m_item( item )
 	{}
 
-	PListViewItem ( T item, TQListViewItem * parent, const TQString & text ) :
-			TQListViewItem ( parent, text ), m_item( item )
+	PListViewItem ( T item, TQListViewItem * tqparent, const TQString & text ) :
+			TQListViewItem ( tqparent, text ), m_item( item )
 	{}
 
-	PListViewItem ( T item, TQListView * parent, const TQString & text ) :
-			TQListViewItem ( parent, text ), m_item( item )
+	PListViewItem ( T item, TQListView * tqparent, const TQString & text ) :
+			TQListViewItem ( tqparent, text ), m_item( item )
 	{}
 
-	PListViewItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text ) :
-			TQListViewItem ( parent, after, text ), m_item( item )
+	PListViewItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text ) :
+			TQListViewItem ( tqparent, after, text ), m_item( item )
 	{}
 
 	T item()
@@ -113,9 +113,10 @@ private:
 class CppNewClassDialog : public CppNewClassDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	CppNewClassDialog( CppSupportPart *part, TQWidget *parent = 0, const char *name = 0 );
+	CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent = 0, const char *name = 0 );
 	~CppNewClassDialog();
 
 protected:
@@ -140,7 +141,7 @@ protected:
 	virtual void scopeboxActivated( int value );
 
 	virtual void checkObjCInheritance( int val );
-	virtual void checkQWidgetInheritance( int val );
+	virtual void checkTQWidgetInheritance( int val );
 
 	virtual void upbaseclass_button_clicked();
 	virtual void downbaseclass_button_clicked();
@@ -167,9 +168,9 @@ protected:
 	void parseClass( TQString clName, TQString inheritance );
 	void parsePCSClass( TQString clName, TQString inheritance );
 	void addToConstructorsList( TQCheckListItem *myClass, FunctionDom method );
-	void addToMethodsList( TQListViewItem *parent, FunctionDom method );
-	void addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier );
-	void addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier );
+	void addToMethodsList( TQListViewItem *tqparent, FunctionDom method );
+	void addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier );
+	void addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier );
 	void clearConstructorsList( bool clean = false );
 	void clearMethodsList( bool clean = false );
 	void clearUpgradeList( bool clean = false );
diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index 4f443eaf..5d1580e4 100644
--- a/languages/cpp/cppnewclassdlgbase.ui
+++ b/languages/cpp/cppnewclassdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CppNewClassDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CppNewClassDlgBase</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>class_tabs</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab1</cstring>
                 </property>
@@ -47,14 +47,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>10</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout10</cstring>
                         </property>
@@ -65,7 +65,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>documentation_label_</cstring>
                                 </property>
@@ -76,7 +76,7 @@
                                     <cstring>documentation_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QTextEdit">
+                            <widget class="TQTextEdit">
                                 <property name="name">
                                     <cstring>documentation_edit</cstring>
                                 </property>
@@ -89,7 +89,7 @@ doxygen or similar tools.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>filenames_group</cstring>
                         </property>
@@ -100,7 +100,7 @@ doxygen or similar tools.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>header_label</cstring>
                                 </property>
@@ -122,7 +122,7 @@ you select the classname, but you can
 still edit it afterwards.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>implementation_label</cstring>
                                 </property>
@@ -144,7 +144,7 @@ you select the classname, but you can
 still edit it afterwards.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>headeronly_box</cstring>
                                 </property>
@@ -154,7 +154,7 @@ still edit it afterwards.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>groupBox7</cstring>
                         </property>
@@ -165,7 +165,7 @@ still edit it afterwards.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>classname_label</cstring>
                                 </property>
@@ -194,7 +194,7 @@ You can also define template classes by specifying
 template &lt;params&gt; classname</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>namespace_label</cstring>
                                 </property>
@@ -225,7 +225,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
+                    <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>inheritance_group</cstring>
                         </property>
@@ -236,7 +236,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton" row="2" column="0">
+                            <widget class="TQPushButton" row="2" column="0">
                                 <property name="name">
                                     <cstring>addbaseclass_button</cstring>
                                 </property>
@@ -255,7 +255,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="3" column="0">
+                            <widget class="TQPushButton" row="3" column="0">
                                 <property name="name">
                                     <cstring>rembaseclass_button</cstring>
                                 </property>
@@ -270,7 +270,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -283,7 +283,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="4" column="0">
+                            <widget class="TQPushButton" row="4" column="0">
                                 <property name="name">
                                     <cstring>upbaseclass_button</cstring>
                                 </property>
@@ -305,7 +305,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="5" column="0">
+                            <widget class="TQPushButton" row="5" column="0">
                                 <property name="name">
                                     <cstring>downbaseclass_button</cstring>
                                 </property>
@@ -320,7 +320,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -333,7 +333,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>basename_label</cstring>
                                 </property>
@@ -352,7 +352,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <cstring>basename_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QListView" row="2" column="1" rowspan="4" colspan="2">
+                            <widget class="TQListView" row="2" column="1" rowspan="4" colspan="2">
                                 <column>
                                     <property name="text">
                                         <string>Baseclass Name</string>
@@ -403,7 +403,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -413,7 +413,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <enum>StrongFocus</enum>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass&lt;int, int&gt;)</string>
+                                    <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a tqparent class. You can also use template classes here (like BaseClass&lt;int, int&gt;)</string>
                                 </property>
                             </widget>
                             <widget class="KLineEdit" row="0" column="2">
@@ -431,7 +431,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -444,15 +444,15 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
+                            <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>layout5</cstring>
+                                    <cstring>tqlayout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QComboBox">
+                                    <widget class="TQComboBox">
                                         <item>
                                             <property name="text">
                                                 <string>Global</string>
@@ -478,7 +478,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             </sizepolicy>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>virtual_box</cstring>
                                         </property>
@@ -489,7 +489,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <string>Virtual</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>public_button</cstring>
                                         </property>
@@ -503,7 +503,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>protected_button</cstring>
                                         </property>
@@ -514,7 +514,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <string>Protected</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>private_button</cstring>
                                         </property>
@@ -529,7 +529,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="1">
+                    <widget class="TQGroupBox" row="2" column="1">
                         <property name="name">
                             <cstring>optionsBox</cstring>
                         </property>
@@ -540,7 +540,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>filetemplate_box</cstring>
                                 </property>
@@ -551,7 +551,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>qobject_box</cstring>
                                 </property>
@@ -559,7 +559,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <string>Generate QOb&amp;ject child class</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>childclass_box</cstring>
                                 </property>
@@ -567,7 +567,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <string>Generate Q&amp;Widget child class</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>gtk_box</cstring>
                                 </property>
@@ -575,7 +575,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                     <string>Generate G&amp;TK+ class</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>objc_box</cstring>
                                 </property>
@@ -587,7 +587,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab2</cstring>
                 </property>
@@ -598,11 +598,11 @@ Namespace1::Namespace2::...::NamespaceN</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QTabWidget">
+                    <widget class="TQTabWidget">
                         <property name="name">
                             <cstring>tabWidget4</cstring>
                         </property>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>tab</cstring>
                             </property>
@@ -613,7 +613,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QListView">
+                                <widget class="TQListView">
                                     <column>
                                         <property name="text">
                                             <string>Base Class Constructors</string>
@@ -638,15 +638,15 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         <enum>AllColumns</enum>
                                     </property>
                                 </widget>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout4</cstring>
+                                        <cstring>tqlayout4</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QPushButton">
+                                        <widget class="TQPushButton">
                                             <property name="name">
                                                 <cstring>to_constructors_list</cstring>
                                             </property>
@@ -658,7 +658,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>125</width>
                                                     <height>0</height>
@@ -668,7 +668,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                                 <string>C&amp;reate Constructor &gt;&gt;</string>
                                             </property>
                                         </widget>
-                                        <widget class="QPushButton">
+                                        <widget class="TQPushButton">
                                             <property name="name">
                                                 <cstring>clear_selection_button</cstring>
                                             </property>
@@ -680,7 +680,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>125</width>
                                                     <height>0</height>
@@ -700,7 +700,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>150</width>
                                                     <height>20</height>
@@ -709,11 +709,11 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                         </spacer>
                                     </hbox>
                                 </widget>
-                                <widget class="QTabWidget">
+                                <widget class="TQTabWidget">
                                     <property name="name">
                                         <cstring>tabWidget3</cstring>
                                     </property>
-                                    <widget class="QWidget">
+                                    <widget class="TQWidget">
                                         <property name="name">
                                             <cstring>tab_header</cstring>
                                         </property>
@@ -727,7 +727,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <property name="margin">
                                                 <number>2</number>
                                             </property>
-                                            <widget class="QTextEdit" row="0" column="0">
+                                            <widget class="TQTextEdit" row="0" column="0">
                                                 <property name="name">
                                                     <cstring>constructors_h_edit</cstring>
                                                 </property>
@@ -748,7 +748,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             </widget>
                                         </grid>
                                     </widget>
-                                    <widget class="QWidget">
+                                    <widget class="TQWidget">
                                         <property name="name">
                                             <cstring>tab_source</cstring>
                                         </property>
@@ -762,7 +762,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                             <property name="margin">
                                                 <number>2</number>
                                             </property>
-                                            <widget class="QTextEdit" row="0" column="0">
+                                            <widget class="TQTextEdit" row="0" column="0">
                                                 <property name="name">
                                                     <cstring>constructors_cpp_edit</cstring>
                                                 </property>
@@ -786,7 +786,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>tab</cstring>
                             </property>
@@ -797,7 +797,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QListView">
+                                <widget class="TQListView">
                                     <column>
                                         <property name="text">
                                             <string>Methods</string>
@@ -841,7 +841,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>tab</cstring>
                             </property>
@@ -852,7 +852,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QListView">
+                                <widget class="TQListView">
                                     <column>
                                         <property name="text">
                                             <string>Methods &amp; Attributes</string>
@@ -915,7 +915,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -937,7 +937,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -958,14 +958,14 @@ Namespace1::Namespace2::...::NamespaceN</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ok_button</cstring>
                     </property>
@@ -976,7 +976,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancel_button</cstring>
                     </property>
@@ -1092,9 +1092,9 @@ Namespace1::Namespace2::...::NamespaceN</string>
     </connection>
     <connection>
         <sender>baseclasses_view</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>CppNewClassDlgBase</receiver>
-        <slot>currBaseSelected(QListViewItem*)</slot>
+        <slot>currBaseSelected(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>upbaseclass_button</sender>
@@ -1134,15 +1134,15 @@ Namespace1::Namespace2::...::NamespaceN</string>
     </connection>
     <connection>
         <sender>access_view</sender>
-        <signal>mouseButtonPressed(int,QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&amp;,int)</signal>
         <receiver>CppNewClassDlgBase</receiver>
-        <slot>access_view_mouseButtonPressed(int,QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>access_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>methods_view</sender>
-        <signal>mouseButtonPressed(int,QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&amp;,int)</signal>
         <receiver>CppNewClassDlgBase</receiver>
-        <slot>methods_view_mouseButtonPressed(int,QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>methods_view_mouseButtonPressed(int,TQListViewItem*,const QPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>clear_selection_button</sender>
@@ -1239,9 +1239,9 @@ Namespace1::Namespace2::...::NamespaceN</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">updateClassStore()</slot>
-    <slot access="protected">access_view_mouseButtonPressed( int button, QListViewItem * item, const QPoint &amp; p, int c )</slot>
+    <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const QPoint &amp; p, int c )</slot>
     <slot access="protected">classNameChanged( const QString &amp; text )</slot>
     <slot access="protected">headerChanged()</slot>
     <slot access="protected">implementationChanged()</slot>
@@ -1253,7 +1253,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
     <slot access="protected">currBaseProtectedSet()</slot>
     <slot access="protected">currBasePublicSet()</slot>
     <slot access="protected">currBaseVirtualChanged( int val )</slot>
-    <slot access="protected">currBaseSelected( QListViewItem * it )</slot>
+    <slot access="protected">currBaseSelected( TQListViewItem * it )</slot>
     <slot access="protected">checkObjCInheritance( int val )</slot>
     <slot access="protected">checkQWidgetInheritance( int val )</slot>
     <slot access="protected">newTabSelected( const QString &amp; text )</slot>
@@ -1261,7 +1261,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
     <slot access="protected">changeToProtected()</slot>
     <slot access="protected">changeToPublic()</slot>
     <slot access="protected">changeToInherited()</slot>
-    <slot access="protected">methods_view_mouseButtonPressed( int, QListViewItem *, const QPoint &amp;, int )</slot>
+    <slot access="protected">methods_view_mouseButtonPressed( int, TQListViewItem *, const QPoint &amp;, int )</slot>
     <slot access="protected">newTabSelected( QWidget * w )</slot>
     <slot access="protected">extendFunctionality()</slot>
     <slot access="protected">replaceFunctionality()</slot>
@@ -1281,9 +1281,9 @@ Namespace1::Namespace2::...::NamespaceN</string>
     <slot access="protected">scopeboxActivated( int )</slot>
     <slot access="protected">classNamespaceChanged( const QString &amp; )</slot>
     <slot access="protected">headeronly_box_stateChanged(int val)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>classgeneratorconfig.h</includehint>
 </includehints>
diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp
index 7298354b..a9edc315 100644
--- a/languages/cpp/cppsplitheadersourceconfig.cpp
+++ b/languages/cpp/cppsplitheadersourceconfig.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tqdom.h>
 
-TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" );
+TQString CppSplitHeaderSourceConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/splitheadersource" );
 
 CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom )
         : TQObject( part ), m_part( part ), m_dom( dom )
diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h
index 20c0f94d..049d3236 100644
--- a/languages/cpp/cppsplitheadersourceconfig.h
+++ b/languages/cpp/cppsplitheadersourceconfig.h
@@ -26,9 +26,10 @@
 class CppSupportPart;
 class TQDomDocument;
 
-class CppSplitHeaderSourceConfig : public QObject
+class CppSplitHeaderSourceConfig : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     CppSplitHeaderSourceConfig( CppSupportPart* part, TQDomDocument* dom );
     virtual ~CppSplitHeaderSourceConfig();
diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h
index 2dbac39a..b40fc0ec 100644
--- a/languages/cpp/cppsupport_events.h
+++ b/languages/cpp/cppsupport_events.h
@@ -17,11 +17,7 @@
 #include <tqevent.h>
 #include <tqvaluelist.h>
 
-#if QT_VERSION < 0x030100
-#include <kdevmutex.h>
-#else
 #include <tqmutex.h>
-#endif
 
 enum
 {
@@ -29,7 +25,7 @@ enum
 };
 
 
-class FileParsedEvent: public QCustomEvent
+class FileParsedEvent: public TQCustomEvent
 {
 public:
 	FileParsedEvent( const TQString& fileName, const TQValueList<Problem>& problems, bool fromDisk = false )
diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp
index 338fa724..b4be045d 100644
--- a/languages/cpp/cppsupport_utils.cpp
+++ b/languages/cpp/cppsupport_utils.cpp
@@ -75,7 +75,7 @@ TQMap<TQString, TQString> typedefMap( const CodeModel* model )
 	TQMap<TQString, TQString>::iterator it = map.begin();
 	for ( ; it != map.end(); ++it )
 	{
-		while ( map.contains( map[ it.key() ] ) && 
+		while ( map.tqcontains( map[ it.key() ] ) && 
 		        it.key() != map[ it.key() ] )
 		{
 	 		map[ it.key() ] = map[ map[ it.key() ] ];
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 334c7d6c..2fa5e2d8 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -191,8 +191,8 @@ public:
 };
 
 
-CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args )
-: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0),
+CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args )
+: KDevLanguageSupport( CppSupportFactory::info(), tqparent, name ? name : "KDevCppSupport" ), m_backgroundParser(0),
 	m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ),
 	m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ),
 	_jd(0)
@@ -205,7 +205,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 		this, TQT_SLOT( splitHeaderSourceConfigStored() ) );
 	connect( m_pCompletionConfig, TQT_SIGNAL( stored() ),
 	         this, TQT_SLOT( codeCompletionConfigStored() ) );
-	m_qtBuildConfig = new QtBuildConfig( this, projectDom() );
+	m_qtBuildConfig = new TQtBuildConfig( this, projectDom() );
     m_qtBuildConfig->store();
 
 	m_backgroundParserConfig = new BackgroundParserConfig;
@@ -480,7 +480,7 @@ void CppSupportPart::activePartChanged( KParts::Part *part )
 	m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part );
 	m_activeViewCursor = dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView );
 
-	m_activeFileName = TQString::null;
+	m_activeFileName = TQString();
 
 	if ( m_activeDocument )
 	{
@@ -688,7 +688,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		if ( !text.isEmpty() )
 		{
 			id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) );
-			popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
+			popup->tqsetWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
 			                               "based on the member declaration at the current line." ) );
 		}
 
@@ -737,7 +737,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 			{
 				TQPopupMenu * m2 = new TQPopupMenu( popup );
 				id = popup->insertItem( i18n( "Go to Declaration" ), m2 );
-				popup->setWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
+				popup->tqsetWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
 				                               "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
 
 				FileDom file2 = codeModel() ->fileByName( candidate );
@@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 						text += "::";
 					}
 					text += formatModelItem( *it, true );
-					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
+					text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
 					int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
@@ -781,7 +781,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 			{
 				TQPopupMenu * m = new TQPopupMenu( popup );
 				id = popup->insertItem( i18n( "Go to Definition" ), m );
-				popup->setWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
+				popup->tqsetWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
 				                               "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
 
 				const FileDom file = codeModel() ->fileByName( candidate1 );
@@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 						text += "::";
 					}
 					text += formatModelItem( *it, true );
-					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
+					text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
 					int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
@@ -822,7 +822,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_activeClass = ( ClassModel* ) mcontext->item();
 			int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) );
-			popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
+			popup->tqsetWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
 			                               "No implementation code is extracted and no implementation code is created." ) );
 		}
 		else if ( mcontext->item() ->isFunction() )
@@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_contextFileName = url.path();
 			int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) );
-			popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
+			popup->tqsetWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
 		}
 	}
 }
@@ -850,7 +850,7 @@ TQStringList makeListUnique( const TQStringList& rhs ) {
 	TQMap<TQString, bool> map;
 	TQStringList ret;
 	for( TQStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) {
-		if( map.find( *it ) == map.end() ) {
+		if( map.tqfind( *it ) == map.end() ) {
 			ret << *it;
 			map.insert( *it, true );
 		}
@@ -871,14 +871,14 @@ TQStringList CppSupportPart::reorder( const TQStringList &list )
 	for ( it = list.begin(); it != list.end(); ++it )
 	{
 		TQString filePath = *it;
-		// brilliant stuff.. this method is apparently called both with
+		// brilliant stuff.. this method is aptqparently called both with
 		// relative and absolute paths..
 		if ( !filePath.startsWith("/") )
 		{
 			filePath = projectPath + "/" + filePath;
 		}
 		if( !isValidSource( filePath ) ) continue;
-		if ( headerExtensions.contains( TQFileInfo( filePath ).extension() ) )
+		if ( headerExtensions.tqcontains( TQFileInfo( filePath ).extension() ) )
 			headers << ( filePath );
 		else
 			others << ( filePath );
@@ -945,7 +945,7 @@ void CppSupportPart::savedFile( const KURL &file )
 
 	kdDebug( 9007 ) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl;
 
-	if ( m_projectFileList.contains( fileName.mid ( m_projectDirectory.length() + 1 ) ) )
+	if ( m_projectFileList.tqcontains( fileName.mid ( m_projectDirectory.length() + 1 ) ) )
 	{
 		maybeParse( fileName );
 		emit addedSourceInfo( fileName );
@@ -962,7 +962,7 @@ TQString CppSupportPart::findSourceFile()
 	// extract the base path (full path without '.' and extension)
 	TQString base = path.left( path.length() - ext.length() - 1 );
 	TQStringList candidates;
-	if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) )
+	if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) )
 	{
 		candidates << ( base + ".c" );
 		candidates << ( base + ".cc" );
@@ -997,7 +997,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		KTextEditor::Document * doc =
 			dynamic_cast<KTextEditor::Document*>( partController() ->activePart() );
 		if ( !doc )
-			return TQString::null;
+			return TQString();
 		urlPath = doc->url().path();
 	}
 	else
@@ -1010,14 +1010,14 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 	// extract the exension
 	TQString ext = fi.extension();
 	if ( ext.isEmpty() )
-		return TQString::null;
+		return TQString();
 	// extract the base path (full path without '.' and extension)
 	TQString base = path.left( path.length() - ext.length() - 1 );
 	//kdDebug( 9007 ) << "base: " << base << ", ext: " << ext << endl;
 	// just the filename without the extension
 	TQString fileNameWoExt = fi.fileName();
 	if ( !ext.isEmpty() )
-		fileNameWoExt.replace( "." + ext, "" );
+		fileNameWoExt.tqreplace( "." + ext, "" );
 	TQString possibleExts;
 	// depending on the current extension assemble a list of
 	// candidate files to look for
@@ -1026,13 +1026,13 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 	if ( path.endsWith( "_impl.h" ) )
 	{
 		TQString headerpath = path;
-		headerpath.replace( "_impl.h", ".h" );
+		headerpath.tqreplace( "_impl.h", ".h" );
 		candidates << headerpath;
-		fileNameWoExt.replace( "_impl", "" );
+		fileNameWoExt.tqreplace( "_impl", "" );
 		possibleExts = "h";
 	}
 	// if file is a header file search for implementation file
-	else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) )
+	else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) )
 	{
 		candidates << ( base + ".c" );
 		candidates << ( base + ".cc" );
@@ -1048,7 +1048,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		possibleExts = "c,cc,cpp,c++,cxx,C,m,mm,M,inl,_impl.h";
 	}
 	// if file is an implementation file, search for header file
-	else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) )
+	else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).tqcontains( ext ) )
 	{
 		candidates << ( base + ".h" );
 		candidates << ( base + ".H" );
@@ -1059,7 +1059,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		possibleExts = "h,H,hh,hxx,hpp,tlh";
 	}
         // search for files from the assembled candidate lists, return the first
-        // candidate file that actually exists or TQString::null if nothing is found.
+        // candidate file that actually exists or TQString() if nothing is found.
         TQStringList::ConstIterator it;
         for ( it = candidates.begin(); it != candidates.end(); ++it )
         {
@@ -1081,10 +1081,10 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		candidateFileWoExt.setFile(*fileIt);
 		//kdDebug( 9007 ) << "candidate file: " << *fileIt << endl;
 		if( !candidateFileWoExt.extension().isEmpty() )
-			candidateFileWoExtString = candidateFileWoExt.fileName().replace( "." + candidateFileWoExt.extension(), "" );
+			candidateFileWoExtString = candidateFileWoExt.fileName().tqreplace( "." + candidateFileWoExt.extension(), "" );
 		if ( candidateFileWoExtString == fileNameWoExt )
 		{
-			if ( possibleExtsList.contains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() )
+			if ( possibleExtsList.tqcontains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() )
 			{
 				//kdDebug( 9007 ) << "checking if " << *fileIt << " exists" << endl;
 				if ( TQFileInfo( *fileIt ).exists() )
@@ -1093,7 +1093,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 			}
 		}
 	}
-	return TQString::null;
+	return TQString();
 }
 
 void CppSupportPart::slotSaveMemory() {
@@ -1354,13 +1354,13 @@ KDevLanguageSupport::Features CppSupportPart::features()
 TQString CppSupportPart::formatClassName( const TQString &name )
 {
 	TQString n = name;
-	return n.replace( ".", "::" );
+	return n.tqreplace( ".", "::" );
 }
 
 TQString CppSupportPart::unformatClassName( const TQString &name )
 {
 	TQString n = name;
-	return n.replace( "::", "." );
+	return n.tqreplace( "::", "." );
 }
 
 bool CppSupportPart::shouldSplitDocument(const KURL &url)
@@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force )
 				uint offset;
 
 				_jd->stream >> fn >> ts >> offset;
-				_jd->pcs[ fn ] = qMakePair( ts, offset );
+				_jd->pcs[ fn ] = tqMakePair( ts, offset );
 			}
 		}
 	}
@@ -1554,11 +1554,11 @@ void CppSupportPart::slotParseFiles()
 			{
 				TQDateTime t = fileInfo.lastModified();
 
-				if ( ! ( m_timestamp.contains( absFilePath ) && m_timestamp[ absFilePath ] == t ) )
+				if ( ! ( m_timestamp.tqcontains( absFilePath ) && m_timestamp[ absFilePath ] == t ) )
 				{
-					if ( _jd->pcs.contains( absFilePath ) )
+					if ( _jd->pcs.tqcontains( absFilePath ) )
 					{
-						_jd->stream.device() ->at( _jd->pcs[ absFilePath ].second );
+						_jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second );
 						FileDom file = codeModel() ->create<FileModel>();
 						file->read( _jd->stream );
 						codeModel() ->addFile( file );
@@ -1678,7 +1678,7 @@ void CppSupportPart::maybeParse( const TQString& fn, bool background  )
 	if ( !fileInfo.exists() )
 		return;
 
-	TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path );
+	TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path );
 	if ( codeModel()->hasFile( fn ) && it != m_timestamp.end() && *it == t )
 		return;
 
@@ -1705,7 +1705,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint
 	{
 
 		while ( node && node->nodeType() != NodeType_FunctionDefinition )
-			node = node->parent();
+			node = node->tqparent();
 
 		if ( node )
 		{
@@ -1747,11 +1747,11 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 		{
 			if ( currentNode->nodeType() == NodeType_Declarator )
 				declarator = ( DeclaratorAST* ) currentNode;
-			currentNode = currentNode->parent();
+			currentNode = currentNode->tqparent();
 		}
 		SimpleDeclarationAST* decl = currentNode ? ( SimpleDeclarationAST* ) currentNode : 0;
 
-		if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().contains("friend") )
+		if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().tqcontains("friend") )
 		{
 			kdDebug(9007) << "this is a friend declaration, don't create any definition" << endl;
 			fail = true;
@@ -1777,7 +1777,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 			TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace();
 			if ( declarator->exceptionSpecification() )
 			{
-				declStr += TQString::fromLatin1( " throw( " );
+				declStr += TQString::tqfromLatin1( " throw( " );
 				TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList();
 				TQPtrListIterator<AST> type_it( l );
 				while ( type_it.current() )
@@ -1786,10 +1786,10 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 					++type_it;
 
 					if ( type_it.current() )
-						declStr += TQString::fromLatin1( ", " );
+						declStr += TQString::tqfromLatin1( ", " );
 				}
 
-				declStr += TQString::fromLatin1( " )" );
+				declStr += TQString::tqfromLatin1( " )" );
 			}
 
 			text += "\n\n";
@@ -1903,7 +1903,7 @@ TQStringList CppSupportPart::modifiedFileList()
 
 		TQDateTime t = fileInfo.lastModified();
 
-		TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path );
+		TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path );
 		if ( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t )
 			continue;
 
@@ -1983,7 +1983,7 @@ void CppSupportPart::setupCatalog( )
 		kdDebug( 9007 ) << "CppSupportPart::setupCatalog()2 " << *it << endl;
 		Catalog * catalog = new Catalog();
 		catalog->open( *it );
-		catalog->setEnabled( enabledPCSs.contains( TQFileInfo( *it ).baseName(true) ) );
+		catalog->setEnabled( enabledPCSs.tqcontains( TQFileInfo( *it ).baseName(true) ) );
 		++it;
 
 		for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt )
@@ -2034,10 +2034,10 @@ TQString CppSupportPart::formatTag( const Tag & inputTag )
 	switch ( tag.kind() )
 	{
 	case Tag::Kind_Namespace:
-		return TQString::fromLatin1( "namespace " ) + tag.name();
+		return TQString::tqfromLatin1( "namespace " ) + tag.name();
 
 	case Tag::Kind_Class:
-		return TQString::fromLatin1( "class " ) + tag.name();
+		return TQString::tqfromLatin1( "class " ) + tag.name();
 
 	case Tag::Kind_Function:
 	case Tag::Kind_FunctionDeclaration:
@@ -2179,25 +2179,25 @@ void CppSupportPart::saveProjectSourceInfo()
 	{
 		const FileDom dom = ( *it );
 		stream << dom->name() << m_timestamp[ dom->name() ].toTime_t();
-		if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) {
+		if( m_timestamp.tqfind( dom->name() ) == m_timestamp.end() ) {
 		  kdDebug( 9007 ) << dom->name() << ": timestamp is missing "  << endl;
 		}
-		offsets.insert( dom->name(), stream.device() ->at() );
+		offsets.insert( dom->name(), stream.tqdevice() ->at() );
 		stream << ( uint ) 0; // dummy offset
 	}
 
 	for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it )
 	{
 		const FileDom dom = ( *it );
-		int offset = stream.device() ->at();
+		int offset = stream.tqdevice() ->at();
 
 		dom->write( stream );
 
-		int end = stream.device() ->at();
+		int end = stream.tqdevice() ->at();
 
-		stream.device() ->at( offsets[ dom->name() ] );
+		stream.tqdevice() ->at( offsets[ dom->name() ] );
 		stream << offset;
-		stream.device() ->at( end );
+		stream.tqdevice() ->at( end );
 	}
 
 	TQFile::remove(  project() ->projectDirectory() + "/"
@@ -2259,7 +2259,7 @@ void CppSupportPart::slotExtractInterface( )
 	TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h";
 	if ( TQFile::exists( ifaceFileName ) )
 	{
-		KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ),
+		KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).tqarg( ifaceFileName ),
 		                    i18n( "C++ Support" ) );
 	}
 	else
@@ -2323,7 +2323,7 @@ int CppSupportPart::parseFilesAndDependencies( TQStringList files, bool backgrou
 		int cgroup = nextGroup;
 		nextGroup++;
 
-		if( fileGroups.find( *it ) != fileGroups.end() )
+		if( fileGroups.tqfind( *it ) != fileGroups.end() )
 			cgroup = fileGroups[*it];
 
 		for( TQStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit )
@@ -2575,19 +2575,19 @@ void CppSupportPart::emitFileParsed( TQStringList l )
 bool CppSupportPart::isHeader( const TQString& fileName ) const
 {
 	/*KMimeType::Ptr ptr = KMimeType::findByPath( fileName );
-	if ( ptr && m_headerMimeTypes.contains( ptr->name() ) )
+	if ( ptr && m_headerMimeTypes.tqcontains( ptr->name() ) )
 		return true;*/
 
-	return ( m_headerExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 );
+	return ( m_headerExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 );
 }
 
 bool CppSupportPart::isSource( const TQString& fileName ) const
 {
 	/*KMimeType::Ptr ptr = KMimeType::findByPath( fileName );
-	if ( ptr && m_sourceMimeTypes.contains( ptr->name() ) )
+	if ( ptr && m_sourceMimeTypes.tqcontains( ptr->name() ) )
 		return true;*/
 
-	return ( m_sourceExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 );
+	return ( m_sourceExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 );
 }
 
 void CppSupportPart::gotoDeclarationLine( int line )
@@ -2759,12 +2759,12 @@ KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::Designer
 	switch ( type )
 	{
 	case KInterfaceDesigner::Glade:
-	case KInterfaceDesigner::QtDesigner:
+	case KInterfaceDesigner::TQtDesigner:
 		des = m_designers[ type ];
 		if ( des == 0 )
 		{
 			CppImplementationWidget * impl = new CppImplementationWidget( this );
-			des = new QtDesignerCppIntegration( this, impl );
+			des = new TQtDesignerCppIntegration( this, impl );
 			des->loadSettings( *project() ->projectDom(), "kdevcppsupport/designerintegration" );
 			m_designers[ type ] = des;
 		}
@@ -2791,7 +2791,7 @@ void CppSupportPart::slotCreateSubclass()
 	TQFileInfo fi( m_contextFileName );
 	if ( fi.extension( false ) != "ui" )
 		return ;
-	QtDesignerCppIntegration *des = dynamic_cast<QtDesignerCppIntegration*>( designer( KInterfaceDesigner::QtDesigner ) );
+	TQtDesignerCppIntegration *des = dynamic_cast<TQtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) );
 	if ( des )
 		des->selectImplementation( m_contextFileName );
 }
@@ -2825,7 +2825,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 		indentString = sourceFormatter->indentString();
 
 	editIface->insertText( findInsertionLineMethod( aClass, accessType ), 0,
-	                       finalDeclaration.replace( "\n", "\n\t" ) + "\n" );
+	                       finalDeclaration.tqreplace( "\n", "\n\t" ) + "\n" );
 
 	backgroundParser() ->addFile( aClass->fileName() );
 	if ( isInline || isPureVirtual )
@@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 	if ( !editIface )
 		return ; //@fixme errorverdoedelung
 
-	editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
+	editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
 	editIface->insertText( editIface->numLines() - 1, 0, definitionString );
 	backgroundParser() ->addFile( implementationFile );
 }
@@ -3118,7 +3118,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) {
 	w.parseTranslationUnit( *file );
 	codeRepository()->touchCatalog( catalog );
 
-	m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) );
+	m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()) );
 }
 
 TQString CppSupportPart::findHeaderSimple( const TQString &header )
@@ -3133,17 +3133,17 @@ TQString CppSupportPart::findHeaderSimple( const TQString &header )
                         return s;
         }
 
-        return TQString::null;
+        return TQString();
 }
 
-UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) {
+UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& tqparent ) : TQThread(), m_parent( tqparent ), m_stop(false) {
 }
 
 void UIBlockTester::UIBlockTesterThread::run() {
   while(!m_stop) {
 	  msleep( m_parent.m_msecs / 10 );
 	  m_parent.m_timeMutex.lock();
-	  TQDateTime t = TQDateTime::currentDateTime();
+	  TQDateTime t = TQDateTime::tqcurrentDateTime();
 	  uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() );
 	  if( msecs > m_parent.m_msecs ) {
 		  m_parent.lockup();
@@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() {
 
 void UIBlockTester::timer() {
 	m_timeMutex.lock();
-	m_lastTime = TQDateTime::currentDateTime();
+	m_lastTime = TQDateTime::tqcurrentDateTime();
 	m_timeMutex.unlock();
 }
 
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index 00628c94..b9d5a53f 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -39,9 +39,10 @@
 ///A class that helps detecting what exactly makes the UI block. To use it, just place a breakpoint on UIBlockTester::lockup() and inspect the execution-position of the main thread
 class UIBlockTester : public TQObject {
 	Q_OBJECT
+  TQ_OBJECT
     class UIBlockTesterThread : public TQThread {
     public:
-      UIBlockTesterThread( UIBlockTester& parent );
+      UIBlockTesterThread( UIBlockTester& tqparent );
       void run();
       void stop();
     private:
@@ -74,7 +75,7 @@ class CppCodeCompletion;
 class CppCodeCompletionConfig;
 class CppSplitHeaderSourceConfig;
 class CreateGetterSetterConfiguration;
-class QtBuildConfig;
+class TQtBuildConfig;
 class ProblemReporter;
 class BackgroundParser;
 class Catalog;
@@ -142,7 +143,7 @@ public:
 		m_fileSet.insert( s );
 	}
 
-    bool contains( const HashedString& str ) const {
+    bool tqcontains( const HashedString& str ) const {
 		TQMutexLocker locker( &m_mutex );
         return m_fileSet.find( str ) != m_fileSet.end();
     }
@@ -155,9 +156,10 @@ private:
 class CppSupportPart : public KDevLanguageSupport
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	CppSupportPart( TQObject *parent, const char *name, const TQStringList &args );
+	CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args );
 	virtual ~CppSupportPart();
 
 	bool isValid() const
@@ -203,10 +205,10 @@ public:
 	}
 	
 	/**
-		Get a pointer to the QtBuildConfig object
-		@return A pointer to the QtBuildConfig object.
+		Get a pointer to the TQtBuildConfig object
+		@return A pointer to the TQtBuildConfig object.
 	*/
-	inline QtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; }
+	inline TQtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; }
 
     const TQPtrList<Catalog>& catalogList() const
 	{
@@ -415,7 +417,7 @@ private:
 	KAction * m_createGetterSetterAction;
 	KAction * m_switchHeaderSourceAction;
 	
-	QtBuildConfig* m_qtBuildConfig;
+	TQtBuildConfig* m_qtBuildConfig;
 
 	bool withcpp;
 	TQString m_contextFileName;
@@ -481,7 +483,7 @@ private:
 		    {
 		    }
 	    };
-	    //typedef QPair<TQStringList, TQStringList> Item; ///The files we are waiting fore, and the files we already got
+	    //typedef TQPair<TQStringList, TQStringList> Item; ///The files we are waiting fore, and the files we already got
         typedef TQValueList< Item > List;
         List m_waiting;
         
@@ -510,7 +512,7 @@ private:
         ///files that were not requested must not be processed, since they maybe do not respect the group-relationships.
         bool reject( TQString file ) {
             for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) {
-                if( (*it).first.find( file ) !=  (*it).first.end() ) {
+                if( (*it).first.tqfind( file ) !=  (*it).first.end() ) {
                     return false;
                 }
             }
@@ -520,7 +522,7 @@ private:
         bool waiting( TQString file, Flags forbidFlags = None, int count = 1 ) const {
             int hits = 0;
             for( List::const_iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) {
-                if( (*it).first.find( file ) !=  (*it).first.end() ) {
+                if( (*it).first.tqfind( file ) !=  (*it).first.end() ) {
                     if( ((Flags)((*it).flags & forbidFlags )) == None ) {
                         hits++;
                         if( hits >= count ) return true;
@@ -575,8 +577,8 @@ private:
 		Processed processFile( TQString file, Flags flag = None ) {
             TQStringList ret;
             for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) {
-                if( (*it).first.find( file ) !=  (*it).first.end() ) {
-                    if( (*it).second.find( file ) == (*it).second.end() ) {
+                if( (*it).first.tqfind( file ) !=  (*it).first.end() ) {
+                    if( (*it).second.tqfind( file ) == (*it).second.end() ) {
 	                    (*it).flags = (Flags) ((*it).flags | flag);
                         (*it).second << file;
                         if( (*it).second.count() == (*it).first.count() ) {
@@ -642,7 +644,7 @@ private:
 		int lastBackgroundState;
 		int backgroundState;
 		TQStringList reparseList;
-		TQMap< TQString, QPair<uint, uint> > pcs;
+		TQMap< TQString, TQPair<uint, uint> > pcs;
 		TQDataStream stream;
 		TQFile file;
 		TQTime lastParse;
diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui
index 0796d4fb..b9a9bca5 100644
--- a/languages/cpp/creategettersetter.ui
+++ b/languages/cpp/creategettersetter.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CreateGetterSetterDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CreateGetterSetterDialogBase</cstring>
     </property>
@@ -29,14 +29,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="0" column="5">
+        <widget class="TQCheckBox" row="0" column="5">
             <property name="name">
                 <cstring>m_chkInlineGet</cstring>
             </property>
@@ -53,7 +53,7 @@
                 <string>If this is checked the get method will be created inline; otherwise, it will not.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="0" column="0">
+        <widget class="TQCheckBox" row="0" column="0">
             <property name="name">
                 <cstring>m_chkGet</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <string>If this is checked a getter method will be created.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="0">
+        <widget class="TQCheckBox" row="1" column="0">
             <property name="name">
                 <cstring>m_chkSet</cstring>
             </property>
@@ -109,7 +109,7 @@
                 <string>The name of the created set method</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="5">
+        <widget class="TQCheckBox" row="1" column="5">
             <property name="name">
                 <cstring>m_chkInlineSet</cstring>
             </property>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -219,10 +219,10 @@
     <tabstop>m_btnCancel</tabstop>
     <tabstop>m_btnOk</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotInlineChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp
index 7190e796..3bee7f16 100644
--- a/languages/cpp/creategettersetterconfiguration.cpp
+++ b/languages/cpp/creategettersetterconfiguration.cpp
@@ -17,7 +17,7 @@
 
 #include <tqdom.h>
 #include <kmessagebox.h>
-TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" );
+TQString CreateGetterSetterConfiguration::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/creategettersetter" );
 
 CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) 
 : TQObject(part), m_part(part), m_settings(0)
diff --git a/languages/cpp/creategettersetterconfiguration.h b/languages/cpp/creategettersetterconfiguration.h
index 38bbb72d..50aacd92 100644
--- a/languages/cpp/creategettersetterconfiguration.h
+++ b/languages/cpp/creategettersetterconfiguration.h
@@ -33,8 +33,9 @@ class TQDomDocument;
  * The settings are stored per project under /kdevcppsupport/creategettersetter/.
  * @author Jonas Jacobi <j.jacobi@gmx.de>
  */
-class CreateGetterSetterConfiguration : public QObject{
+class CreateGetterSetterConfiguration : public TQObject{
 Q_OBJECT
+  TQ_OBJECT
 public:
     CreateGetterSetterConfiguration(CppSupportPart* part);
     ~CreateGetterSetterConfiguration();
diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp
index e63fcf23..5b5dae69 100644
--- a/languages/cpp/creategettersetterdialog.cpp
+++ b/languages/cpp/creategettersetterdialog.cpp
@@ -19,8 +19,8 @@
 #include "creategettersetterconfiguration.h"
 
 CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassDom aClass,
-	                                                VariableDom aVar, TQWidget *parent, const char *pName )
-: CreateGetterSetterDialogBase( parent, pName ), m_part( part ), m_class( aClass ), m_var( aVar )
+	                                                VariableDom aVar, TQWidget *tqparent, const char *pName )
+: CreateGetterSetterDialogBase( tqparent, pName ), m_part( part ), m_class( aClass ), m_var( aVar )
 {
 	TQString name = aVar->name();
 	setCaption( "Create methods for " + name );
diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h
index 435002f2..8f609c33 100644
--- a/languages/cpp/creategettersetterdialog.h
+++ b/languages/cpp/creategettersetterdialog.h
@@ -24,8 +24,9 @@ class CppSupportPart;
 class CreateGetterSetterDialog: public CreateGetterSetterDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0);
+	CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *tqparent = 0, const char *name = 0);
 
 protected slots:
 	void accept();
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index d716bcc2..cb5b25c1 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -102,7 +102,7 @@ public:
         TQString gccLibPath = SetupHelper::getGccIncludePath(&ok);
         if (!ok) 
             return;      
-		gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" );
+		gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" );
 		addIncludePath( gccLibPath );
 		//addIncludePath( "/usr/include/g++-3" );
 		//addIncludePath( "/usr/include/g++" );
@@ -116,8 +116,8 @@ public:
             addMacro( Macro( lst[1], lst[2] ) );
         }
 		addMacro( Macro( "__cplusplus", "1" ) );
-		addMacro( Macro( "Q_SIGNALS", "signals" ) );
-		addMacro( Macro( "Q_SLOTS", "slots" ) );
+		addMacro( Macro( "signals", "signals" ) );
+		addMacro( Macro( "slots", "slots" ) );
 	}
 
 private:
@@ -132,13 +132,13 @@ private:
 class PCSListViewItem: public KListViewItem
 {
 public:
-	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent )
-			: KListViewItem( parent ), m_importer( importer )
+	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* tqparent )
+			: KListViewItem( tqparent ), m_importer( importer )
 	{
 		init( ptr );
 	}
-	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent )
-			: KListViewItem( parent ), m_importer( importer )
+	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* tqparent )
+			: KListViewItem( tqparent ), m_importer( importer )
 	{
 		init( ptr );
 	}
@@ -196,8 +196,8 @@ public:
 
 
 
-CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl )
-	: CreatePCSDialogBase( parent, name, modal, fl ), m_part( part ), m_jobData( 0 )
+CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+	: CreatePCSDialogBase( tqparent, name, modal, fl ), m_part( part ), m_jobData( 0 )
 {
 	helpButton()->hide();
 	
@@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const
 		KService::Ptr ptr = *it;
 
 		int error = 0;
-		KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), TQStringList(), &error );
+		KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error );
 		if ( importer )
 		{
 			new PCSListViewItem( ptr, importer, importerListView );
diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h
index 87c4818d..e9371434 100644
--- a/languages/cpp/createpcsdialog.h
+++ b/languages/cpp/createpcsdialog.h
@@ -19,9 +19,10 @@ class CppSupportPart;
 class CreatePCSDialog : public CreatePCSDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~CreatePCSDialog();
 	/*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index 09b59a70..54857eae 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CreatePCSDialogBase</class>
-<widget class="QWizard">
+<widget class="TQWizard">
     <property name="name">
         <cstring>CreatePCSDialogBase</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>New Persistant Class Store</string>
     </property>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>importerPage</cstring>
         </property>
@@ -47,7 +47,7 @@
             </widget>
         </vbox>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>settingsPage</cstring>
         </property>
@@ -55,7 +55,7 @@
             <string>Select directory</string>
         </attribute>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>descriptionPage</cstring>
         </property>
@@ -66,7 +66,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>textLabel1</cstring>
                 </property>
@@ -89,7 +89,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>111</height>
@@ -98,7 +98,7 @@
             </spacer>
         </vbox>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>finalPage</cstring>
         </property>
@@ -109,12 +109,12 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QProgressBar">
+            <widget class="TQProgressBar">
                 <property name="name">
                     <cstring>progressBar</cstring>
                 </property>
             </widget>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>currentFile</cstring>
                 </property>
@@ -132,7 +132,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>81</height>
@@ -151,16 +151,16 @@
     </connection>
     <connection>
         <sender>importerListView</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>CreatePCSDialogBase</receiver>
-        <slot>slotSelectionChanged(QListViewItem*)</slot>
+        <slot>slotSelectionChanged(TQListViewItem*)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>slotSelected(const QString&amp;)</slot>
-    <slot>slotSelectionChanged(QListViewItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>slotSelectionChanged(TQListViewItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/TODO.txt b/languages/cpp/debugger/TODO.txt
index 38aca109..563cf85c 100644
--- a/languages/cpp/debugger/TODO.txt
+++ b/languages/cpp/debugger/TODO.txt
@@ -69,7 +69,7 @@ TODO:
 
        - Add icons
 
-       - Status display column is just ugly
+       - tqStatus display column is just ugly
      
        - Handle "out of breakpoints" message.
 
diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index c9ed193e..9d1860e4 100644
--- a/languages/cpp/debugger/breakpoint.cpp
+++ b/languages/cpp/debugger/breakpoint.cpp
@@ -213,7 +213,7 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const
 TQString Breakpoint::dbgRemoveCommand() const
 {
     if (dbgId_>0)
-        return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable
+        return TQString("-break-delete %1").tqarg(dbgId_); // gdb command - not translatable
 
     return TQString();
 }
@@ -386,7 +386,7 @@ FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum,
     : Breakpoint(temporary, enabled)
 {
     // Sets 'subtype'
-    setLocation(TQString("%1:%2").arg(fileName).arg(lineNum));
+    setLocation(TQString("%1:%2").tqarg(fileName).tqarg(lineNum));
 }
 
 FilePosBreakpoint::~FilePosBreakpoint()
@@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const TQString& location)
 
         line_ = regExp1.cap(2).toInt();
 
-        location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2));
+        location_ = TQString("%1:%2").tqarg(fileName_).tqarg(regExp1.cap(2));
     }
     else
     {
@@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller)
 
         controller->addCommandBeforeRun(
             new GDBCommand(
-                TQString("-data-evaluate-expression &%1").arg(varName_),
+                TQString("-data-evaluate-expression &%1").tqarg(varName_),
                 this,
                 &Watchpoint::handleAddressComputed));
     }
@@ -547,7 +547,7 @@ void Watchpoint::handleAddressComputed(const GDBMI::ResultRecord& r)
     address_ = r["value"].literal().toULongLong(0, 16);
     controller()->addCommandBeforeRun(
         new GDBCommand(
-            TQString("-break-watch *%1").arg(r["value"].literal()),
+            TQString("-break-watch *%1").tqarg(r["value"].literal()),
             static_cast<Breakpoint*>(this),
             &Watchpoint::handleSet));
 }
diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h
index 8470617c..64db16d5 100644
--- a/languages/cpp/debugger/breakpoint.h
+++ b/languages/cpp/debugger/breakpoint.h
@@ -44,9 +44,10 @@ enum BP_TYPES
     BP_TYPE_ReadWatchpoint
 };
 
-class Breakpoint : public QObject
+class Breakpoint : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     Breakpoint(bool temporary=false, bool enabled=true);
     virtual ~Breakpoint();
diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h
index 7b161313..9c555e51 100644
--- a/languages/cpp/debugger/dbgcontroller.h
+++ b/languages/cpp/debugger/dbgcontroller.h
@@ -65,9 +65,10 @@ enum DBGStateFlags
 /***************************************************************************/
 /***************************************************************************/
 /***************************************************************************/
-class DbgController : public QObject
+class DbgController : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -117,7 +118,7 @@ signals:
     void gdbUserCommandStdout (const char *output);
     void gdbStderr            (const char *output);
     void showStepInSource     (const TQString &fileName, int lineNum, const TQString &address);
-    void dbgStatus            (const TQString &status, int statusFlag);
+    void dbgtqStatus            (const TQString &status, int statusFlag);
 
 protected:
     KProcess *dbgProcess_;
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index e96d7395..e08a1cec 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -50,8 +50,8 @@ namespace GDBDebugger
 // For use with the internal debugger, but this dialog doesn't know anything
 // about why it's doing it.
 
-Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
-    : KDialog(parent, name, true),      // modal
+Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name)
+    : KDialog(tqparent, name, true),      // modal
       psProc_(0),
       pids_(new KListView(this)),
       pidLines_(TQString())
@@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     buttonbox->addStretch();
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     TQPushButton *cancel   = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->layout();
+    buttonbox->tqlayout();
     topLayout->addWidget(buttonbox);
 
     connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
@@ -155,14 +155,14 @@ void Dbg_PS_Dialog::slotProcessExited()
 
     pidLines_ += '\n';
 
-    int start = pidLines_.find('\n', 0);  // Skip the first line (header line)
+    int start = pidLines_.tqfind('\n', 0);  // Skip the first line (header line)
     int pos;
 
     static TQRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)");
-    while ( (pos = pidLines_.find('\n', start)) != -1) {        
+    while ( (pos = pidLines_.tqfind('\n', start)) != -1) {        
 
         TQString item = pidLines_.mid(start, pos-start);
-        if (!item.isEmpty() && item.find(pidCmd_) == -1)
+        if (!item.isEmpty() && item.tqfind(pidCmd_) == -1)
         {
             if(ps_output_line.search(item) == -1)
             {
@@ -172,7 +172,7 @@ void Dbg_PS_Dialog::slotProcessExited()
                     // to 'arg'.
                     i18n("<b>Could not parse output from the <tt>ps</tt> command.</b>"
                          "<p>The following line could not be parsed:"
-                         "<b><tt>%1</tt>").arg(item),
+                         "<b><tt>%1</tt>").tqarg(item),
                     i18n("Internal error"), "gdb_error" );
                 break;
             }
diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h
index 214e67a7..273bb7b8 100644
--- a/languages/cpp/debugger/dbgpsdlg.h
+++ b/languages/cpp/debugger/dbgpsdlg.h
@@ -31,9 +31,10 @@ namespace GDBDebugger
 class Dbg_PS_Dialog : public KDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 );
+    Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 );
     ~Dbg_PS_Dialog();
 
     int pidSelected();
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 3fbef3c4..aaf4476b 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QT_MAC
+#ifndef TQT_MAC
 #include "dbgtoolbar.h"
 #include "debuggerpart.h"
 #include "dbgcontroller.h"
@@ -65,10 +65,10 @@ namespace GDBDebugger
 // the iconify, close, etc buttons from the window title but again I kept running
 // into problems. Instead, I used no decoration and this class. Also this looks
 // similar to the KToolBar floating style.
-class DbgMoveHandle : public QFrame
+class DbgMoveHandle : public TQFrame
 {
 public:
-    DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0);
+    DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0);
     virtual ~DbgMoveHandle();
 
     virtual void mousePressEvent(TQMouseEvent *e);
@@ -83,9 +83,9 @@ private:
 
 // **************************************************************************
 
-DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f)
-    : TQFrame(parent, name, f),
-      toolBar_(parent),
+DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f)
+    : TQFrame(tqparent, name, f),
+      toolBar_(tqparent),
       offset_(TQPoint(0,0)),
       moving_(false)
 {
@@ -107,21 +107,21 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
     if (moving_)
         return;
 
-    if (e->button() == RightButton) {
+    if (e->button() == Qt::RightButton) {
         KPopupMenu *menu = new KPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
-                         parent(), TQT_SLOT(slotDock()));
+                         tqparent(), TQT_SLOT(slotDock()));
         menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"),
-                         parent(), TQT_SLOT(slotIconifyAndDock()));
+                         tqparent(), TQT_SLOT(slotIconifyAndDock()));
         menu->popup(e->globalPos());
     } else {
         moving_ = true;
-        offset_ = parentWidget()->pos() - e->globalPos();
+        offset_ = tqparentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
-        setPalette(TQPalette(colorGroup().background()));
-        repaint();
+        setPalette(TQPalette(tqcolorGroup().background()));
+        tqrepaint();
     }
 }
 
@@ -134,8 +134,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
     offset_ = TQPoint(0,0);
     setFrameStyle(TQFrame::Panel|TQFrame::Raised);
     TQApplication::restoreOverrideCursor();
-    setPalette(TQPalette(colorGroup().background()));
-    repaint();
+    setPalette(TQPalette(tqcolorGroup().background()));
+    tqrepaint();
 }
 
 // **************************************************************************
@@ -153,16 +153,16 @@ void DbgMoveHandle::mouseMoveEvent(TQMouseEvent *e)
 // **************************************************************************
 // **************************************************************************
 
-// This class adds text _and_ a pixmap to a button. Why doesn't QPushButton
+// This class adds text _and_ a pixmap to a button. Why doesn't TQPushButton
 // support that? It only allowed text _or_ pixmap.
-class DbgButton : public QPushButton
+class DbgButton : public TQPushButton
 {
 public:
     DbgButton(const TQPixmap &pixmap, const TQString &text,
-              DbgToolBar *parent, const char *name=0);
+              DbgToolBar *tqparent, const char *name=0);
     virtual ~DbgButton() {};
     void drawButtonLabel(TQPainter *painter);
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 private:
     TQPixmap pixmap_;
@@ -171,8 +171,8 @@ private:
 // **************************************************************************
 
 DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text,
-                     DbgToolBar* parent, const char* name)
-    : TQPushButton(parent, name),
+                     DbgToolBar* tqparent, const char* name)
+    : TQPushButton(tqparent, name),
       pixmap_(pixmap)
 {
     setText(text);
@@ -191,21 +191,21 @@ void DbgButton::drawButtonLabel(TQPainter *painter)
     painter->drawPixmap(x, y, pixmap_);
 
     if (hasText) {
-        painter->setPen(colorGroup().text());
+        painter->setPen(tqcolorGroup().text());
         painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text());
     }
 }
 
 // **************************************************************************
 
-TQSize DbgButton::sizeHint() const
+TQSize DbgButton::tqsizeHint() const
 {
     if (text().isEmpty())
         return pixmap_.size();
     else
     {
         TQSize ps = pixmap_.size();
-        TQSize bs = TQPushButton::sizeHint();
+        TQSize bs = TQPushButton::tqsizeHint();
         TQSize result;
         result.setWidth( ps.width() + bs.width()+10 );
         result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() );
@@ -217,8 +217,8 @@ TQSize DbgButton::sizeHint() const
 // **************************************************************************
 // **************************************************************************
 
-DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) :
-    KSystemTray(parent, "DbgDocker"),
+DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) :
+    KSystemTray(tqparent, "DbgDocker"),
     toolBar_(toolBar)
 {
     setPixmap(pixmap);
@@ -229,17 +229,17 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm
 
 void DbgDocker::mousePressEvent(TQMouseEvent *e)
 {
-    if (!rect().contains( e->pos()))
+    if (!TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos()))
         return;
 
     switch (e->button()) {
-    case LeftButton:
+    case Qt::LeftButton:
         {
             // Not really a click, but it'll hold for the time being !!!
             emit clicked();
             break;
         }
-    case RightButton:
+    case Qt::RightButton:
         {
             KPopupMenu* menu = new KPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
@@ -258,7 +258,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
 // **************************************************************************
 
 DbgToolBar::DbgToolBar(DebuggerPart* part,
-                       TQWidget* parent, const char* name)
+                       TQWidget* tqparent, const char* name)
     : TQFrame(0, name),
       part_(part),
       activeWindow_(0),
@@ -268,10 +268,10 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
       appIsActive_(false),
       docked_(false),
       docker_(0),
-      dockWindow_(new KSystemTray(parent))
+      dockWindow_(new KSystemTray(tqparent))
 {
-    winModule_  = new KWinModule(this);
-    docker_ = new DbgDocker(parent, this, BarIcon("dbgnext"));
+    winModule_  = new KWinModule(TQT_TQOBJECT(this));
+    docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext"));
     connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver()));
 
     // Must have noFocus set so that we can see what window was active.
@@ -285,7 +285,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
 //    KWin::setType(winId(), NET::Override);    // So it has no decoration
     KWin::setType(winId(), NET::Dock);
 
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setFrameStyle( TQFrame::Box | TQFrame::Plain );
     setLineWidth(4);
     setMidLineWidth(0);
@@ -300,15 +300,15 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
 
     TQPushButton*  bRun        = new DbgButton(BarIcon("dbgrun"),        i18n("Run"),        this);
     TQPushButton*  bInterrupt  = new DbgButton(BarIcon("player_pause"),  i18n("Interrupt"),  this);
-    TQPushButton*  bNext       = new DbgButton(BarIcon("dbgnext"),       TQString::null,      this);
-    TQPushButton*  bNexti      = new DbgButton(BarIcon("dbgnextinst"),   TQString::null,      this);
-    TQPushButton*  bStep       = new DbgButton(BarIcon("dbgstep"),       TQString::null,      this);
-    TQPushButton*  bStepi      = new DbgButton(BarIcon("dbgstepinst"),   TQString::null,      this);
+    TQPushButton*  bNext       = new DbgButton(BarIcon("dbgnext"),       TQString(),      this);
+    TQPushButton*  bNexti      = new DbgButton(BarIcon("dbgnextinst"),   TQString(),      this);
+    TQPushButton*  bStep       = new DbgButton(BarIcon("dbgstep"),       TQString(),      this);
+    TQPushButton*  bStepi      = new DbgButton(BarIcon("dbgstepinst"),   TQString(),      this);
     TQPushButton*  bFinish     = new DbgButton(BarIcon("dbgstepout"),    i18n("Step Out"),   this);
     TQPushButton*  bRunTo      = new DbgButton(BarIcon("dbgrunto"),      i18n("Run to Cursor"),   this);
     TQPushButton*  bView       = new DbgButton(BarIcon("dbgmemview"),    i18n("Viewers"),    this);
-    bKDevFocus_ = new DbgButton(BarIcon("kdevelop"),      TQString::null,      this);
-    bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString::null,      this);
+    bKDevFocus_ = new DbgButton(BarIcon("kdevelop"),      TQString(),      this);
+    bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString(),      this);
 
   connect(bRun,        TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotRun()));
   connect(bInterrupt,  TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotPause()));
@@ -365,12 +365,12 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
     nextLayout->addWidget(bNext);
     nextLayout->addWidget(bNexti);
 
-//     int w = QMAX(bRun->sizeHint().width(), bFinish->sizeHint().width());
-//     w = QMAX(w, bInterrupt->sizeHint().width());
-//     w = QMAX(w, bView->sizeHint().width());
+//     int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width());
+//     w = TQMAX(w, bInterrupt->tqsizeHint().width());
+//     w = TQMAX(w, bView->tqsizeHint().width());
 
     // they should have the same height, so don't be too fussy
-//     int h = bFinish->sizeHint().height();
+//     int h = bFinish->tqsizeHint().height();
 //
 //     bNext->setMinimumHeight(h);
 //     bNexti->setMinimumHeight(h);
@@ -404,10 +404,10 @@ void DbgToolBar::slotKdevFocus()
     // If anyone has a way of determining what window the app is _actually_ running on
     // then please fix and send a patch.
 
-    if (winModule_->activeWindow() != topLevelWidget()->winId())
+    if (winModule_->activeWindow() != tqtopLevelWidget()->winId())
         activeWindow_ = winModule_->activeWindow();
 
-    KWin::activateWindow(topLevelWidget()->winId());
+    KWin::activateWindow(tqtopLevelWidget()->winId());
 }
 
 // **************************************************************************
@@ -421,7 +421,7 @@ void DbgToolBar::slotPrevFocus()
 
 // If the app is active then the app button is highlighted, otherwise
 // kdev button is highlighted.
-void DbgToolBar::slotDbgStatus(const TQString&, int state)
+void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
 {
     bool appIndicator = state & s_dbgBusy;
     if (appIndicator != appIsActive_) {
@@ -435,11 +435,11 @@ void DbgToolBar::slotDbgStatus(const TQString&, int state)
 void DbgToolBar::setAppIndicator(bool appIndicator)
 {
     if (appIndicator) {
-        bPrevFocus_->setPalette(TQPalette(colorGroup().mid()));
-        bKDevFocus_->setPalette(TQPalette(colorGroup().background()));
+        bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
+        bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
     } else {
-        bPrevFocus_->setPalette(TQPalette(colorGroup().background()));
-        bKDevFocus_->setPalette(TQPalette(colorGroup().mid()));
+        bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
+        bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
     }
 }
 
@@ -487,7 +487,7 @@ void DbgToolBar::slotActivateAndUndock()
     if (!docked_)
         return;
 
-    KWin::activateWindow(topLevelWidget()->winId());
+    KWin::activateWindow(tqtopLevelWidget()->winId());
     slotUndock();
 }
 
diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h
index 188862d4..427120d9 100644
--- a/languages/cpp/debugger/dbgtoolbar.h
+++ b/languages/cpp/debugger/dbgtoolbar.h
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QT_MAC
+#ifndef TQT_MAC
 #ifndef _DBGTOOLBAR_H_
 #define _DBGTOOLBAR_H_
 
@@ -33,9 +33,10 @@ class DebuggerPart;
 class DbgDocker : public KSystemTray
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap);
+    DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap);
     virtual ~DbgDocker()  {};
     virtual void mousePressEvent(TQMouseEvent *e);
 
@@ -47,16 +48,17 @@ private:
 };
 
 
-class DbgToolBar : public QFrame
+class DbgToolBar : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0);
+    DbgToolBar(DebuggerPart *part, TQWidget* tqparent, const char* name=0);
     virtual ~DbgToolBar();
 
 private slots:
-    void slotDbgStatus(const TQString&, int);
+    void slotDbgtqStatus(const TQString&, int);
     void slotDock();
     void slotUndock();
     void slotIconifyAndDock();
diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index f2891378..2fbc6a88 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -27,8 +27,8 @@
 namespace GDBDebugger
 {
 
-DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name)
-    : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom())
+DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *tqparent, const char *name)
+    : DebuggerConfigWidgetBase(tqparent, name), dom(*part->projectDom())
 {
     gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly);
 
@@ -37,7 +37,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent,
     TQString shell =             DomUtil::readEntry(dom, "/kdevdebugger/general/dbgshell","no_value");
     if( shell == TQString("no_value") )
     {
-	shell = TQString::null;
+	shell = TQString();
     }
     debuggingShell_edit->setURL( shell );
 
@@ -78,7 +78,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent,
 
     // ??? DomUtil::readEntry(dom, "/kdevdebugger/general/allowforcedbpset");
 
-    resize(sizeHint());
+    resize(tqsizeHint());
 }
 
 
diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h
index 3a8283a2..cdd2479d 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.h
+++ b/languages/cpp/debugger/debuggerconfigwidget.h
@@ -26,9 +26,10 @@ class DebuggerPart;
 class DebuggerConfigWidget : public DebuggerConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 );
+    DebuggerConfigWidget( DebuggerPart* part, TQWidget *tqparent=0, const char *name=0 );
     ~DebuggerConfigWidget();
 
 public slots:
diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index bf81b2d3..38048f18 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DebuggerConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>debugger_config_widget</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -34,7 +34,7 @@
  or directly in the project manager</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>gdbPath_label</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <string>To run "gdb" binary from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, "arm-gdb"), by typing the name here, or specify full path to the gdb executable.</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>debuggingShell_label</cstring>
             </property>
@@ -100,15 +100,15 @@
                 <string>If you want gdb to be executed by a special shell or tool insert it here. The main use-case is for Automake based projects where the application is actually only a script and &lt;b&gt;libtool&lt;/b&gt; is needed to get it to run inside gdb.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>groupBox2</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox" row="1" column="0">
+                        <widget class="TQCheckBox" row="1" column="0">
                             <property name="name">
                                 <cstring>asmDemangle_box</cstring>
                             </property>
@@ -132,7 +132,7 @@ can select to see the methods' mangled names.
 However, non-mangled names are easier to read.</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="0">
+                        <widget class="TQCheckBox" row="2" column="0">
                             <property name="name">
                                 <cstring>breakOnLoadingLibrary_box</cstring>
                             </property>
@@ -149,7 +149,7 @@ for more details relating to this behavior.
 If you are not "dlopen"ing libs then leave this unchecked.</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="4" column="0">
+                        <widget class="TQCheckBox" row="4" column="0">
                             <property name="name">
                                 <cstring>dbgTerminal_box</cstring>
                             </property>
@@ -166,7 +166,7 @@ If you use terminal input in your application then check this option.
 Otherwise leave it unchecked.</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="3" column="0">
+                        <widget class="TQCheckBox" row="3" column="0">
                             <property name="name">
                                 <cstring>enableFloatingToolBar_box</cstring>
                             </property>
@@ -185,7 +185,7 @@ can also be docked into the panel.
 This toolbar is in addition to the toolbar in KDevelop.</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>displayStaticMembers_box</cstring>
                             </property>
@@ -206,15 +206,15 @@ check this option.</string>
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>globalOutputRadix</cstring>
                             </property>
@@ -225,7 +225,7 @@ check this option.</string>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>outputRadixOctal</cstring>
                                     </property>
@@ -233,7 +233,7 @@ check this option.</string>
                                         <string>Oct&amp;al</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>outputRadixHexadecimal</cstring>
                                     </property>
@@ -241,7 +241,7 @@ check this option.</string>
                                         <string>He&amp;xadecimal</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>outputRadixDecimal</cstring>
                                     </property>
@@ -251,7 +251,7 @@ check this option.</string>
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>buttonGroup2</cstring>
                             </property>
@@ -262,7 +262,7 @@ check this option.</string>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioFramestack</cstring>
                                     </property>
@@ -270,7 +270,7 @@ check this option.</string>
                                         <string>Framestack</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioGDB</cstring>
                                     </property>
@@ -284,7 +284,7 @@ check this option.</string>
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -301,15 +301,15 @@ check this option.</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>runShellScript_label</cstring>
                             </property>
@@ -356,7 +356,7 @@ or if your executable contains the gdb stub
 2b) Execute "application" on target.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>runGdbScript_label</cstring>
                             </property>
@@ -368,7 +368,7 @@ or if your executable contains the gdb stub
                                 <cstring>runGdbScript_edit</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>configGdbScript_label</cstring>
                             </property>
@@ -404,7 +404,7 @@ or if your executable contains the gdb stub
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -431,8 +431,8 @@ or if your executable contains the gdb stub
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 4842ca84..22621630 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdebugger");
 typedef KDevGenericFactory<DebuggerPart> DebuggerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) )
 
-DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) :
-    KDevPlugin( &data, parent, name ? name : "DebuggerPart" ),
+DebuggerPart::DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) :
+    KDevPlugin( &data, tqparent, name ? name : "DebuggerPart" ),
     controller(0), previousDebuggerState_(s_dbgNotStarted),
     justRestarted_(false), needRebuild_(true),
     running_(false)
@@ -92,7 +92,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     statusBarIndicator = new LabelWithDoubleClick(
         " ", mainWindow()->statusBar());
     statusBarIndicator->setFixedWidth(15);
-    statusBarIndicator->setAlignment(Qt::AlignCenter);
+    statusBarIndicator->tqsetAlignment(TQt::AlignCenter);
     mainWindow()->statusBar()->addWidget(statusBarIndicator, 0, true);
     statusBarIndicator->show();
 
@@ -376,7 +376,7 @@ void DebuggerPart::setupDcop()
 {
     QCStringList objects = kapp->dcopClient()->registeredApplications();
     for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it)
-        if ((*it).find("drkonqi-") == 0)
+        if ((*it).tqfind("drkonqi-") == 0)
             slotDCOPApplicationRegistered(*it);
 
     connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&)));
@@ -385,7 +385,7 @@ void DebuggerPart::setupDcop()
 
 void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId)
 {
-    if (appId.find("drkonqi-") == 0) {
+    if (appId.tqfind("drkonqi-") == 0) {
         TQByteArray answer;
         TQCString replyType;
 
@@ -491,7 +491,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
     int index = running ? 0 : -1;
     if (running)
     {
-        // Too bad we can't add TQAction to popup menu in Qt3.
+        // Too bad we can't add TQAction to popup menu in TQt3.
         KAction* act = actionCollection()->action("debug_runtocursor");
         Q_ASSERT(act);
         if (act)
@@ -500,7 +500,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
                                         this, TQT_SLOT(slotRunToCursor()),
                                         0, -1, index);
 
-            popup->setWhatsThis(id, act->whatsThis());
+            popup->tqsetWhatsThis(id, act->whatsThis());
             index += running;
         }
     }
@@ -510,21 +510,21 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
                                     this, TQT_SLOT(toggleBreakpoint()),
                                     0, -1, index);
         index += running;
-        popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
+        popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
     }
     if (!m_contextIdent.isEmpty())
     {
         TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
-        int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed),
+        int id = popup->insertItem( i18n("Evaluate: %1").tqarg(squeezed),
                                     this, TQT_SLOT(contextEvaluate()),
                                     0, -1, index);
         index += running;
-        popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
-        int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed),
+        popup->tqsetWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor."));
+        int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed),
                                      this, TQT_SLOT(contextWatch()),
                                     0, -1, index);
         index += running;
-        popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
+        popup->tqsetWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list."));
     }
     if (running)
         popup->insertSeparator(index);
@@ -589,8 +589,8 @@ void DebuggerPart::setupController()
              disassembleWidget,     TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&)));
 
     // controller -> this
-    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             this,                  TQT_SLOT(slotStatus(const TQString&, int)));
+    connect( controller,            TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
+             this,                  TQT_SLOT(slottqStatus(const TQString&, int)));
     connect( controller,            TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
              this,                  TQT_SLOT(slotShowStep(const TQString&, int)));
     connect( controller,            TQT_SIGNAL(debuggerAbnormalExit()),
@@ -613,16 +613,16 @@ void DebuggerPart::setupController()
 
     connect( controller,            TQT_SIGNAL(gdbStderr(const char*)),
              gdbOutputWidget,       TQT_SLOT(slotReceivedStderr(const char*)) );
-    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             gdbOutputWidget,       TQT_SLOT(slotDbgStatus(const TQString&, int)));
+    connect( controller,            TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
+             gdbOutputWidget,       TQT_SLOT(slotDbgtqStatus(const TQString&, int)));
 
     // controller -> viewerWidget
-    connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)),
+    connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
              viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int)));
 
 
     connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()),
-            controller, TQT_SLOT(explainDebuggerStatus()));
+            controller, TQT_SLOT(explainDebuggertqStatus()));
 
 }
 
@@ -659,7 +659,7 @@ bool DebuggerPart::startDebugger()
         {
             KMessageBox::information(
                 mainWindow()->main(),
-                i18n("Could not locate the debugging shell '%1'.").arg( shell_without_args ),
+                i18n("Could not locate the debugging shell '%1'.").tqarg( shell_without_args ),
                 i18n("Debugging Shell Not Found"), "gdb_error" );
             return false;
         }
@@ -697,7 +697,7 @@ bool DebuggerPart::startDebugger()
 
         if (DomUtil::readBoolEntry(*projectDom(), "/kdevdebugger/general/floatingtoolbar", false))
         {
-#ifndef QT_MAC
+#ifndef TQT_MAC
             floatingToolBar = new DbgToolBar(this, mainWindow()->main());
             floatingToolBar->show();
 #endif
@@ -955,7 +955,7 @@ void DebuggerPart::slotExamineCore()
     if (coreFile.isNull())
         return;
 
-    mainWindow()->statusBar()->message(i18n("Examining core file %1").arg(coreFile), 1000);
+    mainWindow()->statusBar()->message(i18n("Examining core file %1").tqarg(coreFile), 1000);
 
     startDebugger();
     controller->slotCoreFile(coreFile);
@@ -976,7 +976,7 @@ void DebuggerPart::slotAttachProcess()
 
 bool DebuggerPart::attachProcess(int pid)
 {
-    mainWindow()->statusBar()->message(i18n("Attaching to process %1").arg(pid), 1000);
+    mainWindow()->statusBar()->message(i18n("Attaching to process %1").tqarg(pid), 1000);
 
     bool ret = startDebugger();
     controller->slotAttachTo(pid);
@@ -1092,7 +1092,7 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP)
     }
 }
 
-void DebuggerPart::slotStatus(const TQString &msg, int state)
+void DebuggerPart::slottqStatus(const TQString &msg, int state)
 {
     TQString stateIndicator, stateIndicatorFull;
 
diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h
index a217cfee..71d56568 100644
--- a/languages/cpp/debugger/debuggerpart.h
+++ b/languages/cpp/debugger/debuggerpart.h
@@ -47,9 +47,10 @@ class ViewerWidget;
 class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DebuggerPart( TQObject *parent, const char *name, const TQStringList & );
+    DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~DebuggerPart();
     virtual void restorePartialProjectSession(const TQDomElement* el);
     virtual void savePartialProjectSession(TQDomElement* el);
@@ -94,7 +95,7 @@ private slots:
 
     void slotRefreshBPState(const Breakpoint&);
 
-    void slotStatus(const TQString &msg, int state);
+    void slottqStatus(const TQString &msg, int state);
     void slotShowStep(const TQString &fileName, int lineNum);
     void slotGotoSource(const TQString &fileName, int lineNum);
 
diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp
index 6bf70f3b..0af77613 100644
--- a/languages/cpp/debugger/debuggertracingdialog.cpp
+++ b/languages/cpp/debugger/debuggertracingdialog.cpp
@@ -14,8 +14,8 @@ namespace GDBDebugger
 
     DebuggerTracingDialog
     ::DebuggerTracingDialog(Breakpoint* bp,
-                            TQWidget* parent, const char* name)
-    : DebuggerTracingDialogBase(parent, name), bp_(bp)
+                            TQWidget* tqparent, const char* name)
+    : DebuggerTracingDialogBase(tqparent, name), bp_(bp)
     {
         expressions->setButtons(KEditListBox::Add | KEditListBox::Remove);
 
diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h
index 916ae912..e0e8dc48 100644
--- a/languages/cpp/debugger/debuggertracingdialog.h
+++ b/languages/cpp/debugger/debuggertracingdialog.h
@@ -23,9 +23,10 @@ namespace GDBDebugger
     class DebuggerTracingDialog : public DebuggerTracingDialogBase
     {
         Q_OBJECT
+  TQ_OBJECT
     public:
         DebuggerTracingDialog(Breakpoint* bp,
-                              TQWidget* parent, const char* name = 0);
+                              TQWidget* tqparent, const char* name = 0);
 
     private slots:
         void enableOrDisable(int);
diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui
index 333dc4de..17321999 100644
--- a/languages/cpp/debugger/debuggertracingdialogbase.ui
+++ b/languages/cpp/debugger/debuggertracingdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DebuggerTracingDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DebuggerTracingDialogBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>enable</cstring>
             </property>
@@ -31,7 +31,7 @@
 &lt;p&gt;Tracing is a mechanism to automatically print values of the choosed expressions and continue execution when breakpoint is hit. You can think of it as printf debugging that does not require modifying the source.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="2">
+        <widget class="TQPushButton" row="5" column="2">
             <property name="name">
                 <cstring>cancelButton</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <string>Cancel</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0">
+        <widget class="TQCheckBox" row="3" column="0">
             <property name="name">
                 <cstring>enableCustomFormat</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <string>Custom format string</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="1">
+        <widget class="TQPushButton" row="5" column="1">
             <property name="name">
                 <cstring>okButton</cstring>
             </property>
@@ -71,7 +71,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -103,7 +103,7 @@ If custom format string is not enabled, names and values of all expressions will
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>expressionsLabel</cstring>
             </property>
@@ -130,10 +130,10 @@ If custom format string is not enabled, names and values of all expressions will
         <slot>reject()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>enableOrDisable()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp
index 562aa1ae..6b848a27 100644
--- a/languages/cpp/debugger/disassemblewidget.cpp
+++ b/languages/cpp/debugger/disassemblewidget.cpp
@@ -35,8 +35,8 @@ namespace GDBDebugger
 /***************************************************************************/
 /***************************************************************************/
 
-DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name)
-        : TQTextEdit(parent, name), controller_(controller),
+DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *tqparent, const char *name)
+        : TQTextEdit(tqparent, name), controller_(controller),
         active_(false),
         lower_(0),
         upper_(0),
diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h
index 55288c0c..33f29da9 100644
--- a/languages/cpp/debugger/disassemblewidget.h
+++ b/languages/cpp/debugger/disassemblewidget.h
@@ -30,12 +30,13 @@ namespace GDBDebugger
 class Breakpoint;
 class GDBController;
 
-class DisassembleWidget : public QTextEdit
+class DisassembleWidget : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 );
+    DisassembleWidget( GDBController* controller, TQWidget *tqparent=0, const char *name=0 );
     virtual ~DisassembleWidget();
 
 public slots:
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index fb0246e6..28fd076e 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -39,9 +39,9 @@ namespace GDBDebugger
 {
 
 FramestackWidget::FramestackWidget(GDBController* controller,
-                                   TQWidget *parent, 
+                                   TQWidget *tqparent, 
                                    const char *name, WFlags f)
-        : TQListView(parent, name, f),
+        : TQListView(tqparent, name, f),
           viewedThread_(0),
           controller_(controller),
           mayUpdate_( false )
@@ -49,9 +49,9 @@ FramestackWidget::FramestackWidget(GDBController* controller,
     setRootIsDecorated(true);
     setSorting(-1);
     setSelectionMode(Single);
-    addColumn(TQString::null); // Frame number
-    addColumn(TQString::null); // function name/address
-    addColumn(TQString::null); // source
+    addColumn(TQString()); // Frame number
+    addColumn(TQString()); // function name/address
+    addColumn(TQString()); // source
     header()->hide();
 
 
@@ -111,7 +111,7 @@ void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem)
                 if (frame->threadNo() != -1)
                     controller_->addCommand(
                         new GDBCommand(TQString("-thread-select %1")
-                                       .arg(frame->threadNo()).ascii()));
+                                       .tqarg(frame->threadNo()).ascii()));
 
                viewedThread_ = findThread(frame->threadNo());
                getBacktrace(frame->frameNo(), frame->frameNo() + frameChunk_);
@@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame)
     maxFrame_ = max_frame;
 
     controller_->addCommand(
-        new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1),
+        new GDBCommand(TQString("-stack-info-depth %1").tqarg(max_frame+1),
                        this, 
                        &FramestackWidget::handleStackDepth));        
 }
@@ -224,7 +224,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r)
     //add the following command to the front, so noone switches threads in between
     controller_->addCommandToFront(
         new GDBCommand(TQString("-stack-list-frames %1 %2")
-                       .arg(minFrame_).arg(maxFrame_),
+                       .tqarg(minFrame_).tqarg(maxFrame_),
                        this, &FramestackWidget::parseGDBBacktraceList));    
 }
 
@@ -236,7 +236,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo)
         // Switch to the target thread.
         controller_->addCommand(
             new GDBCommand(TQString("-thread-select %1")
-                           .arg(threadNo).ascii()));
+                           .tqarg(threadNo).ascii()));
 
         viewedThread_ = findThread(threadNo);
     }
@@ -248,7 +248,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo)
         // Switch back to the original thread.
         controller_->addCommand(
             new GDBCommand(TQString("-thread-select %1")
-                           .arg(currentThread).ascii()));
+                           .tqarg(currentThread).ascii()));
     }
 }
 
@@ -274,13 +274,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r)
             TQString id = ids.results[i]->value->literal();
 
             controller_->addCommand(
-                new GDBCommand(TQString("-thread-select %1").arg(id).ascii(), 
+                new GDBCommand(TQString("-thread-select %1").tqarg(id).ascii(), 
                                this, &FramestackWidget::handleThread));
         }
 
         controller_->addCommand(
             new GDBCommand(TQString("-thread-select %1")
-                           .arg(controller_->currentThread()).ascii()));
+                           .tqarg(controller_->currentThread()).ascii()));
     }
 
     // Get backtrace for the current thread. We need to do this
@@ -493,10 +493,10 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy,
 // **************************************************************************
 // **************************************************************************
 
-FrameStackItem::FrameStackItem(FramestackWidget *parent, 
+FrameStackItem::FrameStackItem(FramestackWidget *tqparent, 
                                unsigned frameNo,
                                const TQString &name)
-        : TQListViewItem(parent, parent->lastChild()),
+        : TQListViewItem(tqparent, tqparent->lastChild()),
         frameNo_(frameNo),
         threadNo_(-1)
 {
@@ -505,12 +505,12 @@ FrameStackItem::FrameStackItem(FramestackWidget *parent,
 
 // **************************************************************************
 
-FrameStackItem::FrameStackItem(ThreadStackItem *parent, 
+FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, 
                                unsigned frameNo,
                                const TQString &name)
-        : TQListViewItem(parent, parent->lastChild()),
+        : TQListViewItem(tqparent, tqparent->lastChild()),
         frameNo_(frameNo),
-        threadNo_(parent->threadNo())
+        threadNo_(tqparent->threadNo())
 {
     setText(0, name);
 }
@@ -554,11 +554,11 @@ void FrameStackItem::setOpen(bool open)
 // **************************************************************************
 // **************************************************************************
 
-ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo)
-: TQListViewItem(parent),
+ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, unsigned threadNo)
+: TQListViewItem(tqparent),
   threadNo_(threadNo)
 {
-    setText(0, i18n("Thread %1").arg(threadNo_));
+    setText(0, i18n("Thread %1").tqarg(threadNo_));
     setExpandable(true);
 }
 
diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h
index 656d2cdb..5d0b98e7 100644
--- a/languages/cpp/debugger/framestackwidget.h
+++ b/languages/cpp/debugger/framestackwidget.h
@@ -30,10 +30,10 @@ namespace GDBDebugger
 class FramestackWidget;
 
 
-class ThreadStackItem : public QListViewItem
+class ThreadStackItem : public TQListViewItem
 {
 public:
-    ThreadStackItem(FramestackWidget *parent, 
+    ThreadStackItem(FramestackWidget *tqparent, 
                     unsigned threadNo);
     virtual ~ThreadStackItem();
 
@@ -56,13 +56,13 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class FrameStackItem : public QListViewItem
+class FrameStackItem : public TQListViewItem
 {
 public:
-    FrameStackItem(FramestackWidget *parent, 
+    FrameStackItem(FramestackWidget *tqparent, 
                    unsigned frameNo,
                    const TQString &name);
-    FrameStackItem(ThreadStackItem *parent, 
+    FrameStackItem(ThreadStackItem *tqparent, 
                    unsigned frameNo,
                    const TQString &name);
     virtual ~FrameStackItem();
@@ -88,13 +88,14 @@ private:
 /**
  * @author John Birch
  */
-class FramestackWidget : public QListView
+class FramestackWidget : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     FramestackWidget( GDBController* controller,
-                      TQWidget *parent=0,                       
+                      TQWidget *tqparent=0,                       
                       const char *name=0, WFlags f=0 );
     virtual ~FramestackWidget();
 
@@ -150,10 +151,6 @@ public slots:
     void slotEvent(GDBController::event_t e);
     void slotSelectionChanged(TQListViewItem *thisItem);
 
-#if QT_VERSION < 300
-private:
-  TQListViewItem* findItemWhichBeginsWith(const TQString& text) const;
-#endif
   virtual void showEvent(TQShowEvent*);
 
 private:
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index b092a015..38d9e7e8 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -56,7 +56,7 @@ enum Column {
     Control     = 0,
     Enable      = 1,
     Type        = 2,
-    Status      = 3,
+    tqStatus      = 3,
     Location    = 4,
     Condition   = 5,
     IgnoreCount = 6,
@@ -76,7 +76,7 @@ static int m_activeFlag = 0;
 /***************************************************************************/
 /***************************************************************************/
 
-class BreakpointTableRow : public QTableItem
+class BreakpointTableRow : public TQTableItem
 {
 public:
 
@@ -100,9 +100,9 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType,
+BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType,
                                        Breakpoint* bp) :
-        TQTableItem(parent, editType, ""),
+        TQTableItem(tqparent, editType, ""),
         m_breakpoint(bp)
 {
     appendEmptyRow();
@@ -146,7 +146,7 @@ void BreakpointTableRow::appendEmptyRow()
     ComplexEditCell* act = new ComplexEditCell(table());
     table()->setItem(row, Tracing, act);
     TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)),
-                     table()->parent(), TQT_SLOT(editTracing(TQTableItem*)));
+                     table()->tqparent(), TQT_SLOT(editTracing(TQTableItem*)));
 }
 
 /***************************************************************************/
@@ -161,7 +161,7 @@ void BreakpointTableRow::setRow()
 
         TQString status=m_breakpoint->statusDisplay(m_activeFlag);
 
-        table()->setText(row(), Status, status);
+        table()->setText(row(), tqStatus, status);
         table()->setText(row(), Condition, m_breakpoint->conditional());
         table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() ));
         table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() ));
@@ -183,7 +183,7 @@ void BreakpointTableRow::setRow()
 
         table()->setText(row(), Type, displayType);
         table()->adjustColumn(Type);
-        table()->adjustColumn(Status);
+        table()->adjustColumn(tqStatus);
         table()->adjustColumn(Location);
         table()->adjustColumn(Hits);
         table()->adjustColumn(IgnoreCount);
@@ -196,8 +196,8 @@ void BreakpointTableRow::setRow()
 /***************************************************************************/
 
 GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller,
-                                         TQWidget *parent, const char *name) :
-TQHBox(parent, name),
+                                         TQWidget *tqparent, const char *name) :
+TQHBox(tqparent, name),
 controller_(controller)
 {
     m_table = new GDBTable(0, numCols, this, name);
@@ -208,7 +208,7 @@ controller_(controller)
 
     m_table->hideColumn(Control);
     m_table->setColumnReadOnly(Type, true);
-    m_table->setColumnReadOnly(Status, true);
+    m_table->setColumnReadOnly(tqStatus, true);
     m_table->setColumnReadOnly(Hits, true);
     m_table->setColumnWidth( Enable, 20);
 
@@ -216,7 +216,7 @@ controller_(controller)
 
     header->setLabel( Enable,       "" );
     header->setLabel( Type,         i18n("Type") );
-    header->setLabel( Status,       i18n("Status") );
+    header->setLabel( tqStatus,       i18n("tqStatus") );
     header->setLabel( Location,     i18n("Location") );
     header->setLabel( Condition,    i18n("Condition") );
     header->setLabel( IgnoreCount,  i18n("Ignore Count") );
@@ -238,12 +238,12 @@ controller_(controller)
     m_ctxMenu->insertItem( i18n( "Show text" ),    BW_ITEM_Show );
     int edit_id =
         m_ctxMenu->insertItem( i18n( "Edit" ),    BW_ITEM_Edit );
-    m_ctxMenu->setAccel(Qt::Key_Enter, edit_id);
+    m_ctxMenu->setAccel(TQt::Key_Enter, edit_id);
     m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable );
     int del_id =
         m_ctxMenu->insertItem( SmallIcon("breakpoint_delete"),
                                i18n( "Delete" ),  BW_ITEM_Delete );
-    m_ctxMenu->setAccel(Qt::Key_Delete, del_id);
+    m_ctxMenu->setAccel(TQt::Key_Delete, del_id);
     m_ctxMenu->insertSeparator();
     m_ctxMenu->insertItem( i18n( "Disable all"), BW_ITEM_DisableAll );
     m_ctxMenu->insertItem( i18n( "Enable all"), BW_ITEM_EnableAll );
@@ -377,15 +377,15 @@ void GDBBreakpointWidget::slotWatchpointHit(int id,
              "Address: 0x%2<br>"
              "Old value: %3<br>"
              "New value: %4")
-        .arg(b->varName())
-        .arg(b->address(), 0, 16)
-        .arg(oldValue)
-        .arg(newValue));
+        .tqarg(b->varName())
+        .tqarg(b->address(), 0, 16)
+        .tqarg(oldValue)
+        .tqarg(newValue));
 }
 
 /***************************************************************************/
 
-BreakpointTableRow* GDBBreakpointWidget::find(Breakpoint *breakpoint)
+BreakpointTableRow* GDBBreakpointWidget::tqfind(Breakpoint *breakpoint)
 {
     // NOTE:- The match doesn't have to be equal. Each type of bp
     // must decide on the match criteria.
@@ -493,7 +493,7 @@ void GDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin
 {
     FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1);
 
-    BreakpointTableRow* btr = find(fpBP);
+    BreakpointTableRow* btr = tqfind(fpBP);
     if (btr)
     {
         removeBreakpoint(btr);
@@ -508,7 +508,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName,
 {
     FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1);
 
-    BreakpointTableRow* btr = find(fpBP);
+    BreakpointTableRow* btr = tqfind(fpBP);
     delete fpBP;
     if (btr)
     {
@@ -523,7 +523,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName,
 void GDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName)
 {
     Watchpoint *watchpoint = new Watchpoint(varName, false, true);
-    BreakpointTableRow* btr = find(watchpoint);
+    BreakpointTableRow* btr = tqfind(watchpoint);
     if (btr)
     {
         removeBreakpoint(btr);
@@ -557,7 +557,7 @@ void GDBBreakpointWidget::handleBreakpointList(const GDBMI::ResultRecord& r)
             if (b.hasField("cond"))
                 bp->setConditional(b["cond"].literal());
             else
-                bp->setConditional(TQString::null);
+                bp->setConditional(TQString());
             btr->setRow();
             emit publishBPState(*bp);
         }
@@ -917,7 +917,7 @@ void GDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineN
 {
     FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1);
 
-    BreakpointTableRow* btr = find(fpBP);
+    BreakpointTableRow* btr = tqfind(fpBP);
     delete fpBP;
 
     if (btr)
@@ -946,7 +946,7 @@ void GDBBreakpointWidget::slotBreakpointModified(Breakpoint* b)
 {
     emit publishBPState(*b);
 
-    if (BreakpointTableRow* btr = find(b))
+    if (BreakpointTableRow* btr = tqfind(b))
     {
         if (b->isActionDie())
         {
@@ -1031,7 +1031,7 @@ void GDBBreakpointWidget::editTracing(TQTableItem* item)
 
     // Note: change cell text here and explicitly call slotNewValue here.
     // We want this signal to be emitted when we close the tracing dialog
-    // and not when we select some other cell, as happens in Qt by default.
+    // and not when we select some other cell, as happens in TQt by default.
     if (r == TQDialog::Accepted)
     {
         // The dialog has modified "btr->breakpoint()" already.
@@ -1191,7 +1191,7 @@ void GDBBreakpointWidget::focusInEvent( TQFocusEvent */* e*/ )
     // Without the following 'if', when we first open the breakpoints
     // widget, the background is all black. This happens only with
     //    m_table->setFocusStyle(TQTable::FollowStyle);
-    // in constructor, so I suspect Qt bug. But anyway, without
+    // in constructor, so I suspect TQt bug. But anyway, without
     // current cell keyboard actions like Enter for edit won't work,
     // so keyboard focus does not makes much sense.
     if (m_table->currentRow() == -1 ||
@@ -1213,28 +1213,28 @@ TQWidget* ComplexEditCell::createEditor() const
 {
     TQHBox* box = new TQHBox( table()->viewport() );
     box->setPaletteBackgroundColor(
-               table()->palette().active().highlight());
+               table()->tqpalette().active().highlight());
 
     label_ = new TQLabel(text(), box, "label");
-    label_->setBackgroundMode(Qt::PaletteHighlight);
+    label_->setBackgroundMode(TQt::PaletteHighlight);
     // Sorry for hardcode, but '2' is already hardcoded in
-    // Qt source, in TQTableItem::paint. Since I don't want the
+    // TQt source, in TQTableItem::paint. Since I don't want the
     // text to jump 2 pixels to the right when editor is activated,
     // need to set the same indent for label.
     label_->setIndent(2);
     TQPalette p = label_->palette();
 
     p.setColor(TQPalette::Active, TQColorGroup::Foreground,
-               table()->palette().active().highlightedText());
+               table()->tqpalette().active().highlightedText());
     p.setColor(TQPalette::Inactive, TQColorGroup::Foreground,
-               table()->palette().active().highlightedText());
+               table()->tqpalette().active().highlightedText());
 
     label_->setPalette(p);
 
     TQPushButton* b = new TQPushButton("...", box);
-    // This is exactly what is done in QDesigner source in the
+    // This is exactly what is done in TQDesigner source in the
     // similar context. Haven't had any success making the good look
-    // with layout, I suppose that sizeHint for button is always larger
+    // with tqlayout, I suppose that tqsizeHint for button is always larger
     // than 20.
     b->setFixedWidth( 20 );
 
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h
index c0728dec..f67bb03e 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.h
+++ b/languages/cpp/debugger/gdbbreakpointwidget.h
@@ -41,13 +41,14 @@ class BreakpointTableRow;
 class GDBTable;
 class GDBController;
 
-class GDBBreakpointWidget : public QHBox
+class GDBBreakpointWidget : public TQHBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     GDBBreakpointWidget( GDBController* controller,
-                         TQWidget* parent=0, const char* name=0 );
+                         TQWidget* tqparent=0, const char* name=0 );
     virtual ~GDBBreakpointWidget();
 
     void reset();
@@ -105,7 +106,7 @@ signals:
     void tracingOutput(const char*);
 
 private:
-    BreakpointTableRow* find(Breakpoint *bp);
+    BreakpointTableRow* tqfind(Breakpoint *bp);
     BreakpointTableRow* findId(int id);
     BreakpointTableRow* findKey(int BPKey);
 
@@ -135,14 +136,15 @@ class BreakpointTableRow;
     When editing is done, the receiver of 'edit' should change the
     value in the table, and then call the 'updateValue' method.    
  */
-class ComplexEditCell : public TQObject, public QTableItem
+class ComplexEditCell : public TQObject, public TQTableItem
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     ComplexEditCell(TQTable* table);
 
-    /** Called by Qt when the current cell should become editable.
+    /** Called by TQt when the current cell should become editable.
         In our case, when the item becomes current. Creates a widget
         that will be shown in the cell and should be able to edit cell
         content. In our case -- text plus "..." button that invokes 
diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp
index bf8d5bc4..b783b31f 100644
--- a/languages/cpp/debugger/gdbcommand.cpp
+++ b/languages/cpp/debugger/gdbcommand.cpp
@@ -99,13 +99,13 @@ ModifyBreakpointCommand::ModifyBreakpointCommand(
   bp_(bp)
 {}
 
-QString
+TQString
 ModifyBreakpointCommand::cmdToSend()
 {
     if (bp_->dbgId() > 0)
     {
         TQString s(initialString());
-        s = s.arg(bp_->dbgId()) + "\n";
+        s = s.tqarg(bp_->dbgId()) + "\n";
         return s.local8Bit();
     }
     else
diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h
index 946bc3aa..7000235a 100644
--- a/languages/cpp/debugger/gdbcommand.h
+++ b/languages/cpp/debugger/gdbcommand.h
@@ -91,8 +91,8 @@ public:
 
 private:
     TQString command_;
-    TQGuardedPtr<TQObject> handler_this;
-    typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&);
+    TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this;
+    typedef void (TQT_BASE_OBJECT_NAME::* handler_t)(const GDBMI::ResultRecord&);
     handler_t handler_method;
     TQValueVector<TQString> lines;
     bool run;
@@ -153,8 +153,8 @@ public: // GDBCommand overrides
     bool invokeHandler(const GDBMI::ResultRecord& r);
 
 private:
-		TQGuardedPtr<TQObject> cli_handler_this;
-    typedef void (TQObject::* cli_handler_t)(const TQValueVector<TQString>&);
+		TQGuardedPtr<TQT_BASE_OBJECT_NAME> cli_handler_this;
+    typedef void (TQT_BASE_OBJECT_NAME::* cli_handler_t)(const TQValueVector<TQString>&);
     cli_handler_t cli_handler_method;
 };
 
@@ -165,7 +165,7 @@ private:
 class SentinelCommand : public GDBCommand
 {
 public:
-    typedef void (TQObject::*handler_method_t)();
+    typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)();
 
     template<class Handler>
     SentinelCommand(Handler* handler_this,
@@ -186,7 +186,7 @@ public:
     }
 
 private:
-		TQGuardedPtr<TQObject> handler_this;
+		TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this;
     handler_method_t handler_method;
 
 };
@@ -207,7 +207,7 @@ private:
 class ExpressionValueCommand : public TQObject, public GDBCommand
 {
 public:
-    typedef void (TQObject::*handler_method_t)(const TQString&);
+    typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(const TQString&);
 
     template<class Handler>
     ExpressionValueCommand(
@@ -226,7 +226,7 @@ public:
     }
 
 private:
-		TQGuardedPtr<TQObject> handler_this;
+		TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this;
     handler_method_t handler_method;
 };
 
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index 3fd912ec..93424396 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -179,7 +179,7 @@ void GDBController::configure()
     config_runShellScript_        = DomUtil::readEntry(dom, "/kdevdebugger/general/runShellScript").latin1();
     config_runGdbScript_          = DomUtil::readEntry(dom, "/kdevdebugger/general/runGdbScript").latin1();
 
-//  add macros for reading QStrings? or in configGdbScript?
+//  add macros for reading TQStrings? or in configGdbScript?
     config_forceBPSet_            = DomUtil::readBoolEntry(dom, "/kdevdebugger/general/allowforcedbpset", true);
     config_dbgTerminal_           = DomUtil::readBoolEntry(dom, "/kdevdebugger/general/separatetty", false);
     config_gdbPath_               = DomUtil::readEntry(dom, "/kdevdebugger/general/gdbpath");
@@ -294,7 +294,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
         KMessageBox::information(
             0,
             i18n("<b>Gdb command sent when debugger is not running</b><br>"
-            "The command was:<br> %1").arg(cmd->initialString()),
+            "The command was:<br> %1").tqarg(cmd->initialString()),
             i18n("Internal error"), "gdb_error");
         return;
     }
@@ -316,11 +316,11 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where)
         cmdList_.insert(i, cmd);
     }
 
-    kdDebug(9012) << "QUEUE: " << cmd->initialString()
+    kdDebug(9012) << "TQUEUE: " << cmd->initialString()
                   << (stateReloadInProgress_ ? " (state reloading)\n" : "\n");
 
     setStateOn(s_dbgBusy);
-    emit dbgStatus("", state_);
+    emit dbgtqStatus("", state_);
     raiseEvent(debugger_busy);
 
     executeCmd();
@@ -401,7 +401,7 @@ void GDBController::executeCmd()
     setStateOn(s_waitForWrite);
 
     TQString prettyCmd = currentCmd_->cmdToSend();
-    prettyCmd.replace( TQRegExp("set prompt \032.\n"), "" );
+    prettyCmd.tqreplace( TQRegExp("set prompt \032.\n"), "" );
     prettyCmd = "(gdb) " + prettyCmd;
 
     if (currentCmd_->isUserCommand())
@@ -409,7 +409,7 @@ void GDBController::executeCmd()
     else
         emit gdbInternalCommandStdout( prettyCmd.latin1() );
 
-    emit dbgStatus ("", state_);
+    emit dbgtqStatus ("", state_);
 }
 
 // **************************************************************************
@@ -500,7 +500,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
     if (reason == "exited-signalled")
     {
         programNoApp(i18n("Exited on signal %1")
-                     .arg(r["signal-name"].literal()), false);
+                     .tqarg(r["signal-name"].literal()), false);
         // FIXME: figure out why this variable is needed.
         programHasExited_ = true;
         state_reload_needed = false;
@@ -540,7 +540,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
             // or whatever).
 
             setStateOff(s_explicitBreakInto);
-            emit dbgStatus("Application interrupted", state_);
+            emit dbgtqStatus("Application interrupted", state_);
             // Will show the source line in the code
             // handling non-special stop kinds, below.
         }
@@ -554,7 +554,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r)
             // that'll end the program.
             KMessageBox::information(0,
                                      i18n("Program received signal %1 (%2)")
-                                     .arg(name).arg(user_name),
+                                     .tqarg(name).tqarg(user_name),
                                      i18n("Received signal"));
         }
     }
@@ -592,7 +592,7 @@ void GDBController::reloadProgramState()
         maybeAnnounceWatchpointHit();
     }
 
-    emit dbgStatus ("", state_);
+    emit dbgtqStatus ("", state_);
 
     // We're always at frame zero when the program stops
     // and we must reset the active flag
@@ -635,7 +635,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox)
     if (tty_)
         tty_->readRemaining();
 
-    // Tty is no longer usable, delete it. Without this, QSocketNotifier
+    // Tty is no longer usable, delete it. Without this, TQSocketNotifier
     // will continiously bomd STTY with signals, so we need to either disable
     // TQSocketNotifier, or delete STTY. The latter is simpler, since we can't
     // reuse it for future debug sessions anyway.
@@ -648,7 +648,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox)
     if (msgBox)
         KMessageBox::information(0, i18n("gdb message:\n")+msg,"Warning", "gdb_error");
 
-    emit dbgStatus (msg, state_);
+    emit dbgtqStatus (msg, state_);
     /* Also show message in gdb window, so that users who
        prefer to look at gdb window know what's up.  */
     emit gdbUserCommandStdout(msg.ascii());
@@ -716,9 +716,9 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r)
                  "Command was: %1\n"
                  "Response is: %2\n"
                  "Invalid response kind: \"%3\"")
-            .arg(currentCmd_->rawDbgCommand())
-            .arg(buf)
-            .arg(r.reason),
+            .tqarg(currentCmd_->rawDbgCommand())
+            .tqarg(buf)
+            .tqarg(r.reason),
             i18n("Invalid gdb reply"), "gdb_error");
 #endif
     }
@@ -755,7 +755,7 @@ void GDBController::maybeAnnounceWatchpointHit()
         }
         else if (last_stop_reason == "read-watchpoint-trigger")
         {
-            emit dbgStatus ("Read watchpoint triggered", state_);
+            emit dbgtqStatus ("Read watchpoint triggered", state_);
         }
     }
 }
@@ -846,14 +846,14 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en
             i18n("<b>Could not start debugger.</b>"
                  "<p>Could not run '%1'. "
                  "Make sure that the path name is specified correctly."
-                ).arg(dbgProcess_->args()[0]),
+                ).tqarg(dbgProcess_->args()[0].data()),
             i18n("Could not start debugger"), "gdb_error");
 
         return false;
     }
 
     setStateOff(s_dbgNotStarted);
-    emit dbgStatus ("", state_);
+    emit dbgtqStatus ("", state_);
 
     saw_gdb_prompt_ = false;
 
@@ -1043,7 +1043,7 @@ void GDBController::slotStopDebugger()
     gdbOutput_ = "";
 
     setState(s_dbgNotStarted | s_appNotStarted);
-    emit dbgStatus (i18n("Debugger stopped"), state_);
+    emit dbgtqStatus (i18n("Debugger stopped"), state_);
 
     raiseEvent(debugger_exited);
 }
@@ -1159,7 +1159,7 @@ void GDBController::slotRun()
                          "    %1\n"
                          "<br>does not exist. Check that you have specified "
                          "the right application in the debugger configuration."
-                        ).arg(app.fileName()),
+                        ).tqarg(app.fileName()),
                     i18n("Application does not exist"));
 
                 // FIXME: after this, KDevelop will still show that debugger
@@ -1176,7 +1176,7 @@ void GDBController::slotRun()
                          "<p>The application does not have the executable bit set. "
                          "Try rebuilding the project, or change permissions "
                          "manually."
-                        ).arg(app.fileName()),
+                        ).tqarg(app.fileName()),
                     i18n("Could not run application"));
                 slotStopDebugger();
             }
@@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo)
     {
         if (viewedThread_ != threadNo)
             queueCmd(new GDBCommand(
-                         TQString("-thread-select %1").arg(threadNo).ascii()));
+                         TQString("-thread-select %1").tqarg(threadNo).ascii()));
     }
 
     queueCmd(new GDBCommand(
-                 TQString("-stack-select-frame %1").arg(frameNo).ascii()));
+                 TQString("-stack-select-frame %1").tqarg(frameNo).ascii()));
 
     // Will emit the 'thread_or_frame_changed' event.
     queueCmd(new GDBCommand("-stack-info-frame",
@@ -1349,10 +1349,10 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result)
 {
     TQString msg = result["msg"].literal();
 
-    if (msg.contains("No such process"))
+    if (msg.tqcontains("No such process"))
     {
         setState(s_appNotStarted|s_programExited);
-        emit dbgStatus (i18n("Process exited"), state_);
+        emit dbgtqStatus (i18n("Process exited"), state_);
         raiseEvent(program_exited);
         return;
     }
@@ -1433,7 +1433,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen)
 
     // Already parsing? then get out quick.
     // VP, 2006-01-30. I'm not sure how this could happen, since
-    // parsing of gdb reply should not ever execute Qt message loop. Except,
+    // parsing of gdb reply should not ever execute TQt message loop. Except,
     // maybe, when we pop up a message box. But even in that case,
     // it's likely we won't return to slotDbgStdout again.
     if (parsing)
@@ -1447,7 +1447,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen)
     int i;
     bool got_any_command = false;
     // For each gdb reply. In MI mode, each reply is one string.
-    while((i = holdingZone_.find('\n')) != -1)
+    while((i = holdingZone_.tqfind('\n')) != -1)
     {
         got_any_command = true;
 
@@ -1590,7 +1590,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen)
                      "<p>The debugger component encountered an internal error while "
                      "processing a reply from gdb. Please submit a bug report."),
                 i18n("The exception is: %1\n"
-                     "The MI response is: %2").arg(e.what()).arg(reply),
+                     "The MI response is: %2").tqarg(e.what()).tqarg(reply.data()),
                 i18n("Internal debugger error"));
 
             destroyCurrentCommand();
@@ -1629,7 +1629,7 @@ void GDBController::commandDone()
     {
         kdDebug(9012) << "No more commands\n";
         setStateOff(s_dbgBusy);
-        emit dbgStatus("", state_);
+        emit dbgtqStatus("", state_);
         raiseEvent(debugger_ready);
     }
 }
@@ -1650,7 +1650,7 @@ void GDBController::removeStateReloadingCommands()
         GDBCommand* cmd = cmdList_.at(i);
         if (stateReloadingCommands_.count(cmd))
         {
-            kdDebug(9012) << "UNQUEUE: " << cmd->initialString() << "\n";
+            kdDebug(9012) << "UNTQUEUE: " << cmd->initialString() << "\n";
             delete cmdList_.take(i);
         }
     }
@@ -1688,7 +1688,7 @@ void GDBController::raiseEvent(event_t e)
 void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen)
 {
     // At the moment, just drop a message out and redirect
-    kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl;
+    kdDebug(9012) << "STDERR: " << TQString::tqfromLatin1(buf, buflen+1) << endl;
     slotDbgStdout(proc, buf, buflen);
 }
 
@@ -1722,7 +1722,7 @@ void GDBController::slotDbgProcessExited(KProcess* process)
 
     destroyCmds();
     setState(s_dbgNotStarted|s_appNotStarted|s_programExited);
-    emit dbgStatus (i18n("Process exited"), state_);
+    emit dbgtqStatus (i18n("Process exited"), state_);
 
     emit gdbUserCommandStdout("(gdb) Process exited\n");
 }
@@ -1743,14 +1743,14 @@ void GDBController::slotUserGDBCmd(const TQString& cmd)
     //    raiseEvent(program_state_changed);
 }
 
-void GDBController::explainDebuggerStatus()
+void GDBController::explainDebuggertqStatus()
 {
     TQString information("%1 commands in queue\n"
                         "%2 commands being processed by gdb\n"
                         "Debugger state: %3\n");
     information =
-        information.arg(cmdList_.count()).arg(currentCmd_ ? 1 : 0)
-        .arg(state_);
+        information.tqarg(cmdList_.count()).tqarg(currentCmd_ ? 1 : 0)
+        .tqarg(state_);
 
     if (currentCmd_)
     {
@@ -1758,8 +1758,8 @@ void GDBController::explainDebuggerStatus()
                       "Current command text: '%2'\n"
                       "Current command origianl text: '%3'\n");
 
-        extra = extra.arg(
-            typeid(*currentCmd_).name()).arg(currentCmd_->cmdToSend()).
+        extra = extra.tqarg(
+            typeid(*currentCmd_).name()).tqarg(currentCmd_->cmdToSend()).
             arg(currentCmd_->initialString());
         information += extra;
     }
diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h
index a8b6bd2b..8cbf3b26 100644
--- a/languages/cpp/debugger/gdbcontroller.h
+++ b/languages/cpp/debugger/gdbcontroller.h
@@ -52,6 +52,7 @@ class STTY;
 class GDBController : public DbgController
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     GDBController(TQDomDocument &projectDom);
@@ -249,7 +250,7 @@ public slots:
     // Pops up a dialog box with some hopefully
     // detailed information about which state debugger
     // is in, which commands were sent and so on.
-    void explainDebuggerStatus();
+    void explainDebuggertqStatus();
 
 
 protected slots:
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 836886bb..7877a92c 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -39,8 +39,8 @@ namespace GDBDebugger
 
 /***************************************************************************/
 
-GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
-    TQWidget(parent, name),
+GDBOutputWidget::GDBOutputWidget( TQWidget *tqparent, const char *name) :
+    TQWidget(tqparent, name),
     m_userGDBCmdEditor(0),
     m_Interrupt(0),
     m_gdbView(0),
@@ -62,7 +62,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
     userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1);
 
     m_Interrupt = new TQToolButton( this, "add breakpoint" );
-    m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
+    m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
                                          ( TQSizePolicy::SizeType)0,
                                          0,
                                          0,
@@ -76,7 +76,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) :
     topLayout->addWidget(m_gdbView, 10);
     topLayout->addLayout(userGDBCmdEntry);
 
-    slotDbgStatus( "", s_dbgNotStarted);
+    slotDbgtqStatus( "", s_dbgNotStarted);
 
     connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) );
     connect( m_Interrupt,        TQT_SIGNAL(clicked()),       TQT_SIGNAL(breakInto()));
@@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending()
 
 /***************************************************************************/
 
-void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag)
+void GDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag)
 {
     if (statusFlag & s_dbgNotStarted)
     {
@@ -291,8 +291,8 @@ void GDBOutputWidget::focusInEvent(TQFocusEvent */*e*/)
 TQString GDBOutputWidget::html_escape(const TQString& s)
 {
     TQString r(s);
-    r.replace("<", "&lt;");
-    r.replace(">", "&gt;");
+    r.tqreplace("<", "&lt;");
+    r.tqreplace(">", "&gt;");
     return r;
 }
 
@@ -327,8 +327,8 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
                                this,
                                TQT_SLOT(toggleShowInternalCommands()));
 
-    popup->setItemChecked(id, parent_->showInternalCommands_);
-    popup->setWhatsThis(
+    popup->setItemChecked(id, tqparent_->showInternalCommands_);
+    popup->tqsetWhatsThis(
         id, 
         i18n(
             "Controls if commands issued internally by KDevelop "
@@ -348,21 +348,21 @@ void OutputText::copyAll()
 {
     /* See comments for allCommandRaw_ for explanations of
        this complex logic, as opposed to calling text(). */
-    TQStringList& raw = parent_->showInternalCommands_ ?
-        parent_->allCommandsRaw_ : parent_->userCommandsRaw_;
+    TQStringList& raw = tqparent_->showInternalCommands_ ?
+        tqparent_->allCommandsRaw_ : tqparent_->userCommandsRaw_;
     TQString text;
     for (unsigned i = 0; i < raw.size(); ++i)
         text += raw[i];
 
     // Make sure the text is pastable both with Ctrl-C and with
     // middle click.
-    TQApplication::clipboard()->setText(text, QClipboard::Clipboard);
-    TQApplication::clipboard()->setText(text, QClipboard::Selection);
+    TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
+    TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
 }
 
 void OutputText::toggleShowInternalCommands()
 {
-    parent_->setShowInternalCommands(!parent_->showInternalCommands_);
+    tqparent_->setShowInternalCommands(!tqparent_->showInternalCommands_);
 }
 
 
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index e0ad9c39..ace1c00d 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.h
@@ -32,12 +32,13 @@ class TQDomElement;
 namespace GDBDebugger
 {
 
-class GDBOutputWidget : public QWidget
+class GDBOutputWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    GDBOutputWidget( TQWidget *parent=0, const char *name=0 );
+    GDBOutputWidget( TQWidget *tqparent=0, const char *name=0 );
     ~GDBOutputWidget();
 
     void savePartialProjectSession(TQDomElement* el);
@@ -49,7 +50,7 @@ public slots:
     void slotInternalCommandStdout(const char* line);
     void slotUserCommandStdout(const char* line);
     void slotReceivedStderr(const char* line);
-    void slotDbgStatus     (const TQString &status, int statusFlag);
+    void slotDbgtqStatus     (const TQString &status, int statusFlag);
 
     void slotGDBCmd();
 
@@ -100,7 +101,7 @@ private:
 
 
     /** For performance reasons, we don't immediately add new text
-        to QTExtEdit. Instead we add it to pendingOutput_ and 
+        to TQTExtEdit. Instead we add it to pendingOutput_ and 
         flush it on timer.
     */
     TQString pendingOutput_;
@@ -113,13 +114,14 @@ private:
 
 /** Add popup menu specific to gdb output window to TQTextEdit.
 */
-class OutputText : public QTextEdit
+class OutputText : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    OutputText(GDBOutputWidget* parent) 
-    : TQTextEdit(parent), 
-      parent_(parent)
+    OutputText(GDBOutputWidget* tqparent) 
+    : TQTextEdit(tqparent), 
+      tqparent_(tqparent)
     {}
 
     TQPopupMenu* createPopupMenu(const TQPoint& pos);
@@ -129,7 +131,7 @@ private slots:
     void toggleShowInternalCommands();
 
 private:
-    GDBOutputWidget* parent_;
+    GDBOutputWidget* tqparent_;
 };
 
 }
diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp
index 5a8588b1..d8ae62b8 100644
--- a/languages/cpp/debugger/gdbparser.cpp
+++ b/languages/cpp/debugger/gdbparser.cpp
@@ -97,7 +97,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
         // - composites (arrays and structures)
         // - pointers to functions. In this case type is
         //   enclosed in "{}". Not sure why it's so, as
-        //   when printing pointer, type is in parenthesis.
+        //   when printing pointer, type is in tqparenthesis.
         if (type == typePointer)
         {
             // Looks like type in braces at the beginning. Strip it.
@@ -126,7 +126,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
 
         // We can't find the first ')', because type can contain '(' and ')'
         // characters if its function pointer. So count opening and closing
-        // parentheses.
+        // tqparentheses.
 
         start = skipDelim(start, '(', ')');
     }
@@ -138,7 +138,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
     if (value[0] == '@')
     {
         // It's a reference, we need to show just the value.
-        if (int i = value.find(":"))
+        if (int i = value.tqfind(":"))
         {
             value = value.mid(i+2);
         }
@@ -149,7 +149,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
         }
     }
 
-    if (value.find("Cannot access memory") == 0)
+    if (value.tqfind("Cannot access memory") == 0)
         value = "(inaccessible)";
   
     return value.stripWhiteSpace();
diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h
index a56c082d..08e5cda7 100644
--- a/languages/cpp/debugger/gdbparser.h
+++ b/languages/cpp/debugger/gdbparser.h
@@ -35,7 +35,7 @@ public:
     static void destroy();
 
 private:
-    void parseArray(TrimmableItem *parent, const char *buf);
+    void parseArray(TrimmableItem *tqparent, const char *buf);
 
     const char *skipTokenEnd(const char *buf) const;
     const char *skipTokenValue(const char *buf) const;
diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp
index c9c1bf2f..c4b16da8 100644
--- a/languages/cpp/debugger/gdbtable.cpp
+++ b/languages/cpp/debugger/gdbtable.cpp
@@ -11,13 +11,13 @@
 
 namespace GDBDebugger {
 
-GDBTable::GDBTable(TQWidget *parent, const char *name)
- : TQTable(parent, name)
+GDBTable::GDBTable(TQWidget *tqparent, const char *name)
+ : TQTable(tqparent, name)
 {
 }
 
-GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name)
- : TQTable(nr, nc, parent, name)
+GDBTable::GDBTable(int nr, int nc, TQWidget * tqparent, const char * name)
+ : TQTable(nr, nc, tqparent, name)
 {
 }
 
diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h
index 78c45055..55374380 100644
--- a/languages/cpp/debugger/gdbtable.h
+++ b/languages/cpp/debugger/gdbtable.h
@@ -14,12 +14,13 @@
 
 namespace GDBDebugger {
 
-class GDBTable : public QTable
+class GDBTable : public TQTable
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    GDBTable(TQWidget *parent = 0, const char *name = 0);
-    GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 );
+    GDBTable(TQWidget *tqparent = 0, const char *name = 0);
+    GDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 );
     ~GDBTable();
 
     virtual void keyPressEvent ( TQKeyEvent * e );
diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp
index f08c7358..deaab3cc 100644
--- a/languages/cpp/debugger/label_with_double_click.cpp
+++ b/languages/cpp/debugger/label_with_double_click.cpp
@@ -1,8 +1,8 @@
 
 #include "label_with_double_click.h"
 
-LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent)
-: TQLabel(s, parent)
+LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* tqparent)
+: TQLabel(s, tqparent)
 {}
 
 void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*)
diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h
index 35ade271..616ad903 100644
--- a/languages/cpp/debugger/label_with_double_click.h
+++ b/languages/cpp/debugger/label_with_double_click.h
@@ -4,11 +4,12 @@
 
 #include <tqlabel.h>
 
-class LabelWithDoubleClick : public QLabel
+class LabelWithDoubleClick : public TQLabel
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    LabelWithDoubleClick(const TQString& s, TQWidget* parent);
+    LabelWithDoubleClick(const TQString& s, TQWidget* tqparent);
 
 signals:
     void doubleClicked();
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 6d700233..44a95b1a 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -71,7 +71,7 @@ namespace GDBDebugger
         it's not a standalone dialog. However, we want to have easy way
         to hide/show all controls, so we group them in this class.
     */
-    class MemoryRangeSelector : public QWidget
+    class MemoryRangeSelector : public TQWidget
     {
     public:
         KLineEdit* startAddressLineEdit;
@@ -79,12 +79,12 @@ namespace GDBDebugger
         TQPushButton* okButton;
         TQPushButton* cancelButton;
 
-        MemoryRangeSelector(TQWidget* parent) 
-        : TQWidget(parent)
+        MemoryRangeSelector(TQWidget* tqparent) 
+        : TQWidget(tqparent)
         {
             TQVBoxLayout* l = new TQVBoxLayout(this);
 
-            // Grid layout: labels + address field
+            // Grid tqlayout: labels + address field
             TQGridLayout* gl = new TQGridLayout(l);
 
             gl->setColSpacing(0, 2);
@@ -127,8 +127,8 @@ namespace GDBDebugger
 
     
     MemoryView::MemoryView(GDBController* controller,
-                           TQWidget* parent, const char* name)
-    : TQWidget(parent, name), 
+                           TQWidget* tqparent, const char* name)
+    : TQWidget(tqparent, name), 
       controller_(controller),
       // New memory view can be created only when debugger is active,
       // so don't set s_appNotStarted here.
@@ -263,8 +263,8 @@ namespace GDBDebugger
             new 
             GDBCommand(
                 TQString("-data-read-memory %1 x 1 1 %2")
-                .arg(rangeSelector_->startAddressLineEdit->text())
-                .arg(size).ascii(),
+                .tqarg(rangeSelector_->startAddressLineEdit->text())
+                .tqarg(size).ascii(),
                 this,
                 &MemoryView::memoryRead));
     }
@@ -280,7 +280,7 @@ namespace GDBDebugger
         start_ = startAsString_.toUInt(0, 0);
 
         setCaption(TQString("%1 (%2 bytes)")
-                   .arg(startAsString_).arg(amount_));
+                   .tqarg(startAsString_).tqarg(amount_));
         emit captionChanged(caption());
 
         KHE::BytesEditInterface* bytesEditor
@@ -328,9 +328,9 @@ namespace GDBDebugger
             controller_->addCommand(
                 new GDBCommand(
                     TQString("set *(char*)(%1 + %2) = %3")
-                        .arg(start_)
-                        .arg(i)
-                        .arg(TQString::number(data_[i]))));
+                        .tqarg(start_)
+                        .tqarg(i)
+                        .tqarg(TQString::number(data_[i]))));
         }
     }
     
@@ -374,7 +374,7 @@ namespace GDBDebugger
                 new 
                 GDBCommand(
                     TQString("-data-read-memory %1 x 1 1 %2")
-                    .arg(start_).arg(amount_).ascii(),
+                    .tqarg(start_).tqarg(amount_).ascii(),
                     this,
                     &MemoryView::memoryRead));
         }
@@ -403,9 +403,9 @@ namespace GDBDebugger
 
 
     ViewerWidget::ViewerWidget(GDBController* controller,
-                               TQWidget* parent, 
+                               TQWidget* tqparent, 
                                const char* name) 
-    : TQWidget(parent, name),
+    : TQWidget(tqparent, name),
       controller_(controller)
     {
         setIcon(SmallIcon("math_brace"));
@@ -457,7 +457,7 @@ namespace GDBDebugger
         TQWidget* ncs = const_cast<TQWidget*>(s);
         TQString cap = caption;
         // Prevent intepreting '&' as accelerator specifier.
-        cap.replace("&", "&&");
+        cap.tqreplace("&", "&&");
         toolBox_->setItemLabel(toolBox_->indexOf(ncs), cap);
     }
 
@@ -466,7 +466,7 @@ namespace GDBDebugger
         TQValueVector<MemoryView*>::iterator i, e;
         for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i)
         {
-            if (*i == child)
+            if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT(child))
             {
                 memoryViews_.erase(i);
                 break;
diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h
index 4febe14a..991efbb3 100644
--- a/languages/cpp/debugger/memviewdlg.h
+++ b/languages/cpp/debugger/memviewdlg.h
@@ -31,12 +31,13 @@ namespace GDBDebugger
     class MemoryView;
     class GDBController;
 
-    class ViewerWidget : public QWidget
+    class ViewerWidget : public TQWidget
     {
         Q_OBJECT
+  TQ_OBJECT
     public:
         ViewerWidget(GDBController* controller,
-                     TQWidget* parent, const char* name);
+                     TQWidget* tqparent, const char* name);
 
     public slots:
         /** Adds a new memory view to *this, initially showing
@@ -61,12 +62,13 @@ namespace GDBDebugger
         TQValueVector<MemoryView*> memoryViews_;
     };
 
-    class MemoryView : public QWidget
+    class MemoryView : public TQWidget
     {
         Q_OBJECT
+  TQ_OBJECT
     public:
         MemoryView(GDBController* controller, 
-                   TQWidget* parent, const char* name = 0);
+                   TQWidget* tqparent, const char* name = 0);
 
         void debuggerStateChanged(int state);
 
diff --git a/languages/cpp/debugger/mi/gdbmi.h b/languages/cpp/debugger/mi/gdbmi.h
index 64252ee5..03985958 100644
--- a/languages/cpp/debugger/mi/gdbmi.h
+++ b/languages/cpp/debugger/mi/gdbmi.h
@@ -189,7 +189,7 @@ namespace GDBMI
     struct Record
     {
         virtual ~Record() {}
-        virtual TQString toString() const { Q_ASSERT( 0 ); return TQString::null; }
+        virtual TQString toString() const { Q_ASSERT( 0 ); return TQString(); }
 
         enum { Prompt, Stream, Result } kind;
     };
diff --git a/languages/cpp/debugger/mi/milexer.cpp b/languages/cpp/debugger/mi/milexer.cpp
index 7813d091..74b8eda9 100644
--- a/languages/cpp/debugger/mi/milexer.cpp
+++ b/languages/cpp/debugger/mi/milexer.cpp
@@ -275,7 +275,7 @@ void TokenStream::positionAt(int position, int *line, int *column) const
             len = half;
     }
 
-    *line = QMAX(first - 1, 0);
+    *line = TQMAX(first - 1, 0);
     *column = position - m_lines.at(*line);
 
     Q_ASSERT( *column >= 0 );
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index ac3cd4e1..27bde0aa 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -105,7 +105,7 @@ static int chownpty(int fd, int grant)
 
         //    { // signal from other child, behave like catchChild.
         //      // guess this gives quite some control chaos...
-        //      Shell* sh = shells.find(rc);
+        //      Shell* sh = shells.tqfind(rc);
         //      if (sh) { shells.remove(rc); sh->doneShell(w); }
         //      goto retry;
         //    }
@@ -263,7 +263,7 @@ void STTY::OutReceived(int f)
     if (n == 0 /* eof */
         || (n == -1 && errno != EAGAIN))
     {
-        // Found eof or error. Disable socket notifier, otherwise Qt
+        // Found eof or error. Disable socket notifier, otherwise TQt
         // will repeatedly call this method, eating CPU
         // cycles.
         out->setEnabled(false);
@@ -321,7 +321,7 @@ bool STTY::findExternalTTY(const TQString &termApp)
         const char* prog      = appName.latin1();
         TQString script = TQString("tty>") + TQString(fifo) +
             TQString(";"                  // fifo name
-                    "trap \"\" INT QUIT TSTP;"	  // ignore various signals
+                    "trap \"\" INT TQUIT TSTP;"	  // ignore various signals
                     "exec<&-;exec>&-;"		        // close stdin and stdout
                     "while :;do sleep 3600;done");
         const char* scriptStr = script.latin1();
@@ -346,11 +346,11 @@ bool STTY::findExternalTTY(const TQString &termApp)
         ::exit(1);
     }
 
-    // parent process
+    // tqparent process
     if (pid <= 0)
         ::exit(1);
 
-    // Open the communication between us (the parent) and the
+    // Open the communication between us (the tqparent) and the
     // child (the process running on a tty console)
     fifo_fd = ::open(fifo, O_RDONLY);
     if (fifo_fd < 0)
diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h
index 9cacf50f..5fd45cc6 100644
--- a/languages/cpp/debugger/stty.h
+++ b/languages/cpp/debugger/stty.h
@@ -33,9 +33,10 @@ class TQSocketNotifier;
 namespace GDBDebugger
 {
 
-class STTY : public QObject
+class STTY : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     STTY(bool ext=false, const TQString &termAppName=TQString());
diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
index 03faba9a..af025ba1 100644
--- a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
+++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop
@@ -9,7 +9,7 @@
     <ignoreparts>
       <part>kdevsecurity</part>
       <part>kdevkonsoleview</part>
-      <part>kdevreplace</part>
+      <part>kdevtqreplace</part>
       <part>kdevctags2</part>
       <part>kdevvalgrind</part>
     </ignoreparts>
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 163c2024..c5293c8c 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -47,14 +47,14 @@
 
 /** The variables widget is passive, and is invoked by the rest of the
     code via two main slots:
-    - slotDbgStatus
+    - slotDbgtqStatus
     - slotCurrentFrame
 
     The first is received the program status changes and the second is
     recieved after current frame in the debugger can possibly changes.
 
     The widget has a list item for each frame/thread combination, with
-    variables as children. However, at each moment only one item is shown.
+    variables as tqchildren. However, at each moment only one item is shown.
     When handling the slotCurrentFrame, we check if variables for the
     current frame are available. If yes, we simply show the corresponding item.
     Otherwise, we fetch the new data from debugger.
@@ -77,8 +77,8 @@ namespace GDBDebugger
 
 VariableWidget::VariableWidget(GDBController*  controller,
                                GDBBreakpointWidget* breakpointWidget,
-                               TQWidget *parent, const char *name)
-: TQWidget(parent, name)
+                               TQWidget *tqparent, const char *name)
+: TQWidget(tqparent, name)
 {
     setIcon(SmallIcon("math_brace"));
     setCaption(i18n("Variable Tree"));
@@ -197,11 +197,11 @@ void VariableWidget::focusInEvent(TQFocusEvent */*e*/)
 // **************************************************************************
 // **************************************************************************
 
-VariableTree::VariableTree(VariableWidget *parent,
+VariableTree::VariableTree(VariableWidget *tqparent,
                            GDBController*  controller,
                            GDBBreakpointWidget* breakpointWidget,
                            const char *name)
-    : KListView(parent, name),
+    : KListView(tqparent, name),
       TQToolTip( viewport() ),
       controller_(controller),
       breakpointWidget_(breakpointWidget),
@@ -244,7 +244,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 
     setSelected(item, true);    // Need to select this item.
 
-    if (item->parent())
+    if (item->tqparent())
     {
         KPopupMenu popup(this);
         KPopupMenu format(this);
@@ -271,19 +271,19 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
             format.setCheckable(true);
             idNatural = format.insertItem(i18n("Natural"),
                                           (int)VarItem::natural);
-            format.setAccel(Qt::Key_N, idNatural);
+            format.setAccel(TQt::Key_N, idNatural);
             idHex = format.insertItem(i18n("Hexadecimal"),
                                       (int)VarItem::hexadecimal);
-            format.setAccel(Qt::Key_X, idHex);
+            format.setAccel(TQt::Key_X, idHex);
             idDecimal = format.insertItem(i18n("Decimal"),
                                           (int)VarItem::decimal);
-            format.setAccel(Qt::Key_D, idDecimal);
+            format.setAccel(TQt::Key_D, idDecimal);
             idCharacter = format.insertItem(i18n("Character"),
                                           (int)VarItem::character);
-            format.setAccel(Qt::Key_C, idCharacter);
+            format.setAccel(TQt::Key_C, idCharacter);
             idBinary = format.insertItem(i18n("Binary"),
                                          (int)VarItem::binary);
-            format.setAccel(Qt::Key_T, idBinary);
+            format.setAccel(TQt::Key_T, idBinary);
 
 
             format.setItemChecked((int)(var->format()), true);
@@ -305,7 +305,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
         if (dynamic_cast<WatchRoot*>(root)) {
             idRemove = popup.insertItem(
                 SmallIcon("editdelete"), i18n("Remove Watch Variable") );
-            popup.setAccel(Qt::Key_Delete, idRemove);
+            popup.setAccel(TQt::Key_Delete, idRemove);
         } else if (root != recentExpressions_) {
             idWatch = popup.insertItem(
                 i18n("Watch Variable"));
@@ -317,7 +317,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
             MAYBE_DISABLE(idReevaluate);
             idRemove = popup.insertItem(
                 SmallIcon("editdelete"), i18n("Remove Expression") );
-            popup.setAccel(Qt::Key_Delete, idRemove);
+            popup.setAccel(TQt::Key_Delete, idRemove);
         }
 
         if (var)
@@ -328,7 +328,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 
         int     idCopyToClipboard = popup.insertItem(
             SmallIcon("editcopy"), i18n("Copy Value") );
-        popup.setAccel(Qt::CTRL + Qt::Key_C, idCopyToClipboard);
+        popup.setAccel(TQt::CTRL + TQt::Key_C, idCopyToClipboard);
 
         activePopup_ = &popup;
         /* This code can be executed when debugger is stopped,
@@ -338,7 +338,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
             controller_->addCommand(
                 new GDBCommand(
                     TQString("-data-evaluate-expression &%1")
-                    .arg(var->gdbExpression()),
+                    .tqarg(var->gdbExpression()),
                     this,
                     &VariableTree::handleAddressComputed,
                     true /*handles error*/));
@@ -360,7 +360,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
         {
             if (VarItem *item = dynamic_cast<VarItem*>(currentItem()))
             {
-                ((VariableWidget*)parent())->
+                ((VariableWidget*)tqparent())->
                     slotEvaluateExpression(item->gdbExpression());
             }
         }
@@ -368,7 +368,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
         {
             if (VarItem *item = dynamic_cast<VarItem*>(currentItem()))
             {
-                ((VariableWidget*)parent())->
+                ((VariableWidget*)tqparent())->
                     slotAddWatchVariable(item->gdbExpression());
             }
         }
@@ -505,8 +505,8 @@ void VariableTree::updateCurrentFrame()
 
     controller_->addCommand(
         new GDBCommand(TQString("-stack-list-arguments 0 %1 %2")
-                       .arg(controller_->currentFrame())
-                       .arg(controller_->currentFrame())
+                       .tqarg(controller_->currentFrame())
+                       .tqarg(controller_->currentFrame())
                        .ascii(),
                        this,
                        &VariableTree::argumentsReady));
@@ -547,8 +547,8 @@ void VariableTree::slotEvaluateExpression(const TQString &expression)
 
 TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const
 {
-    while (item->parent())
-        item = item->parent();
+    while (item->tqparent())
+        item = item->tqparent();
 
     return item;
 }
@@ -607,7 +607,7 @@ void VariableTree::maybeTip(const TQPoint &p)
     VarItem * item = dynamic_cast<VarItem*>( itemAt( p ) );
     if ( item )
     {
-        TQRect r = itemRect( item );
+        TQRect r = tqitemRect( item );
         if ( r.isValid() )
             tip( r, item->tipText() );
     }
@@ -711,7 +711,7 @@ void VariableTree::frameIdReady(const TQValueVector<TQString>& lines)
         frame_info += lines[i];
 
     kdDebug(9012) << "frame info: " << frame_info << "\n";
-    frame_info.replace('\n', "");
+    frame_info.tqreplace('\n', "");
 
     static TQRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)");
     static TQRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)");
@@ -882,8 +882,8 @@ void VarItem::handleCliPrint(const TQValueVector<TQString>& lines)
         {
             controller_->addCommand(
                 new GDBCommand(TQString("-var-create %1 * \"%2\"")
-                               .arg(varobjName_)
-                               .arg(r.cap(1)),
+                               .tqarg(varobjName_)
+                               .tqarg(r.cap(1)),
                                this,
                                &VarItem::varobjCreated,
                                // On initial create, errors get reported
@@ -968,7 +968,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
                 item->formatFromGdbModifier(text[0].latin1()));
         }
 
-        if (e->key() == Qt::Key_Delete)
+        if (e->key() == TQt::Key_Delete)
         {
             TQListViewItem* root = findRoot(item);
 
@@ -978,7 +978,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
             }
         }
 
-        if (e->key() == Qt::Key_C && e->state() == Qt::ControlButton)
+        if (e->key() == TQt::Key_C && e->state() == TQt::ControlButton)
         {
             copyToClipboard(item);
         }
@@ -988,10 +988,10 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
 
 void VariableTree::copyToClipboard(TQListViewItem* item)
 {
-    QClipboard *qb = KApplication::clipboard();
+    TQClipboard *qb = KApplication::tqclipboard();
     TQString text = item->text( 1 );
 
-    qb->setText( text, QClipboard::Clipboard );
+    qb->setText( text, TQClipboard::Clipboard );
 }
 
 void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r)
@@ -1018,15 +1018,15 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r)
 // **************************************************************************
 // **************************************************************************
 
-TrimmableItem::TrimmableItem(VariableTree *parent)
-    : KListViewItem (parent, parent->lastChild())
+TrimmableItem::TrimmableItem(VariableTree *tqparent)
+    : KListViewItem (tqparent, tqparent->lastChild())
 {
 }
 
 // **************************************************************************
 
-TrimmableItem::TrimmableItem(TrimmableItem *parent)
-    : KListViewItem (parent, parent->lastChild())
+TrimmableItem::TrimmableItem(TrimmableItem *tqparent)
+    : KListViewItem (tqparent, tqparent->lastChild())
 {
 }
 
@@ -1044,7 +1044,7 @@ void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     if ( !p )
         return;
     // make toplevel item (watch and frame items) names bold
-    if (column == 0 && !parent())
+    if (column == 0 && !tqparent())
     {
         TQFont f = p->font();
         f.setBold(true);
@@ -1069,16 +1069,16 @@ TQListViewItem *TrimmableItem::lastChild() const
 
 int VarItem::varobjIndex = 0;
 
-VarItem::VarItem(TrimmableItem *parent,
+VarItem::VarItem(TrimmableItem *tqparent,
                  const TQString& expression,
                  bool frozen)
-    : TrimmableItem (parent),
+    : TrimmableItem (tqparent),
       expression_(expression),
       highlight_(false),
       oldSpecialRepresentationSet_(false),
       format_(natural),
       numChildren_(0),
-      childrenFetched_(false),
+      tqchildrenFetched_(false),
       updateUnconditionally_(false),
       frozen_(frozen),
       initialCreation_(true),
@@ -1116,14 +1116,14 @@ VarItem::VarItem(TrimmableItem *parent,
     createVarobj();
 }
 
-VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
+VarItem::VarItem(TrimmableItem *tqparent, const GDBMI::Value& varobj,
                  format_t format, bool baseClassMember)
-: TrimmableItem (parent),
+: TrimmableItem (tqparent),
   highlight_(false),
   oldSpecialRepresentationSet_(false),
   format_(format),
   numChildren_(0),
-  childrenFetched_(false),
+  tqchildrenFetched_(false),
   updateUnconditionally_(false),
   frozen_(false),
   initialCreation_(false),
@@ -1146,7 +1146,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
 
     controller_ = varTree()->controller();
 
-    // Set type and children.
+    // Set type and tqchildren.
     originalValueType_ = varobj["type"].literal();
     numChildren_ = varobj["numchild"].literal().toInt();
     setExpandable(numChildren_ != 0);
@@ -1159,7 +1159,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj,
 void VarItem::createVarobj()
 {
     TQString old = varobjName_;
-    varobjName_ = TQString("KDEV%1").arg(varobjIndex++);
+    varobjName_ = TQString("KDEV%1").tqarg(varobjIndex++);
     emit varobjNameChange(old, varobjName_);
 
     if (frozen_)
@@ -1169,7 +1169,7 @@ void VarItem::createVarobj()
         // variable and we create variable object from that.
         controller_->addCommand(
             new CliCommand(
-                TQString("print %1").arg(expression_),
+                TQString("print %1").tqarg(expression_),
                 this,
                 &VarItem::handleCliPrint));
     }
@@ -1177,7 +1177,7 @@ void VarItem::createVarobj()
     {
         controller_->addCommand(
             new CliCommand(
-                TQString("print /x &%1").arg(expression_),
+                TQString("print /x &%1").tqarg(expression_),
                 this,
                 &VarItem::handleCurrentAddress,
                 true));
@@ -1186,8 +1186,8 @@ void VarItem::createVarobj()
             // Need to quote expression, otherwise gdb won't like
             // spaces inside it.
             new GDBCommand(TQString("-var-create %1 * \"%2\"")
-                           .arg(varobjName_)
-                           .arg(expression_),
+                           .tqarg(varobjName_)
+                           .tqarg(expression_),
                            this,
                            &VarItem::varobjCreated,
                            initialCreation_ ? false : true));
@@ -1209,7 +1209,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r)
     originalValueType_ = r["type"].literal();
     if (!oldType.isEmpty() && oldType != originalValueType_)
     {
-        // Type changed, the children might be no longer valid,
+        // Type changed, the tqchildren might be no longer valid,
         // so delete them.
         for(TQListViewItem* child = firstChild(); child; )
         {
@@ -1239,7 +1239,7 @@ void VarItem::setVarobjName(const TQString& name)
     {
         controller_->addCommand(
             new GDBCommand(TQString("-var-set-format \"%1\" %2")
-                           .arg(varobjName_).arg(varobjFormatName())));
+                           .tqarg(varobjName_).tqarg(varobjFormatName())));
     }
 
     // Get the initial value.
@@ -1247,7 +1247,7 @@ void VarItem::setVarobjName(const TQString& name)
 
     if (isOpen())
     {
-        // This regets children list.
+        // This regets tqchildren list.
         setOpen(true);
     }
 }
@@ -1333,18 +1333,18 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r)
 }
 
 void VarItem::createChildren(const GDBMI::ResultRecord& r,
-                             bool children_of_fake)
+                             bool tqchildren_of_fake)
 {
-    const GDBMI::Value& children = r["children"];
+    const GDBMI::Value& tqchildren = r["tqchildren"];
 
     /* In order to figure out which variable objects correspond
        to base class subobject, we first must detect if *this
        is a structure type. We use present of 'public'/'private'/'protected'
        fake child as an indicator. */
     bool structureType = false;
-    if (!children_of_fake && children.size() > 0)
+    if (!tqchildren_of_fake && tqchildren.size() > 0)
     {
-        TQString exp = children[0]["exp"].literal();
+        TQString exp = tqchildren[0]["exp"].literal();
         bool ok = false;
         exp.toInt(&ok);
         if (!ok || exp[0] != '*')
@@ -1353,23 +1353,23 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
         }
     }
 
-    for (unsigned i = 0; i < children.size(); ++i)
+    for (unsigned i = 0; i < tqchildren.size(); ++i)
     {
-        TQString exp = children[i]["exp"].literal();
+        TQString exp = tqchildren[i]["exp"].literal();
         // For artificial accessibility nodes,
-        // fetch their children.
+        // fetch their tqchildren.
         if (exp == "public" || exp == "protected" || exp == "private")
         {
-            TQString name = children[i]["name"].literal();
+            TQString name = tqchildren[i]["name"].literal();
             controller_->addCommand(new GDBCommand(
-                                        "-var-list-children \"" +
+                                        "-var-list-tqchildren \"" +
                                         name + "\"",
                                         this,
-                                        &VarItem::childrenOfFakesDone));
+                                        &VarItem::tqchildrenOfFakesDone));
         }
         else
         {
-            /* All children of structures that are not artifical
+            /* All tqchildren of structures that are not artifical
                are base subobjects. */
             bool baseObject = structureType;
 
@@ -1388,28 +1388,28 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r,
             }
             if (existing)
             {
-                existing->setVarobjName(children[i]["name"].literal());
+                existing->setVarobjName(tqchildren[i]["name"].literal());
             }
             else
             {
                 kdDebug(9012) << "Creating new varobj "
                               << exp << " " << baseObject << "\n";
-                // Propagate format from parent.
+                // Propagate format from tqparent.
                 VarItem* v = 0;
-                v = new VarItem(this, children[i], format_, baseObject);
+                v = new VarItem(this, tqchildren[i], format_, baseObject);
             }
         }
     }
 }
 
 
-void VarItem::childrenDone(const GDBMI::ResultRecord& r)
+void VarItem::tqchildrenDone(const GDBMI::ResultRecord& r)
 {
     createChildren(r, false);
-    childrenFetched_ = true;
+    tqchildrenFetched_ = true;
 }
 
-void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r)
+void VarItem::tqchildrenOfFakesDone(const GDBMI::ResultRecord& r)
 {
     createChildren(r, true);
 }
@@ -1469,10 +1469,10 @@ TQString VarItem::displayName() const
     if (expression_[0] != '*')
         return expression_;
 
-    if (const VarItem* parent =
-        dynamic_cast<const VarItem*>(TrimmableItem::parent()))
+    if (const VarItem* tqparent =
+        dynamic_cast<const VarItem*>(TrimmableItem::tqparent()))
     {
-        return "*" + parent->displayName();
+        return "*" + tqparent->displayName();
     }
     else
     {
@@ -1504,24 +1504,24 @@ TQString VarItem::gdbExpression() const
     //  - number, for array element
     //  - identifier, for member,
     //  - ***intentifier, for derefenreced pointer.
-    const VarItem* parent = dynamic_cast<const VarItem*>(TrimmableItem::parent());
+    const VarItem* tqparent = dynamic_cast<const VarItem*>(TrimmableItem::tqparent());
 
     bool ok = false;
     expression_.toInt(&ok);
     if (ok)
     {
-        // Array, parent always exists.
-        return parent->gdbExpression() + "[" + expression_ + "]";
+        // Array, tqparent always exists.
+        return tqparent->gdbExpression() + "[" + expression_ + "]";
     }
     else if (expression_[0] == '*')
     {
-        if (parent)
+        if (tqparent)
         {
             // For MI, expression_ can be "*0" (meaing
             // references 0-th element of some array).
-            // So, we really need to get to the parent to computed the right
+            // So, we really need to get to the tqparent to computed the right
             // gdb expression.
-            return "*" + parent->gdbExpression();
+            return "*" + tqparent->gdbExpression();
         }
         else
         {
@@ -1532,14 +1532,14 @@ TQString VarItem::gdbExpression() const
     }
     else
     {
-        if (parent)
+        if (tqparent)
             /* This is varitem corresponds to a base suboject,
-               the expression should cast parent to the base's
+               the expression should cast tqparent to the base's
                type. */
             if (baseClassMember_)
-                return "((" + expression_ + ")" + parent->gdbExpression() + ")";
+                return "((" + expression_ + ")" + tqparent->gdbExpression() + ")";
             else
-                return parent->gdbExpression() + "." + expression_;
+                return tqparent->gdbExpression() + "." + expression_;
         else
             return expression_;
     }
@@ -1603,8 +1603,8 @@ void VarItem::updateValue()
 void VarItem::setValue(const TQString& new_value)
 {
     controller_->addCommand(
-        new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_)
-                       .arg(new_value)));
+        new GDBCommand(TQString("-var-assign \"%1\" %2").tqarg(varobjName_)
+                       .tqarg(new_value)));
 
     // And immediately reload it from gdb,
     // so that it's display format is the one gdb uses,
@@ -1619,12 +1619,12 @@ void VarItem::updateSpecialRepresentation(const TQString& xs)
     TQString s(xs);
     if (s[0] == '$')
     {
-        int i = s.find('=');
+        int i = s.tqfind('=');
         if (i != -1)
             s = s.mid(i+2);
     }
 
-    // A hack to nicely display QStrings. The content of TQString is unicode
+    // A hack to nicely display TQStrings. The content of TQString is tqunicode
     // for for ASCII only strings we get ascii character mixed with \000.
     // Remove those \000 now.
 
@@ -1638,7 +1638,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs)
     // one TQChar from two characters from gdb. But to do that, we *should*
     // now if the data if generic gdb value, and result of request for string
     // data. Fixing is is for later.
-    s.replace( TQRegExp("\\\\000|\\\\0"), "" );
+    s.tqreplace( TQRegExp("\\\\000|\\\\0"), "" );
 
     // FIXME: for now, assume that all special representations are
     // just strings.
@@ -1661,14 +1661,14 @@ void VarItem::recreateLocallyMaybe()
 {
     controller_->addCommand(
         new CliCommand(
-            TQString("print /x &%1").arg(expression_),
+            TQString("print /x &%1").tqarg(expression_),
             this,
             &VarItem::handleCurrentAddress,
             true));
 
     controller_->addCommand(
         new CliCommand(
-            TQString("whatis %1").arg(expression_),
+            TQString("whatis %1").tqarg(expression_),
             this,
             &VarItem::handleType));
 }
@@ -1688,12 +1688,12 @@ void VarItem::setOpen(bool open)
 {
     TQListViewItem::setOpen(open);
 
-    if (open && !childrenFetched_)
+    if (open && !tqchildrenFetched_)
     {
         controller_->addCommand(new GDBCommand(
-                                    "-var-list-children \"" + varobjName_ + "\"",
+                                    "-var-list-tqchildren \"" + varobjName_ + "\"",
                                     this,
-                                    &VarItem::childrenDone));
+                                    &VarItem::tqchildrenDone));
     }
 }
 
@@ -1703,7 +1703,7 @@ bool VarItem::handleSpecialTypes()
     if (originalValueType_.isEmpty())
         return false;
 
-    static TQRegExp qstring("^(const)?[ ]*QString[ ]*&?$");
+    static TQRegExp qstring("^(const)?[ ]*TQString[ ]*&?$");
 
     if (qstring.exactMatch(originalValueType_)) {
 
@@ -1712,7 +1712,7 @@ bool VarItem::handleSpecialTypes()
             return false;
         varTree->controller()->addCommand(
             new ResultlessCommand(TQString("print $kdev_d=%1.d")
-                                  .arg(gdbExpression()),
+                                  .tqarg(gdbExpression()),
                                   true /* ignore error */));
 
         if (varTree->controller()->qtVersion() >= 4)
@@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes()
         else
             varTree->controller()->addCommand(
                 new ValueSpecialRepresentationCommand(
-                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\""));
+                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\""));
 
         return true;
     }
@@ -1760,7 +1760,7 @@ void VarItem::setFormat(format_t f)
 
     if (numChildren_)
     {
-        // If variable has children, change format for children.
+        // If variable has tqchildren, change format for tqchildren.
         // - for structures, that's clearly right
         // - for arrays, that's clearly right
         // - for pointers, this can be confusing, but nobody ever wants to
@@ -1775,7 +1775,7 @@ void VarItem::setFormat(format_t f)
     {
          controller_->addCommand(
             new GDBCommand(TQString("-var-set-format \"%1\" %2")
-                           .arg(varobjName_).arg(varobjFormatName())));
+                           .tqarg(varobjName_).tqarg(varobjFormatName())));
 
         updateValue();
     }
@@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     if (!alive_)
     {
         /* Draw this as disabled. */
-        TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(),
+        TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(),
                                  column, width, align);
     }
     else
@@ -1876,8 +1876,8 @@ VariableTree* VarItem::varTree() const
 
 void VarItem::unhookFromGdb()
 {
-    // Unhook children first, so that child varitems are deleted
-    // before parent. Strictly speaking, we can avoid calling
+    // Unhook tqchildren first, so that child varitems are deleted
+    // before tqparent. Strictly speaking, we can avoid calling
     // -var-delete on child varitems, but that's a bit cheesy,
     for(TQListViewItem* child = firstChild();
         child; child = child->nextSibling())
@@ -1886,7 +1886,7 @@ void VarItem::unhookFromGdb()
     }
 
     alive_ = false;
-    childrenFetched_ = false;
+    tqchildrenFetched_ = false;
 
     emit varobjNameChange(varobjName_, "");
 
@@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb()
     {
         controller_->addCommand(
             new GDBCommand(
-                TQString("-var-delete \"%1\"").arg(varobjName_)));
+                TQString("-var-delete \"%1\"").tqarg(varobjName_)));
     }
 
     varobjName_ = "";
@@ -1931,8 +1931,8 @@ bool VarItem::isAlive() const
 // **************************************************************************
 // **************************************************************************
 
-VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo)
-    : TrimmableItem (parent),
+VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo)
+    : TrimmableItem (tqparent),
       needLocals_(false),
       frameNo_(frameNo),
       threadNo_(threadNo),
@@ -1956,8 +1956,8 @@ void VarFrameRoot::setOpen(bool open)
     if (frameOpened && needLocals_)
     {
         needLocals_ = false;
-        VariableTree* parent = static_cast<VariableTree*>(listView());
-        parent->updateCurrentFrame();
+        VariableTree* tqparent = static_cast<VariableTree*>(listView());
+        tqparent->updateCurrentFrame();
     }
 }
 
@@ -1978,8 +1978,8 @@ void VarFrameRoot::setDirty()
 // **************************************************************************
 // **************************************************************************
 
-WatchRoot::WatchRoot(VariableTree *parent)
-    : TrimmableItem(parent)
+WatchRoot::WatchRoot(VariableTree *tqparent)
+    : TrimmableItem(tqparent)
 {
     setText(0, i18n("Watch"));
     setOpen(true);
diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h
index 5c77ea43..d56e8977 100644
--- a/languages/cpp/debugger/variablewidget.h
+++ b/languages/cpp/debugger/variablewidget.h
@@ -46,17 +46,18 @@ class GDBBreakpointWidget;
 
 enum { VarNameCol = 0, ValueCol = 1, VarTypeCol = 2};
 enum DataType { typeUnknown, typeValue, typePointer, typeReference,
-                typeStruct, typeArray, typeQString, typeWhitespace,
+                typeStruct, typeArray, typeTQString, typeWhitespace,
                 typeName };
 
-class VariableWidget : public QWidget
+class VariableWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     VariableWidget( GDBController* controller,
                     GDBBreakpointWidget* breakpointWidget,
-                    TQWidget *parent=0, const char *name=0 );
+                    TQWidget *tqparent=0, const char *name=0 );
 
     VariableTree *varTree() const
     { return varTree_; }
@@ -82,11 +83,12 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class VariableTree : public KListView, public QToolTip
+class VariableTree : public KListView, public TQToolTip
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    VariableTree(VariableWidget *parent, 
+    VariableTree(VariableWidget *tqparent, 
                  GDBController*  controller,
                  GDBBreakpointWidget* breakpointWidget,
                  const char *name=0 );
@@ -184,16 +186,16 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-/** List view item that can 'trim' outdated children.
+/** List view item that can 'trim' outdated tqchildren.
 
-    The instances of this class hold a number of children corresponding
+    The instances of this class hold a number of tqchildren corresponding
     to variables. When program state changes, such as after a step in source,
     some variable values can change, and some variables can go out of scope.
     We need
     - highlight modified variables
     - remove gone variables
 
-    We could just remove all children and repopulate the list from
+    We could just remove all tqchildren and repopulate the list from
     the data from debugger, but then we'd loose information about previous
     variable values.
 
@@ -205,8 +207,8 @@ private:
 class TrimmableItem : public KListViewItem
 {
 public:
-    TrimmableItem(VariableTree *parent);
-    TrimmableItem(TrimmableItem *parent);
+    TrimmableItem(VariableTree *tqparent);
+    TrimmableItem(TrimmableItem *tqparent);
 
     virtual ~TrimmableItem();
 
@@ -226,17 +228,18 @@ class VarItem : public TQObject,
                 public TrimmableItem
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum format_t { natural, hexadecimal, decimal, character, binary };   
 
     /** Creates top-level variable item from the specified expression.
         Optionally, alternative display name can be provided.
     */
-    VarItem( TrimmableItem *parent, 
+    VarItem( TrimmableItem *tqparent, 
              const TQString& expression, 
              bool frozen = false);
 
-    VarItem( TrimmableItem *parent, const GDBMI::Value& varobj,
+    VarItem( TrimmableItem *tqparent, const GDBMI::Value& varobj,
              format_t format, bool baseClassMember);
 
     virtual ~VarItem();
@@ -283,7 +286,7 @@ public:
 
     /** Recursively clears the varobjName_ field, making
        *this completely disconnected from gdb.
-       Automatically makes *this and children disables,
+       Automatically makes *this and tqchildren disables,
        since there's no possible interaction with unhooked
        object.
     */
@@ -297,7 +300,7 @@ public:
     format_t formatFromGdbModifier(char c) const;
 
     /** Clears highliting for this variable and 
-        all its children. */
+        all its tqchildren. */
     void clearHighlight();
 
     /** Sets new top-level textual value of this variable.
@@ -330,7 +333,7 @@ private:
            - sets varobjName_ to 'name'
            - sets format, if it's not default one
            - gets initial value
-           - if item is open, gets children.
+           - if item is open, gets tqchildren.
     */
     void setVarobjName(const TQString& name);
 
@@ -345,12 +348,12 @@ private:
                     int column, int width, int align );
     void varobjCreated(const GDBMI::ResultRecord& r);
     void valueDone(const GDBMI::ResultRecord& r);
-    void childrenDone(const GDBMI::ResultRecord& r);    
-    void childrenOfFakesDone(const GDBMI::ResultRecord& r);    
+    void tqchildrenDone(const GDBMI::ResultRecord& r);    
+    void tqchildrenOfFakesDone(const GDBMI::ResultRecord& r);    
     void handleCurrentAddress(const TQValueVector<TQString>& lines);
     void handleType(const TQValueVector<TQString>& lines);
 
-    void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake);
+    void createChildren(const GDBMI::ResultRecord& r, bool tqchildren_of_fake);
 
     /** Called to handle the output of the cli print command.
      */
@@ -370,7 +373,7 @@ private:
 
 private:
     // The gdb expression for this varItem relatively to
-    // parent VarItem. 
+    // tqparent VarItem. 
     TQString expression_;
 
     bool      highlight_;
@@ -388,7 +391,7 @@ private:
     static int varobjIndex;
 
     int numChildren_;
-    bool childrenFetched_;
+    bool tqchildrenFetched_;
     
     TQString currentAddress_;
     TQString lastObtainedAddress_;
@@ -415,7 +418,7 @@ private:
 class VarFrameRoot : public TrimmableItem
 {
 public:
-    VarFrameRoot(VariableTree *parent, int frameNo, int threadNo);
+    VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo);
     virtual ~VarFrameRoot();
 
     void setOpen(bool open);
@@ -453,7 +456,7 @@ private:
 class WatchRoot : public TrimmableItem
 {
 public:
-    WatchRoot(VariableTree *parent);
+    WatchRoot(VariableTree *tqparent);
     virtual ~WatchRoot();
 };
 
diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h
index 8b55557e..de49dae3 100644
--- a/languages/cpp/declarationinfo.h
+++ b/languages/cpp/declarationinfo.h
@@ -44,7 +44,7 @@ struct DeclarationInfo {
     }
     
     TQString locationToText() const {
-      return TQString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file);
+      return TQString("line %1 col %2 - line %3 col %4\nfile: %5").tqarg(startLine).tqarg(startCol).tqarg(endLine).tqarg(endCol).tqarg(file);
     }
     
     TQString toText() const {
diff --git a/languages/cpp/doc/clanlib.toc b/languages/cpp/doc/clanlib.toc
index 04ed2041..97e8ec56 100644
--- a/languages/cpp/doc/clanlib.toc
+++ b/languages/cpp/doc/clanlib.toc
@@ -7,7 +7,7 @@
 	<tocsect2 name="Display overview" url="overview/display-1.html" />
 	<tocsect2 name="Resources" url="overview/resources-1.html" />
 	<tocsect2 name="Sound overview" url="overview/sound_overview.html" />
-	<tocsect2 name="Signals &amp; Slots overview" url="overview/signals.html" />
+	<tocsect2 name="Signals &amp; Slots overview" url="overview/Q_SIGNALS.html" />
 	<tocsect2 name="Sprites overview" url="overview/sprites_overview.html" />
 	<tocsect2 name="Font overview" url="overview/font_overview-1.html" />
 	<tocsect2 name="Loading graphics overview" url="overview/loading_graphics.html" />
diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc
index 081ad646..7acb23a3 100644
--- a/languages/cpp/doc/cppannotations.toc
+++ b/languages/cpp/doc/cppannotations.toc
@@ -290,7 +290,7 @@
   <tocsect2 name="17.4: The Generic Algorithms" url="cplusplus17.html#l227">
     <tocsect3 name="17.4.1: accumulate()" url="cplusplus17.html#l228"/>
     <tocsect3 name="17.4.2: adjacent_difference()" url="cplusplus17.html#l229"/>
-    <tocsect3 name="17.4.3: adjacent_find()" url="cplusplus17.html#l230"/>
+    <tocsect3 name="17.4.3: adjacent_tqfind()" url="cplusplus17.html#l230"/>
     <tocsect3 name="17.4.4: binary_search()" url="cplusplus17.html#l231"/>
     <tocsect3 name="17.4.5: copy()" url="cplusplus17.html#l232"/>
     <tocsect3 name="17.4.6: copy_backward()" url="cplusplus17.html#l233"/>
@@ -300,7 +300,7 @@
     <tocsect3 name="17.4.10: equal_range()" url="cplusplus17.html#l237"/>
     <tocsect3 name="17.4.11: fill()" url="cplusplus17.html#l238"/>
     <tocsect3 name="17.4.12: fill_n()" url="cplusplus17.html#l239"/>
-    <tocsect3 name="17.4.13: find()" url="cplusplus17.html#l240"/>
+    <tocsect3 name="17.4.13: tqfind()" url="cplusplus17.html#l240"/>
     <tocsect3 name="17.4.14: find_end()" url="cplusplus17.html#l241"/>
     <tocsect3 name="17.4.15: find_first_of()" url="cplusplus17.html#l242"/>
     <tocsect3 name="17.4.16: find_if()" url="cplusplus17.html#l243"/>
@@ -331,7 +331,7 @@
     <tocsect3 name="17.4.41: remove_copy()" url="cplusplus17.html#l268"/>
     <tocsect3 name="17.4.42: remove_if()" url="cplusplus17.html#l269"/>
     <tocsect3 name="17.4.43: remove_copy_if()" url="cplusplus17.html#l270"/>
-    <tocsect3 name="17.4.44: replace()" url="cplusplus17.html#l271"/>
+    <tocsect3 name="17.4.44: tqreplace()" url="cplusplus17.html#l271"/>
     <tocsect3 name="17.4.45: replace_copy()" url="cplusplus17.html#l272"/>
     <tocsect3 name="17.4.46: replace_if()" url="cplusplus17.html#l273"/>
     <tocsect3 name="17.4.47: replace_copy_if()" url="cplusplus17.html#l274"/>
@@ -427,7 +427,7 @@
     <tocsect3 name="19.7.1: The `Daemon' program" url="cplusplus19.html#l349"/>
     <tocsect3 name="19.7.2: The `Pipe' class" url="cplusplus19.html#l350"/>
     <tocsect3 name="19.7.3: The `ParentSlurp' class" url="cplusplus19.html#l351"/>
-    <tocsect3 name="19.7.4: Communicating with multiple children" url="cplusplus19.html#l352">
+    <tocsect3 name="19.7.4: Communicating with multiple tqchildren" url="cplusplus19.html#l352">
       <tocsect4 name="19.7.4.1: The `Select' class" url="cplusplus19.html#l353"/>
       <tocsect4 name="19.7.4.2: The `Child' class" url="cplusplus19.html#l354"/>
       <tocsect4 name="19.7.4.3: The `Monitor' class" url="cplusplus19.html#l355"/>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index d996f1a0..e6c13c48 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -124,7 +124,7 @@
     <tocsect3 name="Keyboard Accelerators" url="gtk/gtk-keyboard-accelerators.html"/>
     <tocsect3 name="Selections" url="gtk/gtk-selections.html"/>
     <tocsect3 name="Drag and Drop" url="gtk/gtk-drag-and-drop.html"/>
-    <tocsect3 name="Signals" url="gtk/gtk-signals.html"/>
+    <tocsect3 name="Signals" url="gtk/gtk-Q_SIGNALS.html"/>
     <tocsect3 name="Signal Marshallers" url="gtk/gtk-signal-marshallers.html"/>
     <tocsect3 name="Implementation of Object Properties" url="gtk/gtk-object-properties.html"/>
     <tocsect3 name="Types" url="gtk/gtk-types.html"/>
@@ -135,7 +135,7 @@
   <tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html">
     <tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/>
     <tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/>
-    <tocsect3 name="GtkAlignment" url="gtk/gtkalignment.html"/>
+    <tocsect3 name="GtkAlignment" url="gtk/gtktqalignment.html"/>
     <tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/>
     <tocsect3 name="GtkAspectFrame" url="gtk/gtkaspectframe.html"/>
     <tocsect3 name="GtkButtonBox" url="gtk/gtkbuttonbox.html"/>
@@ -261,7 +261,7 @@
     <tocsect3 name="gnome-canvas-util" url="gnomeui/gnomeui-gnome-canvas-util.html"/>
     <tocsect3 name="gnome-dialog-util" url="gnomeui/gnomeui-gnome-dialog-util.html"/>
     <tocsect3 name="gnome-dns" url="gnomeui/gnomeui-gnome-dns.html"/>
-    <tocsect3 name="gnome-geometry" url="gnomeui/gnomeui-gnome-geometry.html"/>
+    <tocsect3 name="gnome-tqgeometry" url="gnomeui/gnomeui-gnome-tqgeometry.html"/>
     <tocsect3 name="gnome-ice" url="gnomeui/gnomeui-gnome-ice.html"/>
     <tocsect3 name="gnome-icon-text" url="gnomeui/gnomeui-gnome-icon-text.html"/>
     <tocsect3 name="gnome-init" url="gnomeui/gnomeui-gnome-init.html"/>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index e7d5f4d2..2c4451a6 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -38,7 +38,7 @@
     <tocsect3 name="What It Is For (Look and Feel)" url=""/>
     <tocsect3 name="Inside the Qt Toolkit" url="ch03lev1sec2.html"/>
     <tocsect3 name="Signals and Slots" url="ch03lev1sec3.html"/>
-    <tocsect3 name="Meta Object Compiler (moc)" url="ch03lev1sec4.html"/>
+    <tocsect3 name="Meta Object Compiler (tqmoc)" url="ch03lev1sec4.html"/>
     <tocsect3 name="The Utility Classes" url="ch03lev1sec5.html"/>
     <tocsect3 name="Special Features (ImageIO, OpenGL, Mesa)" url="ch03lev1sec6.html"/>
     <tocsect3 name="Summary" url="ch03lev1sec7.html"/>
@@ -238,7 +238,7 @@
 <entry name="actions, editBookmarks" url="ch06.html"/>
 <entry name="actions, findNext" url="ch06.html"/>
 <entry name="actions, findPrev" url="ch06.html"/>
-<entry name="actions, find" url="ch06.html"/>
+<entry name="actions, tqfind" url="ch06.html"/>
 <entry name="actions, firstPage" url="ch06.html"/>
 <entry name="actions, fitToHeight" url="ch06.html"/>
 <entry name="actions, fitToPage" url="ch06.html"/>
@@ -266,7 +266,7 @@
 <entry name="actions, quit" url="ch06.html"/>
 <entry name="actions, redisplay" url="ch06.html"/>
 <entry name="actions, redo" url="ch06.html"/>
-<entry name="actions, replace" url="ch06.html"/>
+<entry name="actions, tqreplace" url="ch06.html"/>
 <entry name="actions, reportBug" url="ch06.html"/>
 <entry name="actions, revert" url="ch06.html"/>
 <entry name="actions, saveAs" url="ch06.html"/>
@@ -405,7 +405,7 @@
 <entry name="CDE (Common Desktop Environment)" url="ch01.html"/>
 <entry name="cgi resource type" url="ch07lev1sec4.html"/>
 <entry name="CGotoDialog class, modeless dialog box" url="ch08lev1sec3.html"/>
-<entry name="CGotoDialog example, layout" url="ch08lev1sec2.html"/>
+<entry name="CGotoDialog example, tqlayout" url="ch08lev1sec2.html"/>
 <entry name="Chapter tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="checking out, applications (CVS)" url="ch17lev1sec5.html"/>
 <entry name="checking spelling" url="ch10lev1sec3.html"/>
@@ -413,11 +413,11 @@
 <entry name="check() method" url="ch10lev1sec3.html"/>
 <entry name="checkWord() method" url="ch10lev1sec3.html"/>
 <entry name="Child Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/>
-<entry name="child widgets, geometry management, QBoxLayout manager" url="ch04lev1sec3.html"/>
-<entry name="child widgets, geometry management, QGridLayout manager" url="ch04lev1sec3.html"/>
-<entry name="child widgets, geometry management" url="ch04lev1sec3.html"/>
-<entry name="child widgets, KChildren example, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="child widgets, KChildren example, kchildren.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="child widgets, tqgeometry management, QBoxLayout manager" url="ch04lev1sec3.html"/>
+<entry name="child widgets, tqgeometry management, QGridLayout manager" url="ch04lev1sec3.html"/>
+<entry name="child widgets, tqgeometry management" url="ch04lev1sec3.html"/>
+<entry name="child widgets, KChildren example, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="child widgets, KChildren example, ktqchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="child widgets, KChildren example, main() method" url="ch04lev1sec3.html"/>
 <entry name="child widgets, KChildren example" url="ch04lev1sec3.html"/>
 <entry name="child widgets" url="ch04lev1sec3.html"/>
@@ -472,15 +472,15 @@
 <entry name="classes, QWidget, example (listing)" url="ch03lev1sec2.html"/>
 <entry name="classes, QWidget, functions" url="ch03lev1sec2.html"/>
 <entry name="classes, QWidget, sample class declaration" url="ch04.html"/>
-<entry name="classes, QWidget, signals" url="ch04.html"/>
-<entry name="classes, QWidget, slots" url="ch04.html"/>
+<entry name="classes, QWidget, Q_SIGNALS" url="ch04.html"/>
+<entry name="classes, QWidget, Q_SLOTS" url="ch04.html"/>
 <entry name="classes, QWidget" url="ch03lev1sec2.html"/>
 <entry name="classes, QWidget" url="ch04.html"/>
 <entry name="classes, ReadOnlyPart" url="ch12lev1sec4.html"/>
 <entry name="classes, ReadWritePart" url="ch12lev1sec4.html"/>
 <entry name="classes, SelectDialog" url="ch08.html"/>
-<entry name="classes, slots in temporary classes" url="ch03lev1sec3.html"/>
-<entry name="classes, slots" url="ch03lev1sec3.html"/>
+<entry name="classes, Q_SLOTS in temporary classes" url="ch03lev1sec3.html"/>
+<entry name="classes, Q_SLOTS" url="ch03lev1sec3.html"/>
 <entry name="classes, template, QList" url="ch03lev1sec5.html"/>
 <entry name="classes, template" url="ch03lev1sec5.html"/>
 <entry name="classes, utility (Qt)" url="ch03lev1sec5.html"/>
@@ -667,7 +667,7 @@
 <entry name="DCOP, programming interface, transactions" url="ch13lev1sec5.html"/>
 <entry name="DCOP, programming interface" url="ch13lev1sec5.html"/>
 <entry name="DCOPRef objects" url="ch13lev1sec6.html"/>
-<entry name="DCOP, signals and slots" url="ch13lev1sec6.html"/>
+<entry name="DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/>
 <entry name="DCOP, underlying technologies, data streaming" url="ch13lev1sec3.html"/>
 <entry name="DCOP, underlying technologies, ICE (Inter-Client Exchange) mechanism" url="ch13lev1sec3.html"/>
 <entry name="DCOP, underlying technologies" url="ch13lev1sec3.html"/>
@@ -729,7 +729,7 @@
 <entry name="deleting, CVS (Concurrent Version System) directories" url="ch17lev1sec5.html"/>
 <entry name="deleting, CVS (Concurrent Version System) files" url="ch17lev1sec5.html"/>
 <entry name="deprecated (" url="ch15.html"/>
-<entry name="design guidelines, dialog boxes, layout issues" url="ch08lev1sec2.html"/>
+<entry name="design guidelines, dialog boxes, tqlayout issues" url="ch08lev1sec2.html"/>
 <entry name="design guidelines, dialog boxes" url="ch08lev1sec7.html"/>
 <entry name="designing, icons" url="ch06lev1sec3.html"/>
 <entry name="Desktop Communication Protocol. See DCOP" url="ch13.html"/>
@@ -760,13 +760,13 @@
 <entry name="dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/>
 <entry name="dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/>
 <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/>
-<entry name="dialog boxes, layout, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, layout, design issues" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, layout, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, layout, manual placement" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, layout, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, layout, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, layout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, hierarchies of tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, nested tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, modal, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
 <entry name="dialog boxes, modal, modal dialog located on the stack" url="ch08lev1sec3.html"/>
@@ -897,7 +897,7 @@
 <entry name="embedding, parts, multiple parts" url="ch12lev1sec8.html"/>
 <entry name="embedding, parts" url="ch12lev1sec7.html"/>
 <entry name="emitDCOPSignal() method" url="ch13lev1sec6.html"/>
-<entry name="emitting signals" url="ch03lev1sec3.html"/>
+<entry name="emitting Q_SIGNALS" url="ch03lev1sec3.html"/>
 <entry name="Emphasis tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="enabling, application functions" url="ch09lev1sec3.html"/>
 <entry name="enabling, debugging, gdb debugger" url="ch18lev1sec6.html"/>
@@ -912,7 +912,7 @@
 <entry name="event handling, drag events" url="ch07.html"/>
 <entry name="event handling, drop events" url="ch07.html"/>
 <entry name="event handling, Qt" url="ch03lev1sec2.html"/>
-<entry name="event handling, signals and slots" url="ch03lev1sec3.html"/>
+<entry name="event handling, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/>
 <entry name="event handling, widgets, closeEvent()" url="ch04.html"/>
 <entry name="event handling, widgets, dragEnterEvent()" url="ch04.html"/>
 <entry name="event handling, widgets, dragLeaveEvent()" url="ch04.html"/>
@@ -1061,7 +1061,7 @@
 <entry name="functions, slotOpen()" url="ch07lev1sec5.html"/>
 <entry name="functions, slotSave()" url="ch07lev1sec5.html"/>
 <entry name="functions, slotSpecialHelp()" url="ch05lev1sec2.html"/>
-<entry name="functions, slots" url="ch03lev1sec3.html"/>
+<entry name="functions, Q_SLOTS" url="ch03lev1sec3.html"/>
 <entry name="functions, sorry()" url="ch05lev1sec3.html"/>
 <entry name="functions, streamEnd()" url="ch14lev1sec3.html"/>
 <entry name="functions, streamInit()" url="ch14lev1sec3.html"/>
@@ -1080,16 +1080,16 @@
 <entry name="gdb debugger, running" url="ch18lev1sec6.html"/>
 <entry name="gdb debugger" url="ch18lev1sec6.html"/>
 <entry name="gdb (GNU debugger)" url="ch02.html"/>
-<entry name="geometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
-<entry name="geometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/>
-<entry name="geometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/>
-<entry name="geometry management (widgets)" url="ch04lev1sec3.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/>
+<entry name="tqgeometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/>
+<entry name="tqgeometry management (widgets)" url="ch04lev1sec3.html"/>
 <entry name="getColor() function" url="ch05lev1sec3.html"/>
 <entry name="getExistingDirectory() function" url="ch05lev1sec3.html"/>
 <entry name="getFont() function" url="ch05lev1sec3.html"/>
@@ -1130,7 +1130,7 @@
 <entry name="GUIs, dialog boxes, kdeui (KDE user-interface library)" url="ch08lev1sec4.html"/>
 <entry name="GUIs, dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/>
 <entry name="GUIs, dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/>
-<entry name="GUIs, dialog boxes, layout" url="ch08lev1sec2.html"/>
+<entry name="GUIs, dialog boxes, tqlayout" url="ch08lev1sec2.html"/>
 <entry name="GUIs, dialog boxes, modal" url="ch08lev1sec3.html"/>
 <entry name="GUIs, dialog boxes, modeless" url="ch08lev1sec3.html"/>
 <entry name="GUIs, dialog boxes, simple example" url="ch08.html"/>
@@ -1170,8 +1170,8 @@
 <entry name="GUIs, widgets, event handlers" url="ch04.html"/>
 <entry name="GUIs, widgets, painting" url="ch04lev1sec2.html"/>
 <entry name="GUIs, widgets, sample class declaration" url="ch04.html"/>
-<entry name="GUIs, widgets, signals" url="ch04.html"/>
-<entry name="GUIs, widgets, slots" url="ch04.html"/>
+<entry name="GUIs, widgets, Q_SIGNALS" url="ch04.html"/>
+<entry name="GUIs, widgets, Q_SLOTS" url="ch04.html"/>
 <entry name="GUIs, widgets" url="ch04.html"/>
 <entry name="GUIs, widgets, user input" url="ch04lev1sec4.html"/>
 <entry name="Hausmann, Simon" url="ch13lev1sec7.html"/>
@@ -1278,10 +1278,10 @@
 <entry name="KApplication class" url="ch02lev1sec3.html"/>
 <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/>
 <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/>
-<entry name="kchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/>
-<entry name="kchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/>
-<entry name="KChildren sample widget (child widget), kchildren.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="ktqchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/>
+<entry name="ktqchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/>
+<entry name="KChildren sample widget (child widget), ktqchildren.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="KChildren sample widget (child widget), ktqchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/>
 <entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/>
@@ -1427,7 +1427,7 @@
 <entry name="keyReleaseEvent() event handler, widgets" url="ch04.html"/>
 <entry name="keystrokes, handling, widgets" url="ch04lev1sec4.html"/>
 <entry name="KeyWordSet tag (DocBook)" url="ch15lev1sec2.html"/>
-<entry name="keywords, moc" url="ch03lev1sec4.html"/>
+<entry name="keywords, tqmoc" url="ch03lev1sec4.html"/>
 <entry name="Keyword tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="KFileDialog" url="ch05lev1sec3.html"/>
 <entry name="KFontDialog" url="ch05lev1sec3.html"/>
@@ -1558,9 +1558,9 @@
 <entry name="KStdActionsDemo widget" url="ch05.html"/>
 <entry name="ktictactoe.cpp class definition (KTicTacToe widget)" url="ch04lev1sec3.html"/>
 <entry name="ktictactoe.h class declaration (KTicTacToe widget)" url="ch04lev1sec3.html"/>
-<entry name="KTicTacToe widget (geometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="KTicTacToe widget (geometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/>
-<entry name="KTicTacToe widget (geometry management example), playing the game" url="ch04lev1sec3.html"/>
+<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="KTicTacToe widget (tqgeometry management example), playing the game" url="ch04lev1sec3.html"/>
 <entry name="KTMainWindow class" url="ch02lev1sec3.html"/>
 <entry name="Kulow, Stephen" url="ch16.html"/>
 <entry name="KUniqueApplication class, passing command-line parameters" url="ch13lev1sec7.html"/>
@@ -1591,15 +1591,15 @@
 <entry name="languages, i18n() function" url="ch06lev1sec4.html"/>
 <entry name="languages, translator files" url="ch06lev1sec4.html"/>
 <entry name="lastPage action" url="ch06.html"/>
-<entry name="layout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
-<entry name="layout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
-<entry name="layout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="layout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
-<entry name="layout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="layout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
-<entry name="layout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
-<entry name="layout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
-<entry name="layout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
+<entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
+<entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="leaveEvent() event handler, widgets" url="ch04.html"/>
 <entry name="legal issues" url="ch01lev1sec6.html"/>
 <entry name="legal issues" url="ch19.html"/>
@@ -1637,7 +1637,7 @@
 <entry name="lines, drawing" url="ch04lev1sec2.html"/>
 <entry name="listing, CVS (Concurrent Version System) modules" url="ch17lev1sec5.html"/>
 <entry name="listings, application configuration file example" url="ch07lev1sec2.html"/>
-<entry name="listings, connecting slots to signals" url="ch03lev1sec3.html"/>
+<entry name="listings, connecting Q_SLOTS to Q_SIGNALS" url="ch03lev1sec3.html"/>
 <entry name="listings, DCOP, client using stub interface" url="ch13lev1sec5.html"/>
 <entry name="listings, DCOP, DCOPClient call() method" url="ch13lev1sec5.html"/>
 <entry name="listings, DCOP, DCOPClient send() method" url="ch13lev1sec5.html"/>
@@ -1656,12 +1656,12 @@
 <entry name="listings, dialog boxes, dialog from kdeui library" url="ch08lev1sec4.html"/>
 <entry name="listings, dialog boxes, KButtonBox in a dialog" url="ch08lev1sec4.html"/>
 <entry name="listings, dialog boxes, KEdit dialog code" url="ch08lev1sec6.html"/>
-<entry name="listings, dialog boxes, manual geometry strategy and QLayouts classes" url="ch08lev1sec2.html"/>
+<entry name="listings, dialog boxes, manual tqgeometry strategy and QLayouts classes" url="ch08lev1sec2.html"/>
 <entry name="listings, dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
 <entry name="listings, dialog boxes, modal dialog located on the stack" url="ch08lev1sec3.html"/>
 <entry name="listings, dialog boxes, modeless dialog example" url="ch08lev1sec3.html"/>
 <entry name="listings, dialog boxes, modeless dialogs, removing from memory" url="ch08lev1sec3.html"/>
-<entry name="listings, dialog boxes, QVBox widget for geometry management" url="ch08lev1sec2.html"/>
+<entry name="listings, dialog boxes, QVBox widget for tqgeometry management" url="ch08lev1sec2.html"/>
 <entry name="listings, dialog boxes, SelectDialog class" url="ch08.html"/>
 <entry name="listings, Example_ADD interface" url="ch14lev1sec2.html"/>
 <entry name="listings, Example_ADD module" url="ch14lev1sec2.html"/>
@@ -1672,8 +1672,8 @@
 <entry name="listings, KabDemo application (address book dialog), kabdemo.cpp class definition" url="ch10lev1sec4.html"/>
 <entry name="listings, KabDemo application (address book dialog), kabdemo.h class declaration" url="ch10lev1sec4.html"/>
 <entry name="listings, KabDemo application (address book dialog), main() method" url="ch10lev1sec4.html"/>
-<entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
-<entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/>
+<entry name="listings, KChildren widget, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/>
+<entry name="listings, KChildren widget, ktqchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/>
 <entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
 <entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
@@ -1750,7 +1750,7 @@
 <entry name="listings, KXOSquare widget, main() method" url="ch04lev1sec2.html"/>
 <entry name="listings, Makefile.am" url="ch16lev1sec2.html"/>
 <entry name="listings, Makefiles, example of" url="ch02lev1sec2.html"/>
-<entry name="listings, moc example" url="ch03lev1sec4.html"/>
+<entry name="listings, tqmoc example" url="ch03lev1sec4.html"/>
 <entry name="listings, MyWindow class implementation" url="ch03lev1sec4.html"/>
 <entry name="listings, network transparency, complete example" url="ch06lev1sec8.html"/>
 <entry name="listings, network transparency, filenames" url="ch06lev1sec8.html"/>
@@ -1829,7 +1829,7 @@
 <entry name="managing, sessions, source file example" url="ch06lev1sec2.html"/>
 <entry name="managing, sessions" url="ch06lev1sec2.html"/>
 <entry name="managing, sessions" url="ch07lev1sec3.html"/>
-<entry name="manual geometry strategy (dialog boxes)" url="ch08lev1sec2.html"/>
+<entry name="manual tqgeometry strategy (dialog boxes)" url="ch08lev1sec2.html"/>
 <entry name="mcopclass files" url="ch14lev1sec2.html"/>
 <entry name="MCOP, future of, composition/RAD" url="ch14lev1sec7.html"/>
 <entry name="MCOP, future of, GUIs" url="ch14lev1sec7.html"/>
@@ -1886,7 +1886,7 @@
 <entry name="Meta Object Compiler, executing programs" url="ch03lev1sec4.html"/>
 <entry name="Meta Object Compiler, keywords" url="ch03lev1sec4.html"/>
 <entry name="Meta Object Compiler, main program file example" url="ch03lev1sec4.html"/>
-<entry name="Meta Object Compiler (moc)" url="ch03lev1sec2.html"/>
+<entry name="Meta Object Compiler (tqmoc)" url="ch03lev1sec2.html"/>
 <entry name="Meta Object Compiler" url="ch03lev1sec4.html"/>
 <entry name="methods, attach()" url="ch13lev1sec5.html"/>
 <entry name="methods, beginTransaction()" url="ch13lev1sec5.html"/>
@@ -1937,7 +1937,7 @@
 <entry name="methods, remoteFunctions()" url="ch13lev1sec6.html"/>
 <entry name="methods, remoteInterfaces()" url="ch13lev1sec6.html"/>
 <entry name="methods, remoteObjects()" url="ch13lev1sec6.html"/>
-<entry name="methods, repaint(), QPainter class" url="ch04lev1sec2.html"/>
+<entry name="methods, tqrepaint(), QPainter class" url="ch04lev1sec2.html"/>
 <entry name="methods, resume()" url="ch13lev1sec5.html"/>
 <entry name="methods, senderId()" url="ch13lev1sec6.html"/>
 <entry name="methods, send()" url="ch13lev1sec5.html"/>
@@ -1962,11 +1962,11 @@
 <entry name="MIDI, LibKMid" url="ch14lev1sec6.html"/>
 <entry name="mime resource type" url="ch07lev1sec4.html"/>
 <entry name="Mini application template" url="ch18lev1sec2.html"/>
-<entry name="moc, executing programs" url="ch03lev1sec4.html"/>
-<entry name="moc, keywords" url="ch03lev1sec4.html"/>
-<entry name="moc, main program file example" url="ch03lev1sec4.html"/>
-<entry name="moc (Meta Object Compiler" url="ch03lev1sec2.html"/>
-<entry name="moc" url="ch03lev1sec4.html"/>
+<entry name="tqmoc, executing programs" url="ch03lev1sec4.html"/>
+<entry name="tqmoc, keywords" url="ch03lev1sec4.html"/>
+<entry name="tqmoc, main program file example" url="ch03lev1sec4.html"/>
+<entry name="tqmoc (Meta Object Compiler" url="ch03lev1sec2.html"/>
+<entry name="tqmoc" url="ch03lev1sec4.html"/>
 <entry name="modalCheck() method" url="ch10lev1sec3.html"/>
 <entry name="modal dialog boxes, advantages/disadvantages" url="ch08lev1sec3.html"/>
 <entry name="modal dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
@@ -2032,7 +2032,7 @@
 <entry name="navigation, drag and drop" url="ch07.html"/>
 <entry name="navigation, menubars, creating" url="ch02lev1sec4.html"/>
 <entry name="navigation, toolbars" url="ch02lev1sec4.html"/>
-<entry name="nested layouts (dialog boxes)" url="ch08lev1sec2.html"/>
+<entry name="nested tqlayouts (dialog boxes)" url="ch08lev1sec2.html"/>
 <entry name="network transparency, applications, classes" url="ch06lev1sec8.html"/>
 <entry name="network transparency, applications" url="ch06lev1sec8.html"/>
 <entry name="network transparency" url="ch01lev1sec2.html"/>
@@ -2143,13 +2143,13 @@
 <entry name="painting, widgets, invoking paint events" url="ch04lev1sec2.html"/>
 <entry name="painting, widgets, KXOSquare example" url="ch04lev1sec2.html"/>
 <entry name="painting, widgets, paintEvent() method" url="ch04lev1sec2.html"/>
-<entry name="painting, widgets, repainting" url="ch04lev1sec2.html"/>
+<entry name="painting, widgets, tqrepainting" url="ch04lev1sec2.html"/>
 <entry name="painting, widgets" url="ch04lev1sec2.html"/>
 <entry name="panel applet (KWeather), kweather.cpp class definition" url="ch11lev1sec3.html"/>
 <entry name="panel applet (KWeather), kweather.h class definition" url="ch11lev1sec3.html"/>
 <entry name="panel applet (KWeather), main() method" url="ch11lev1sec3.html"/>
 <entry name="panel applet (KWeather)" url="ch11lev1sec3.html"/>
-<entry name="parameters, signals and slots" url="ch03lev1sec3.html"/>
+<entry name="parameters, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/>
 <entry name="param (" url="ch15.html"/>
 <entry name="Para tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="Parent Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/>
@@ -2259,16 +2259,16 @@
 <entry name="protocols, DCOP, message redirection technology (referencing)" url="ch13lev1sec6.html"/>
 <entry name="protocols, DCOP, performance and overhead" url="ch13lev1sec6.html"/>
 <entry name="protocols, DCOP, programming interface" url="ch13lev1sec5.html"/>
-<entry name="protocols, DCOP, signals and slots" url="ch13lev1sec6.html"/>
+<entry name="protocols, DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/>
 <entry name="protocols, DCOP, underlying technologies" url="ch13lev1sec3.html"/>
 <entry name="protocols, DCOP" url="ch13.html"/>
 <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/>
 <entry name="protocols, XDND" url="ch07.html"/>
-<entry name="QBoxLayout geometry manager" url="ch04lev1sec3.html"/>
+<entry name="QBoxLayout tqgeometry manager" url="ch04lev1sec3.html"/>
 <entry name="QDataStream objects" url="ch13lev1sec3.html"/>
 <entry name="QGL widget" url="ch03lev1sec6.html"/>
-<entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/>
-<entry name="QHBox widget, layout managers, creating" url="ch08lev1sec2.html"/>
+<entry name="QGridLayout tqgeometry manager" url="ch04lev1sec3.html"/>
+<entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QImage class" url="ch10lev1sec2.html"/>
 <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/>
 <entry name="QLayout classes, design issues" url="ch08lev1sec2.html"/>
@@ -2278,7 +2278,7 @@
 <entry name="QPainter class, example usage (listing)" url="ch03lev1sec2.html"/>
 <entry name="QPainter class, member function" url="ch03lev1sec2.html"/>
 <entry name="QPainter class, methods, paintEvent()" url="ch04lev1sec2.html"/>
-<entry name="QPainter class, methods, repaint()" url="ch04lev1sec2.html"/>
+<entry name="QPainter class, methods, tqrepaint()" url="ch04lev1sec2.html"/>
 <entry name="QPainter class, methods, update()" url="ch04lev1sec2.html"/>
 <entry name="QPainter class" url="ch03lev1sec2.html"/>
 <entry name="QPainter class" url="ch04lev1sec2.html"/>
@@ -2289,7 +2289,7 @@
 <entry name="QPushButton class, listing" url="ch03lev1sec2.html"/>
 <entry name="QPushButton class, member functions" url="ch03lev1sec2.html"/>
 <entry name="QPushButton class" url="ch03lev1sec2.html"/>
-<entry name="QSplitter" url="ch05.html"/>
+<entry name=TQSPLITTER_OBJECT_NAME_STRING url="ch05.html"/>
 <entry name="Qt, classes, QList" url="ch03lev1sec5.html"/>
 <entry name="QTDIR environment variable" url="ch02lev1sec2.html"/>
 <entry name="Qt, event handling" url="ch03lev1sec2.html"/>
@@ -2298,11 +2298,11 @@
 <entry name="Qt library, supported image formats" url="ch10lev1sec2.html"/>
 <entry name="Qt, license, FreeQt" url="ch19lev1sec3.html"/>
 <entry name="Qt, Mesa" url="ch03lev1sec6.html"/>
-<entry name="Qt, moc, executing programs" url="ch03lev1sec4.html"/>
-<entry name="Qt, moc, keywords" url="ch03lev1sec4.html"/>
-<entry name="Qt, moc, main program file example" url="ch03lev1sec4.html"/>
-<entry name="Qt, moc (Meta Object Compiler)" url="ch03lev1sec2.html"/>
-<entry name="Qt, moc" url="ch03lev1sec4.html"/>
+<entry name="Qt, tqmoc, executing programs" url="ch03lev1sec4.html"/>
+<entry name="Qt, tqmoc, keywords" url="ch03lev1sec4.html"/>
+<entry name="Qt, tqmoc, main program file example" url="ch03lev1sec4.html"/>
+<entry name="Qt, tqmoc (Meta Object Compiler)" url="ch03lev1sec2.html"/>
+<entry name="Qt, tqmoc" url="ch03lev1sec4.html"/>
 <entry name="Qt, OpenGL" url="ch03lev1sec6.html"/>
 <entry name="Qt, paremeters" url="ch03lev1sec3.html"/>
 <entry name="Qt, QObject class" url="ch03lev1sec2.html"/>
@@ -2313,21 +2313,21 @@
 <entry name="Qt, QWidget class, example (listing)" url="ch03lev1sec2.html"/>
 <entry name="Qt, QWidget class, member functions" url="ch03lev1sec2.html"/>
 <entry name="Qt, QWidget class" url="ch03lev1sec2.html"/>
-<entry name="Qt, signals, connecting to slots" url="ch03lev1sec3.html"/>
-<entry name="Qt, signals, emitting" url="ch03lev1sec3.html"/>
-<entry name="Qt, signals" url="ch03lev1sec3.html"/>
-<entry name="Qt, slots, connecting to signals" url="ch03lev1sec3.html"/>
-<entry name="Qt, slots, creating" url="ch03lev1sec3.html"/>
-<entry name="Qt, slots, parameters" url="ch03lev1sec3.html"/>
-<entry name="Qt, slots, temporary classes" url="ch03lev1sec3.html"/>
-<entry name="Qt, slots" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SIGNALS, emitting" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SIGNALS" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SLOTS, creating" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SLOTS, parameters" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/>
+<entry name="Qt, Q_SLOTS" url="ch03lev1sec3.html"/>
 <entry name="Qt, STL" url="ch03lev1sec5.html"/>
 <entry name="Qt tookit" url="ch03.html"/>
 <entry name="Qt toolkit, overview" url="ch03lev1sec2.html"/>
 <entry name="Qt, utility classes" url="ch03lev1sec5.html"/>
 <entry name="queryClose() function" url="ch07lev1sec3.html"/>
 <entry name="quit action" url="ch06.html"/>
-<entry name="QVBox widget, layout managers, creating" url="ch08lev1sec2.html"/>
+<entry name="QVBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/>
 <entry name="QWidget class, attributes" url="ch04.html"/>
 <entry name="QWidget class, documentation" url="ch04.html"/>
 <entry name="QWidget class, event handlers, closeEvent()" url="ch04.html"/>
@@ -2353,8 +2353,8 @@
 <entry name="QWidget class, event handlers" url="ch04.html"/>
 <entry name="QWidget class, event handlers, wheelEvent()" url="ch04.html"/>
 <entry name="QWidget class, sample class declaration" url="ch04.html"/>
-<entry name="QWidget class, signals" url="ch04.html"/>
-<entry name="QWidget class, slots" url="ch04.html"/>
+<entry name="QWidget class, Q_SIGNALS" url="ch04.html"/>
+<entry name="QWidget class, Q_SLOTS" url="ch04.html"/>
 <entry name="QWidget class" url="ch03lev1sec2.html"/>
 <entry name="QWidget class" url="ch04.html"/>
 <entry name="raises (" url="ch15.html"/>
@@ -2385,8 +2385,8 @@
 <entry name="remove option (cvs command)" url="ch17lev1sec5.html"/>
 <entry name="removing, modeless dialog boxes" url="ch08lev1sec3.html"/>
 <entry name="rendering, HTML files" url="ch10.html"/>
-<entry name="repainting, widgets" url="ch04lev1sec2.html"/>
-<entry name="repaint() method, QPainter class" url="ch04lev1sec2.html"/>
+<entry name="tqrepainting, widgets" url="ch04lev1sec2.html"/>
+<entry name="tqrepaint() method, QPainter class" url="ch04lev1sec2.html"/>
 <entry name="replace action" url="ch06.html"/>
 <entry name="reportBug action" url="ch06.html"/>
 <entry name="resiceGL(int width, int height) function (QGL widget)" url="ch03lev1sec6.html"/>
@@ -2463,13 +2463,13 @@
 <entry name="show() method" url="ch02lev1sec3.html"/>
 <entry name="showStatusbar action" url="ch06.html"/>
 <entry name="showToolbar action" url="ch06.html"/>
-<entry name="signals, connecting to slots" url="ch03lev1sec3.html"/>
-<entry name="signals (DCOP)" url="ch13lev1sec6.html"/>
-<entry name="signals, emitting" url="ch03lev1sec3.html"/>
-<entry name="signals, parameters" url="ch03lev1sec3.html"/>
-<entry name="signals, (Qt)" url="ch03lev1sec3.html"/>
-<entry name="signals" url="ch03lev1sec2.html"/>
-<entry name="signals (widgets)" url="ch04.html"/>
+<entry name="Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="Q_SIGNALS (DCOP)" url="ch13lev1sec6.html"/>
+<entry name="Q_SIGNALS, emitting" url="ch03lev1sec3.html"/>
+<entry name="Q_SIGNALS, parameters" url="ch03lev1sec3.html"/>
+<entry name="Q_SIGNALS, (Qt)" url="ch03lev1sec3.html"/>
+<entry name="Q_SIGNALS" url="ch03lev1sec2.html"/>
+<entry name="Q_SIGNALS (widgets)" url="ch04.html"/>
 <entry name="SimpleSoundServer interface" url="ch14lev1sec4.html"/>
 <entry name="since (" url="ch15.html"/>
 <entry name="single-instance application, kunique.cpp call definition" url="ch11lev1sec2.html"/>
@@ -2479,17 +2479,17 @@
 <entry name="slotButton()" url="ch03lev1sec4.html"/>
 <entry name="slotOpen() function" url="ch07lev1sec5.html"/>
 <entry name="slotSave() function" url="ch07lev1sec5.html"/>
-<entry name="slots, connecting to signals" url="ch03lev1sec3.html"/>
-<entry name="slots, creating" url="ch03lev1sec3.html"/>
-<entry name="slots (DCOP)" url="ch13lev1sec6.html"/>
-<entry name="slots, parameters" url="ch03lev1sec3.html"/>
+<entry name="Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/>
+<entry name="Q_SLOTS, creating" url="ch03lev1sec3.html"/>
+<entry name="Q_SLOTS (DCOP)" url="ch13lev1sec6.html"/>
+<entry name="Q_SLOTS, parameters" url="ch03lev1sec3.html"/>
 <entry name="slotSpecialHelp() function" url="ch05lev1sec2.html"/>
 <entry name="slotSpellCheck() method" url="ch10lev1sec3.html"/>
-<entry name="slots, (Qt)" url="ch03lev1sec3.html"/>
-<entry name="slots, slotButton()" url="ch03lev1sec4.html"/>
-<entry name="slots, temporary classes" url="ch03lev1sec3.html"/>
-<entry name="slots" url="ch03lev1sec2.html"/>
-<entry name="slots (widgets)" url="ch04.html"/>
+<entry name="Q_SLOTS, (Qt)" url="ch03lev1sec3.html"/>
+<entry name="Q_SLOTS, slotButton()" url="ch03lev1sec4.html"/>
+<entry name="Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/>
+<entry name="Q_SLOTS" url="ch03lev1sec2.html"/>
+<entry name="Q_SLOTS (widgets)" url="ch04.html"/>
 <entry name="snapshots" url="ch17lev1sec3.html"/>
 <entry name="socket() method" url="ch13lev1sec6.html"/>
 <entry name="software development, documentation" url="ch18.html"/>
@@ -2789,7 +2789,7 @@
 <entry name="widets, KImageView (image viewer/converter), main() method" url="ch10lev1sec2.html"/>
 <entry name="widets, KImageView (image viewer/converter)" url="ch10lev1sec2.html"/>
 <entry name="widgets, attributes" url="ch04.html"/>
-<entry name="widgets, child widgets, geometry management" url="ch04lev1sec3.html"/>
+<entry name="widgets, child widgets, tqgeometry management" url="ch04lev1sec3.html"/>
 <entry name="widgets, child widgets, KChildren example" url="ch04lev1sec3.html"/>
 <entry name="widgets, child widgets" url="ch04lev1sec3.html"/>
 <entry name="widgets, compared to parts" url="ch12.html"/>
@@ -2832,12 +2832,12 @@
 <entry name="widgets, painting, invoking paint events" url="ch04lev1sec2.html"/>
 <entry name="widgets, painting, KXOSquare example" url="ch04lev1sec2.html"/>
 <entry name="widgets, painting, paintEvent() method" url="ch04lev1sec2.html"/>
-<entry name="widgets, painting, repainting" url="ch04lev1sec2.html"/>
+<entry name="widgets, painting, tqrepainting" url="ch04lev1sec2.html"/>
 <entry name="widgets, painting" url="ch04lev1sec2.html"/>
 <entry name="widgets, QGL" url="ch03lev1sec6.html"/>
 <entry name="widgets, sample class declaration" url="ch04.html"/>
-<entry name="widgets, signals" url="ch04.html"/>
-<entry name="widgets, slots" url="ch04.html"/>
+<entry name="widgets, Q_SIGNALS" url="ch04.html"/>
+<entry name="widgets, Q_SLOTS" url="ch04.html"/>
 <entry name="widgets" url="ch01lev1sec2.html"/>
 <entry name="widgets" url="ch04.html"/>
 <entry name="widgets" url="ch04lev1sec3.html"/>
diff --git a/languages/cpp/doc/libc.toc b/languages/cpp/doc/libc.toc
index a007614d..626558da 100644
--- a/languages/cpp/doc/libc.toc
+++ b/languages/cpp/doc/libc.toc
@@ -58,7 +58,7 @@
       <tocsect4 name="3.2.4.5 Obstack Functions and Macros" url="chapters_3.html#SEC47"/>
       <tocsect4 name="3.2.4.6 Growing Objects" url="chapters_3.html#SEC48"/>
       <tocsect4 name="3.2.4.7 Extra Fast Growing Objects" url="chapters_3.html#SEC49"/>
-      <tocsect4 name="3.2.4.8 Status of an Obstack" url="chapters_3.html#SEC50"/>
+      <tocsect4 name="3.2.4.8 tqStatus of an Obstack" url="chapters_3.html#SEC50"/>
       <tocsect4 name="3.2.4.9 Alignment of Data in Obstacks" url="chapters_3.html#SEC51"/>
       <tocsect4 name="3.2.4.10 Obstack Chunks" url="chapters_3.html#SEC52"/>
       <tocsect4 name="3.2.4.11 Summary of Obstack Functions" url="chapters_3.html#SEC53"/>
@@ -300,7 +300,7 @@
   <tocsect2 name="13.9 Synchronizing I/O operations" url="chapters_13.html#SEC250"/>
   <tocsect2 name="13.10 Perform I/O Operations in Parallel" url="chapters_13.html#SEC251">
     <tocsect3 name="13.10.1 Asynchronous Read and Write Operations" url="chapters_13.html#SEC252"/>
-    <tocsect3 name="13.10.2 Getting the Status of AIO Operations" url="chapters_13.html#SEC253"/>
+    <tocsect3 name="13.10.2 Getting the tqStatus of AIO Operations" url="chapters_13.html#SEC253"/>
     <tocsect3 name="13.10.3 Getting into a Consistent State" url="chapters_13.html#SEC254"/>
     <tocsect3 name="13.10.4 Cancellation of AIO Operations" url="chapters_13.html#SEC255"/>
     <tocsect3 name="13.10.5 How to optimize the AIO implementation" url="chapters_13.html#SEC256"/>
@@ -308,11 +308,11 @@
   <tocsect2 name="13.11 Control Operations on Files" url="chapters_13.html#SEC257"/>
   <tocsect2 name="13.12 Duplicating Descriptors" url="chapters_13.html#SEC258"/>
   <tocsect2 name="13.13 File Descriptor Flags" url="chapters_13.html#SEC259"/>
-  <tocsect2 name="13.14 File Status Flags" url="chapters_13.html#SEC260">
+  <tocsect2 name="13.14 File tqStatus Flags" url="chapters_13.html#SEC260">
     <tocsect3 name="13.14.1 File Access Modes" url="chapters_13.html#SEC261"/>
     <tocsect3 name="13.14.2 Open-time Flags" url="chapters_13.html#SEC262"/>
     <tocsect3 name="13.14.3 I/O Operating Modes" url="chapters_13.html#SEC263"/>
-    <tocsect3 name="13.14.4 Getting and Setting File Status Flags" url="chapters_13.html#SEC264"/>
+    <tocsect3 name="13.14.4 Getting and Setting File tqStatus Flags" url="chapters_13.html#SEC264"/>
   </tocsect2>
   <tocsect2 name="13.15 File Locks" url="chapters_13.html#SEC265"/>
   <tocsect2 name="13.16 Interrupt-Driven Input" url="chapters_13.html#SEC266"/>
@@ -455,7 +455,7 @@
     <tocsect3 name="18.2.1 openlog" url="chapters_18.html#SEC385"/>
     <tocsect3 name="18.2.2 syslog, vsyslog" url="chapters_18.html#SEC386"/>
     <tocsect3 name="18.2.3 closelog" url="chapters_18.html#SEC387"/>
-    <tocsect3 name="18.2.4 setlogmask" url="chapters_18.html#SEC388"/>
+    <tocsect3 name="18.2.4 setlogtqmask" url="chapters_18.html#SEC388"/>
     <tocsect3 name="18.2.5 Syslog Example" url="chapters_18.html#SEC389"/>
   </tocsect2>
 </tocsect1>
@@ -666,7 +666,7 @@
   <tocsect2 name="25.5 System Calls" url="chapters_25.html#SEC560"/>
   <tocsect2 name="25.6 Program Termination" url="chapters_25.html#SEC561">
     <tocsect3 name="25.6.1 Normal Termination" url="chapters_25.html#SEC562"/>
-    <tocsect3 name="25.6.2 Exit Status" url="chapters_25.html#SEC563"/>
+    <tocsect3 name="25.6.2 Exit tqStatus" url="chapters_25.html#SEC563"/>
     <tocsect3 name="25.6.3 Cleanups on Exit" url="chapters_25.html#SEC564"/>
     <tocsect3 name="25.6.4 Aborting a Program" url="chapters_25.html#SEC565"/>
     <tocsect3 name="25.6.5 Termination Internals" url="chapters_25.html#SEC566"/>
@@ -679,7 +679,7 @@
   <tocsect2 name="26.4 Creating a Process" url="chapters_26.html#SEC571"/>
   <tocsect2 name="26.5 Executing a File" url="chapters_26.html#SEC572"/>
   <tocsect2 name="26.6 Process Completion" url="chapters_26.html#SEC573"/>
-  <tocsect2 name="26.7 Process Completion Status" url="chapters_26.html#SEC574"/>
+  <tocsect2 name="26.7 Process Completion tqStatus" url="chapters_26.html#SEC574"/>
   <tocsect2 name="26.8 BSD Process Wait Functions" url="chapters_26.html#SEC575"/>
   <tocsect2 name="26.9 Process Creation Example" url="chapters_26.html#SEC576"/>
 </tocsect1>
diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc
index e1ed885e..b9e225ec 100644
--- a/languages/cpp/doc/qt-kdev3.toc
+++ b/languages/cpp/doc/qt-kdev3.toc
@@ -16,9 +16,9 @@
 	<tocsect2 name="Designing the program" url="design-program.html"/>
 	<tocsect2 name="Adding widgets" url="adding-widgets.html"/>
 	<tocsect2 name="Getting spaced out" url="spaced-out.html"/>
-	<tocsect2 name="Signals and slots" url="signals-and-slots.html"/>
+	<tocsect2 name="Signals and Q_SLOTS" url="Q_SIGNALS-and-Q_SLOTS.html"/>
 	<tocsect2 name="Generating the source" url="source.html"/>
-	<tocsect2 name="Implementing the slot" url="slots.html"/>
+	<tocsect2 name="Implementing the slot" url="Q_SLOTS.html"/>
 </tocsect1>
 <tocsect1 name="In short" url="in-short.html">
 </tocsect1>
@@ -32,7 +32,7 @@
 </tocsect1>
 <tocsect1 name="Generating the source (alternate)" url="without_subclass.html">
 	<tocsect2 name="Without using the KDevelop subclassing capability" url="without_subclass.html"/>
-	<tocsect2 name="Implementing the slot" url="slots2.html"/>
+	<tocsect2 name="Implementing the slot" url="Q_SLOTS2.html"/>
 </tocsect1>
 <tocsect1 name="Credits and License" url="credits.html">
 </tocsect1>
diff --git a/languages/cpp/doc/stl.toc b/languages/cpp/doc/stl.toc
index d86b82b0..a3754311 100644
--- a/languages/cpp/doc/stl.toc
+++ b/languages/cpp/doc/stl.toc
@@ -109,9 +109,9 @@
 <tocsect1 name="Algorithms" url="">
   <tocsect2 name="Non-mutating algorithms" url="">
     <tocsect3 name="for_each" url="for_each.html"/>
-    <tocsect3 name="find" url="find.html"/>
+    <tocsect3 name="tqfind" url="find.html"/>
     <tocsect3 name="find_if" url="find_if.html"/>
-    <tocsect3 name="adjacent_find" url="adjacent_find.html"/>
+    <tocsect3 name="adjacent_tqfind" url="adjacent_find.html"/>
     <tocsect3 name="find_first_of" url="find_first_of.html"/>
     <tocsect3 name="count" url="count.html"/>
     <tocsect3 name="count_if" url="count_if.html"/>
@@ -129,7 +129,7 @@
     <tocsect3 name="iter_swap" url="iter_swap.html"/>
     <tocsect3 name="swap_ranges" url="swap_ranges.html"/>
     <tocsect3 name="transform" url="transform.html"/>
-    <tocsect3 name="replace" url="replace.html"/>
+    <tocsect3 name="tqreplace" url="tqreplace.html"/>
     <tocsect3 name="replace_if" url="replace_if.html"/>
     <tocsect3 name="replace_copy" url="replace_copy.html"/>
     <tocsect3 name="replace_copy_if" url="replace_copy_if.html"/>
@@ -370,9 +370,9 @@
 <entry name="distance, STL function" url="distance.html"/>
 <entry name="advance, STL function" url="advance.html"/>
 <entry name="for_each, STL algorithm" url="for_each.html"/>
-<entry name="find, STL algorithm" url="find.html"/>
+<entry name="tqfind, STL algorithm" url="find.html"/>
 <entry name="find_if, STL algorithm" url="find_if.html"/>
-<entry name="adjacent_find, STL algorithm" url="adjacent_find.html"/>
+<entry name="adjacent_tqfind, STL algorithm" url="adjacent_find.html"/>
 <entry name="find_first_of, STL algorithm" url="find_first_of.html"/>
 <entry name="count, STL algorithm" url="count.html"/>
 <entry name="count_if, STL algorithm" url="count_if.html"/>
@@ -388,7 +388,7 @@
 <entry name="iter_swap, STL algorithm" url="iter_swap.html"/>
 <entry name="swap_ranges, STL algorithm" url="swap_ranges.html"/>
 <entry name="transform, STL algorithm" url="transform.html"/>
-<entry name="replace, STL algorithm" url="replace.html"/>
+<entry name="tqreplace, STL algorithm" url="tqreplace.html"/>
 <entry name="replace_if, STL algorithm" url="replace_if.html"/>
 <entry name="replace_copy, STL algorithm" url="replace_copy.html"/>
 <entry name="fill, STL algorithm" url="fill.html"/>
diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp
index 54343b70..1f35708c 100644
--- a/languages/cpp/doxydoc.cpp
+++ b/languages/cpp/doxydoc.cpp
@@ -20,7 +20,7 @@
 
 void DoxyDoc::formatType( TQString& str )
 {
-	str.replace( TQRegExp( " " ), "" );
+	str.tqreplace( TQRegExp( " " ), "" );
 }
 
 DoxyDoc::DoxyDoc( const TQStringList& dir )
@@ -36,7 +36,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 	TQString scope = tmpscope;
 	bool foundfile = false;
 	//produce doxygen conform filenames
-	TQString filename = "/class" + scope.replace( TQRegExp( "_" ), "__" ).replace( TQRegExp( "::" ), "_1_1" ) + ".xml";
+	TQString filename = "/class" + scope.tqreplace( TQRegExp( "_" ), "__" ).tqreplace( TQRegExp( "::" ), "_1_1" ) + ".xml";
 	
 	//search for file in all directories
 	for ( std::list<TQDir>::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci )
@@ -53,7 +53,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 					return "";
 				}
 				TQDomDocument m_doc;
-				m_doc.setContent( m_file.readAll() );
+				m_doc.setContent( TQByteArray(m_file.readAll()) );
 				m_file.close();
 				m_list = m_doc.elementsByTagName( "memberdef" );
 				foundfile = true;
@@ -64,7 +64,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 		}
 	}
 	if ( !foundfile )
-		return TQString::null;
+		return TQString();
 	
 	TQString type = tmptype;
 	formatType( type );
@@ -134,7 +134,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 					description += "<b>Parameterlist:</b><p>" + paramstr;
 				
 				if ( description == "" )
-					return TQString::null;
+					return TQString();
 				else
 					return description;
 			}
@@ -142,7 +142,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString&
 		
 	}
 	
-	return TQString::null;
+	return TQString();
 }
 
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index ebd536ec..fee9832e 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -18,7 +18,7 @@
  *
  * 
  * unsermake:
- * unsermake is detected by reading the first line of the makefile. If it contains "generated by unsermake" the following things are respected:
+ * unsermake is detected by reading the first line of the makefile. If it tqcontains "generated by unsermake" the following things are respected:
  * 1. Since unsermake does not have the -W command(which should tell it to recompile the given file no matter whether it has been changed or not), the file-modification-time of the file is changed temporarily and the --no-real-compare option is used to force recompilation.
  * 2. The targets seem to be called *.lo instead of *.o when using unsermake, so *.lo names are used.
  * example-(test)command: unsermake --no-real-compare -n myfile.lo
@@ -181,7 +181,7 @@ namespace CppTools {
         if( f.open( IO_ReadOnly ) ) {
           TQString firstLine;
           f.readLine( firstLine, 1000 );
-          if( firstLine.find( "generated by unsermake" ) != -1 ) {
+          if( firstLine.tqfind( "generated by unsermake" ) != -1 ) {
             ret = true;
           }
           f.close();
@@ -257,11 +257,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
   dir = TQDir( dir.absPath() );
   TQFileInfo makeFile( dir, "Makefile" );
   if( !makeFile.exists() )
-    return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) );
+    return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").tqarg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").tqarg(file) );
 
   TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version
   TQDateTime makeFileModification = makeFile.lastModified();
-  Cache::iterator it = m_cache.find( dir.path() );
+  Cache::iterator it = m_cache.tqfind( dir.path() );
   if( it != m_cache.end() ) {
     cachedPath = (*it).path;
     if( makeFileModification == (*it).modificationTime ) {
@@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
         return ret;
       } else {
         //We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet
-        if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
+        if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.tqfind( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
           PathResolutionResult ret(false); //Fake that the result is ok
           ret.errorMessage = i18n("Cached: ") + (*it).errorMessage;
           ret.longErrorMessage = (*it).longErrorMessage;
@@ -297,8 +297,8 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
   absoluteFile = u.path();
   
   int dot;
-  if( (dot = file.findRev( '.' )) == -1 )
-    return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).arg(file) );
+  if( (dot = file.tqfindRev( '.' )) == -1 )
+    return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) );
 
   targetName = file.left( dot );
 
@@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
     ce.failed = true;
     ce.errorMessage = res.errorMessage;
     ce.longErrorMessage = res.longErrorMessage;
-    ce.failTime = TQDateTime::currentDateTime();
+    ce.failTime = TQDateTime::tqcurrentDateTime();
     ce.failedFiles[file] = true;
   } else {
     ce.failed = false;
@@ -387,12 +387,12 @@ PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command
 
     output = proc.stdOut();
     if( proc.exitStatus() != 0 )
-      return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").arg( output ) );
+      return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").tqarg( output ) );
   } else {
     bool ret = executeCommandPopen(command, workingDirectory, output);
     
     if( !ret )
-      return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").arg( output ) );
+      return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").tqarg( output ) );
   }
   return PathResolutionResult(true);
 }
@@ -413,11 +413,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
     return res;
   
   TQRegExp newLineRx("\\\\\\n");
-  fullOutput.replace( newLineRx, "" );
+  fullOutput.tqreplace( newLineRx, "" );
   ///@todo collect multiple outputs at the same time for performance-reasons
   TQString firstLine = fullOutput;
   int lineEnd;
-  if( (lineEnd = fullOutput.find('\n')) != -1 )
+  if( (lineEnd = fullOutput.tqfind('\n')) != -1 )
     firstLine.truncate( lineEnd ); //Only look at the first line of output
   
   /**
@@ -443,7 +443,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
         else if( prefix.endsWith( ";" ) )
           prefix.truncate( prefix.length() - 1 );
         ///Now test if what we have as prefix is a simple "cd /foo/bar" call.
-        if( prefix.startsWith( "cd ") && !prefix.contains( ";") && !prefix.contains("&&") ) {
+        if( prefix.startsWith( "cd ") && !prefix.tqcontains( ";") && !prefix.tqcontains("&&") ) {
           newWorkingDirectory = prefix.right( prefix.length() - 3 ).stripWhiteSpace();
           if( !newWorkingDirectory.startsWith("/") )
             newWorkingDirectory = workingDirectory + "/" + newWorkingDirectory;
@@ -456,7 +456,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
       if( d.exists() ) {
         ///The recursive working-directory exists.
         TQString makeParams = firstLine.mid( offset+5 );
-        if( !makeParams.contains( ";" ) && !makeParams.contains( "&&" ) ) {
+        if( !makeParams.tqcontains( ";" ) && !makeParams.tqcontains( "&&" ) ) {
           ///Looks like valid parameters
           ///Make the file-name absolute, so it can be referenced from any directory
           TQString absoluteFile = file;
@@ -471,14 +471,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
             return res;
           return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource );
         }else{
-          return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").arg(makeParams).arg(fullOutput) );
+          return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").tqarg(makeParams).tqarg(fullOutput) );
         }
       } else {
-        return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").arg(newWorkingDirectory).arg(fullOutput) );
+        return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").tqarg(newWorkingDirectory).tqarg(fullOutput) );
       }
 
     } else {
-      return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").arg(fullOutput) );
+      return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").tqarg(fullOutput) );
     }
 
     ++offset;
@@ -488,7 +488,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
   ///STEP 2: Search the output for include-paths
   TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" );
   if( validRx.search( fullOutput ) == -1 )
-    return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\"  Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) );
+    return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\"  Command: \"%2\" Output: \"%3\"").tqarg(workingDirectory).tqarg( source.getCommand(file, makeParameters) ).tqarg(fullOutput) );
 
   PathResolutionResult ret( true );
   ret.longErrorMessage = fullOutput;
@@ -497,7 +497,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
   TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc.
   TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include
 
-  TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) );
+  TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).tqarg( includeParameterRx ).tqarg( quotedRx ).tqarg( escapedPathRx ) );
   includeRx.setMinimal( true );
   includeRx.setCaseSensitive( true );
   offset = 0;
diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h
index 33aaecd9..57106e4f 100644
--- a/languages/cpp/includepathresolver.h
+++ b/languages/cpp/includepathresolver.h
@@ -38,7 +38,7 @@ namespace CppTools {
   ///One resolution-try can issue up to 4 make-calls in worst case
   class IncludePathResolver {
     public:
-      ///Whether the Qt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread.
+      ///Whether the TQt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread.
       IncludePathResolver( bool continueEventLoop = false );
       ///Same as below, but uses the directory of the file as working-directory. The argument must be absolute.
       PathResolutionResult resolveIncludePath( const TQString& file );
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index f240ed36..9e0918b2 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -105,11 +105,11 @@ void KDevDriver::setup()
 	if( !kdedir.isNull() )
 		addIncludePath( kdedir + "/include" );
 
-	TQString qmakespec = getenv( "QMAKESPEC" );
+	TQString qmakespec = getenv( "TQMAKESPEC" );
 	if ( qmakespec.isNull() )
 	qmakespec = "linux-g++";
 	
-	TQString qtdir = getenv( "QTDIR" );
+	TQString qtdir = getenv( "TQTDIR" );
 	if( !qtdir.isNull() ) {
 		addIncludePath( qtdir + "/include" );
 
@@ -130,15 +130,15 @@ void KDevDriver::setup()
 	}
 		
 	addMacro( Macro( "__cplusplus", "1" ) );
-	addMacro( Macro( "Q_SIGNALS", "signals" ) );
-	addMacro( Macro( "Q_SLOTS", "slots" ) );
-	addMacro( Macro( "Q_SCRIPTABLE", "" ) );
+	addMacro( Macro( "signals", "signals" ) );
+	addMacro( Macro( "slots", "slots" ) );
+	addMacro( Macro( "TQ_SCRIPTABLE", "" ) );
 
 	CppCodeCompletionConfig* cfg = m_cppSupport->codeCompletionConfig();
 	TQString str = cfg->customIncludePaths();
 	int pos = 0;
 	while( pos < str.length() ) {
-		int end = str.find( ';', pos );
+		int end = str.tqfind( ';', pos );
 		if( end == -1 ) {
 			end = str.length();
 		}
@@ -175,7 +175,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
 	CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file );
 	
 	if( !res.success ) {
-		Problem p( i18n( "%1. Message: %2" ).arg( res.errorMessage ).arg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
+		Problem p( i18n( "%1. Message: %2" ).tqarg( res.errorMessage ).tqarg( res.longErrorMessage ), 0, 0, Problem::Level_Warning );
 		p.setFileName( file );
 		addProblem( file, p );
 	}
@@ -184,15 +184,15 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
 }
 
 bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) {
-	TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash());
+	TQString compoundString = file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash());
 
 	if( !m_shouldParseIncludedFiles )
 		return false;
-	m_cppSupport->safeFileSet().contains( compoundString );
+	m_cppSupport->safeFileSet().tqcontains( compoundString );
 
-	if( m_cppSupport->safeFileSet().contains( file->fileName()) ){
+	if( m_cppSupport->safeFileSet().tqcontains( file->fileName()) ){
 		return false;
-	} else if( m_cppSupport->safeFileSet().contains( compoundString ) ) {
+	} else if( m_cppSupport->safeFileSet().tqcontains( compoundString ) ) {
 		//kdDebug( 9007 ) << "ALREADY IN FILE-SET: " << compoundString << endl;
 		return false;
 	} else {
diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp
index b3e6bacb..b29fe2d4 100644
--- a/languages/cpp/main.cpp
+++ b/languages/cpp/main.cpp
@@ -86,11 +86,11 @@ public:
 		if ( !kdedir.isNull() )
 			addIncludePath( kdedir + "/include" );
 		
-		TQString qtdir = getenv( "QTDIR" );
+		TQString qtdir = getenv( "TQTDIR" );
 		if ( !qtdir.isNull() )
 			addIncludePath( qtdir + "/include" );
 		
-		TQString qmakespec = getenv( "QMAKESPEC" );
+		TQString qmakespec = getenv( "TQMAKESPEC" );
 		if ( qmakespec.isNull() )
 			qmakespec = "linux-g++";
 		// #### implement other mkspecs and find a better way to find the
@@ -107,7 +107,7 @@ public:
             TQString gccLibPath = SetupHelper::getGccIncludePath(&ok);
             if (!ok) 
                 return;  			
-			gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" );
+			gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" );
 			addIncludePath( gccLibPath );
 			addIncludePath( "/usr/include/g++-3" );
 			addIncludePath( "/usr/include/g++" );
diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
index 5551cd02..930bcfef 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
+++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
@@ -19,9 +19,9 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) )
 
-KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args
+KDevCustomImporter::KDevCustomImporter( TQObject* tqparent, const char* name, const TQStringList & // args
                                       )
-		: KDevPCSImporter( parent, name )
+		: KDevPCSImporter( tqparent, name )
 {}
 
 
@@ -75,9 +75,9 @@ TQStringList KDevCustomImporter::includePaths()
 	return m_settings->dirs();
 }
 
-TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name )
+TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* tqparent, const char* name )
 {
-	m_settings = new SettingsDialog( parent, name );
+	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
 }
 
@@ -94,7 +94,7 @@ void KDevCustomImporter::processDir( const TQString path, TQStringList & files )
 		if (!dir.exists())
 		    continue;
 		kdDebug( 9015 ) << "Examining: " << dir.path() << endl;
-		const QFileInfoList *dirEntries = dir.entryInfoList();
+		const TQFileInfoList *dirEntries = dir.entryInfoList();
 		if ( !dirEntries ) continue;
 		TQPtrListIterator<TQFileInfo> it( *dirEntries );
 		for ( ; dirEntries && it.current(); ++it )
diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
index bca53eeb..0aea3974 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
+++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
@@ -19,15 +19,16 @@ class SettingsDialog;
 class KDevCustomImporter : public KDevPCSImporter
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
+    KDevCustomImporter(TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList());
 
     ~KDevCustomImporter();
 
     virtual TQString dbName() const;
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
-    virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name);
+    virtual TQWidget* createSettingsPage(TQWidget* tqparent, const char* name);
 
 protected:
     TQStringList fileList( const TQString& path );
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index 37f2bfef..ebef44ed 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -34,8 +34,8 @@
 
 #include <cstdlib>
 
-SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
-		: SettingsDialogBase( parent, name, fl )
+SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl )
+		: SettingsDialogBase( tqparent, name, fl )
 {
 	KURLRequester * req = new KURLRequester( this );
 	req->setMode( KFile::Directory );
@@ -83,17 +83,17 @@ void SettingsDialog::validate()
 
 void SettingsDialog::validateDirectory( const TQString & dir )
 {
-	TQDir d( dir, TQString::null, TQDir::DefaultSort, TQDir::Dirs );
+	TQDir d( dir, TQString(), TQDir::DefaultSort, TQDir::Dirs );
 	if ( !d.exists() )
 	{
 		elb->lineEdit() ->setText( dir );
 
-		if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) )
+		if ( TQListBoxItem * item = elb->listBox() ->tqfindItem( dir, TQt::ExactMatch ) )
 		{
 			elb->listBox() ->removeItem( elb->listBox() ->index( item ) );
 		}
 
-		TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir );
+		TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).tqarg( dir );
 		KMessageBox::error( 0, errormsg, "Couldn't find directory" );
 	}
 	emit enabled( elb->listBox()->count() > 0 );
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h
index 02336f98..3d683f99 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h
@@ -19,12 +19,13 @@ class KEditListBox;
 class SettingsDialog : public SettingsDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~SettingsDialog();
 
-  bool isValidQtDir( const TQString& path ) const;
+  bool isValidTQtDir( const TQString& path ) const;
 
   TQString qtDir() const;
   TQString configuration() const;
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
index b9faadb1..a7678844 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SettingsDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsDialogBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>grid</cstring>
             </property>
@@ -32,7 +32,7 @@
                         <string>*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         <string>Filename pattern:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>recursive_box</cstring>
                     </property>
@@ -55,8 +55,8 @@
         </widget>
     </vbox>
 </widget>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
index a52da5d7..d487ab35 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
@@ -23,8 +23,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) )
 
-KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
-		: KDevPCSImporter( parent, name )
+KDevKDELibsImporter::KDevKDELibsImporter( TQObject * tqparent, const char * name, const TQStringList& )
+		: KDevPCSImporter( tqparent, name )
 {}
 
 KDevKDELibsImporter::~KDevKDELibsImporter()
@@ -76,7 +76,7 @@ TQStringList KDevKDELibsImporter::fileList()
 		{
 			dir.setPath( s.pop() );
 			kdDebug( 9015 ) << "Examining: " << dir.path() << endl;
-			const QFileInfoList *dirEntries = dir.entryInfoList();
+			const TQFileInfoList *dirEntries = dir.entryInfoList();
 			if ( !dirEntries ) continue;
 			TQPtrListIterator<TQFileInfo> it( *dirEntries );
 			for ( ; it.current(); ++it )
@@ -109,9 +109,9 @@ TQStringList KDevKDELibsImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * tqparent, const char * name )
 {
-	m_settings = new SettingsDialog( parent, name );
+	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
 }
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
index 45cf470a..1e2c8254 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVQTIMPORTER_H
-#define KDEVQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
 #include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
@@ -20,15 +20,16 @@ class SettingsDialog;
 class KDevKDELibsImporter : public KDevPCSImporter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    KDevKDELibsImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
     virtual ~KDevKDELibsImporter();
 
-    virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); }
+    virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 
 private:
     TQStringList fileList( const TQString& path );
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
index a0763380..612ff79a 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
@@ -29,17 +29,17 @@
 
 #include "settingsdialog.h"
 
-TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox )
+TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox )
 {
-	if ( cpQListBox->selectionMode() != TQListBox::Single )
+	if ( cpTQListBox->selectionMode() != TQListBox::Single )
 		return 0;
-	if ( cpQListBox->isSelected( cpQListBox->currentItem() ) )
-		return cpQListBox->item( cpQListBox->currentItem() );
+	if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) )
+		return cpTQListBox->item( cpTQListBox->currentItem() );
 	return 0;
 }
 
-SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
-: SettingsDialogBase( parent, name, fl )
+SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl )
+: SettingsDialogBase( tqparent, name, fl )
 {
 	KApplication::kApplication()->dirs()->addResourceType("include","include");
 	TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include","");
@@ -47,7 +47,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 	{
 		TQString kdedir = *it;
 		if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) )
-			if ( !kdeListBox->findItem( kdedir, ExactMatch ) )
+			if ( !kdeListBox->tqfindItem( kdedir, ExactMatch ) )
 				kdeListBox->insertItem( kdedir );
 	}
 
@@ -81,7 +81,7 @@ void SettingsDialog::addUrlButton_clicked()
 	if ( isValidKDELibsDir( kdeUrl->url() ) )
 	{
 		kdeListBox->insertItem( kdeUrl->url() );
-		if ( TQListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) )
+		if ( TQListBoxItem * item = kdeListBox->tqfindItem( kdeUrl->url(), ExactMatch ) )
 		{
 			kdeListBox->setSelected( item, true );
 		}
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
index 4a06dd12..7de31292 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
@@ -17,9 +17,10 @@
 class SettingsDialog : public SettingsDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~SettingsDialog();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
index 00b8c3ac..de905d40 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SettingsDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsDialogBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -25,7 +25,7 @@
 Only the selected entry will be used</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="3" column="1">
+        <widget class="TQComboBox" row="3" column="1">
             <item>
                 <property name="text">
                     <string>KDE Libs Headers</string>
@@ -46,7 +46,7 @@ Only the selected entry will be used</string>
                 <string>Decide if you want to restrict the Code Completion database to only the base kdelibs API or the entire KDE include structure</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -65,7 +65,7 @@ Only the selected entry will be used</string>
                 <string>If none of the directories KDevelop found is what you want,you can enter a directory of your choice here</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="3">
+        <widget class="TQPushButton" row="2" column="3">
             <property name="name">
                 <cstring>addUrlButton</cstring>
             </property>
@@ -96,7 +96,7 @@ Only the selected entry will be used</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>220</width>
                     <height>20</height>
@@ -110,18 +110,18 @@ Only the selected entry will be used</string>
 <connections>
     <connection>
         <sender>kdeListBox</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>SettingsDialogBase</receiver>
-        <slot>slotSelectionChanged(QListBoxItem*)</slot>
+        <slot>slotSelectionChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<slots>
-    <slot>slotSelectionChanged(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot>slotSelectionChanged(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index d4635ba4..5864659c 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -22,15 +22,15 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevTQt4Importer>( "kdevqt4importer" ) )
 
-KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& )
-    : KDevPCSImporter( parent, name )
+KDevTQt4Importer::KDevTQt4Importer( TQObject * tqparent, const char * name, const TQStringList& )
+    : KDevPCSImporter( tqparent, name )
 {
     m_qtfile = 0;
 }
 
-KDevQt4Importer::~KDevQt4Importer()
+KDevTQt4Importer::~KDevTQt4Importer()
 {
     if (m_qtfile)
         delete m_qtfile;
@@ -38,7 +38,7 @@ KDevQt4Importer::~KDevQt4Importer()
     m_qtfile = 0;
 }
 
-TQStringList KDevQt4Importer::fileList()
+TQStringList KDevTQt4Importer::fileList()
 {
     if( !m_settings )
         return TQStringList();
@@ -49,18 +49,18 @@ TQStringList KDevQt4Importer::fileList()
     KTempFile ifile;
     TQTextStream &is = *ifile.textStream();
 
-		is << "#include <QtCore/qobjectdefs.h>\n"
-		   << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals"
-		   << "#define Q_SLOTS slots\n"
-			 << "#define Q_SIGNALS signals\n"
-			 << "#include <QtCore/QtCore>\n"
-       << "#include <QtGui/QtGui>\n"
-       << "#include <QtNetwork/QtNetwork>\n"
-       << "#include <QtXml/QtXml>\n"
-       << "#include <Qt3Support/Qt3Support>\n"
-       << "#include <QtSql/QtSql>\n"
-       << "#include <QtTest/QtTest>\n"
-			 << "#include <QtOpenGL/QtOpenGL>\n";
+		is << "#include <TQtCore/tqobjectdefs.h>\n"
+		   << "#undef slots\n#undef signals\n#undef slots\n#undef signals"
+		   << "#define slots slots\n"
+			 << "#define signals signals\n"
+			 << "#include <TQtCore/TQtCore>\n"
+       << "#include <TQtGui/TQtGui>\n"
+       << "#include <TQtNetwork/TQtNetwork>\n"
+       << "#include <TQtXml/TQtXml>\n"
+       << "#include <TQt3Support/TQt3Support>\n"
+       << "#include <TQtSql/TQtSql>\n"
+       << "#include <TQtTest/TQtTest>\n"
+			 << "#include <TQtOpenGL/TQtOpenGL>\n";
 			
 
 
@@ -86,22 +86,22 @@ TQStringList KDevQt4Importer::fileList()
     return m_qtfile->name();
 }
 
-TQStringList KDevQt4Importer::includePaths()
+TQStringList KDevTQt4Importer::includePaths()
 {
     if( !m_settings || !m_qtfile)
         return TQStringList();
 
     TQStringList includePaths;
     includePaths.push_back( m_settings->qtDir() );
-    includePaths.push_back( m_settings->qtDir() + "/Qt" );
+    includePaths.push_back( m_settings->qtDir() + "/TQt" );
 
     /// @todo add mkspec
     return includePaths;
 }
 
-TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevTQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name )
 {
-    m_settings = new SettingsDialog( parent, name );
+    m_settings = new SettingsDialog( tqparent, name );
     return m_settings;
 }
 
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index c430db19..5a365bf6 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVQTIMPORTER_H
-#define KDEVQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
 #include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
@@ -18,18 +18,19 @@
 class SettingsDialog;
 class KTempFile;
 
-class KDevQt4Importer : public KDevPCSImporter
+class KDevTQt4Importer : public KDevPCSImporter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevQt4Importer();
+    KDevTQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevTQt4Importer();
 
-    virtual TQString dbName() const { return TQString::fromLatin1("Qt4"); }
+    virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 
 private:
     TQGuardedPtr<SettingsDialog> m_settings;
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index 755b14c4..1b8e46f2 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -27,20 +27,20 @@
 
 #include "settingsdialog.h"
 
-TQListBoxItem* QListBox_selectedItem(TQListBox* cpQListBox)
+TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox)
 {
-    if ( cpQListBox->selectionMode() != TQListBox::Single )
+    if ( cpTQListBox->selectionMode() != TQListBox::Single )
     return 0;
-    if ( cpQListBox->isSelected( cpQListBox->currentItem() ) )
-    return  cpQListBox->item(cpQListBox->currentItem());
+    if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) )
+    return  cpTQListBox->item(cpTQListBox->currentItem());
     return 0;
 }
 
-SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl)
-    : SettingsDialogBase(parent,name,fl)
+SettingsDialog::SettingsDialog(TQWidget* tqparent, const char* name, WFlags fl)
+    : SettingsDialogBase(tqparent,name,fl)
 {
     TQStringList qtdirs;
-	qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") );
+	qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") );
 	qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" );
 	qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" );
 	qtdirs.push_back( "/usr/qt/4/include" );
@@ -48,8 +48,8 @@ SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl)
     for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it )
     {
         TQString qtdir = *it;
-        if( !qtdir.isEmpty() && isValidQtDir(qtdir) )
-            if (!qtListBox->findItem(qtdir, ExactMatch))
+        if( !qtdir.isEmpty() && isValidTQtDir(qtdir) )
+            if (!qtListBox->tqfindItem(qtdir, ExactMatch))
                 qtListBox->insertItem( qtdir );
     }
 
@@ -74,9 +74,9 @@ void SettingsDialog::slotSelectionChanged(TQListBoxItem* item)
     emit enabled( true );
 }
 
-bool SettingsDialog::isValidQtDir( const TQString & path ) const
+bool SettingsDialog::isValidTQtDir( const TQString & path ) const
 {
-    return TQFile::exists( path + "/QtCore/QtCore" );
+    return TQFile::exists( path + "/TQtCore/TQtCore" );
 }
 
 TQString SettingsDialog::qtDir( ) const
@@ -93,10 +93,10 @@ void SettingsDialog::addUrlButton_clicked( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
-	if ( isValidQtDir( qtUrl->url() ) )
+	if ( isValidTQtDir( qtUrl->url() ) )
 	{
 		qtListBox->insertItem( qtUrl->url() );
-		if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) )
+		if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) )
 		{
 			qtListBox->setSelected( item, true );
 		}
@@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( )
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("This does not appear to be a valid Qt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
+		KMessageBox::error( this, i18n("This does not appear to be a valid TQt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
 	}
 }
 
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
index 118564fb..9a28b2ad 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
@@ -17,13 +17,14 @@
 class SettingsDialog : public SettingsDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~SettingsDialog();
   /*$PUBLIC_FUNCTIONS$*/
 
-  bool isValidQtDir( const TQString& path ) const;
+  bool isValidTQtDir( const TQString& path ) const;
 
   TQString qtDir() const;
   TQString configuration() const;
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
index f655e4f9..d3314b40 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SettingsDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsDialogBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -25,7 +25,7 @@
 Only the selected entry will be used</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>addUrlButton</cstring>
             </property>
@@ -58,18 +58,18 @@ Only the selected entry will be used</string>
 <connections>
     <connection>
         <sender>qtListBox</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>SettingsDialogBase</receiver>
-        <slot>slotSelectionChanged(QListBoxItem*)</slot>
+        <slot>slotSelectionChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<slots>
-    <slot>slotSelectionChanged(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot>slotSelectionChanged(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
index 62eb38fd..25937879 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
@@ -18,16 +18,16 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevTQtImporter>( "kdevqtimporter" ) )
 
-KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& )
-		: KDevPCSImporter( parent, name )
+KDevTQtImporter::KDevTQtImporter( TQObject * tqparent, const char * name, const TQStringList& )
+		: KDevPCSImporter( tqparent, name )
 {}
 
-KDevQtImporter::~KDevQtImporter()
+KDevTQtImporter::~KDevTQtImporter()
 {}
 
-TQStringList KDevQtImporter::fileList()
+TQStringList KDevTQtImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -50,7 +50,7 @@ TQStringList KDevQtImporter::fileList()
 	return fileList;
 }
 
-TQStringList KDevQtImporter::includePaths()
+TQStringList KDevTQtImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -64,9 +64,9 @@ TQStringList KDevQtImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevTQtImporter::createSettingsPage( TQWidget * tqparent, const char * name )
 {
-	m_settings = new SettingsDialog( parent, name );
+	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
 }
 
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index 3ae35b96..744a4b67 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -9,26 +9,27 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVQTIMPORTER_H
-#define KDEVQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
 #include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class KDevQtImporter : public KDevPCSImporter
+class KDevTQtImporter : public KDevPCSImporter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevQtImporter();
+    KDevTQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevTQtImporter();
 
-    virtual TQString dbName() const { return TQString::fromLatin1("Qt"); }
+    virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 
 private:
     TQGuardedPtr<SettingsDialog> m_settings;
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 2df475b7..a03ac0d4 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -27,20 +27,20 @@
 
 #include "settingsdialog.h"
 
-TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox )
+TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox )
 {
-	if ( cpQListBox->selectionMode() != TQListBox::Single )
+	if ( cpTQListBox->selectionMode() != TQListBox::Single )
 		return 0;
-	if ( cpQListBox->isSelected( cpQListBox->currentItem() ) )
-		return cpQListBox->item( cpQListBox->currentItem() );
+	if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) )
+		return cpTQListBox->item( cpTQListBox->currentItem() );
 	return 0;
 }
 
-SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
-		: SettingsDialogBase( parent, name, fl )
+SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl )
+		: SettingsDialogBase( tqparent, name, fl )
 {
 	TQStringList qtdirs;
-	qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") );
+	qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") );
 	qtdirs.push_back( "/usr/lib/qt3/include" );
 	qtdirs.push_back( "/usr/lib/qt/include" );
 	qtdirs.push_back( "/usr/share/qt3/include" );
@@ -49,8 +49,8 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 	for ( TQStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it )
 	{
 		TQString qtdir = *it;
-		if ( !qtdir.isEmpty() && isValidQtDir( qtdir ) )
-			if ( !qtListBox->findItem( qtdir, ExactMatch ) )
+		if ( !qtdir.isEmpty() && isValidTQtDir( qtdir ) )
+			if ( !qtListBox->tqfindItem( qtdir, ExactMatch ) )
 				qtListBox->insertItem( qtdir );
 	}
 
@@ -71,9 +71,9 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* )
 	}
 
 	TQDir dir( qtDir() );
-	TQStringList qconfigFileList = dir.entryList( "qconfig-*.h" );
+	TQStringList qconfigFileList = dir.entryList( "tqconfig-*.h" );
 	qtConfiguration->clear();
-	TQRegExp rx( "qconfig-(\\w+)\\.h" );
+	TQRegExp rx( "tqconfig-(\\w+)\\.h" );
 	for ( TQStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it )
 	{
 		( void ) rx.exactMatch( *it );
@@ -83,7 +83,7 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* )
 	emit enabled( true );
 }
 
-bool SettingsDialog::isValidQtDir( const TQString & path ) const
+bool SettingsDialog::isValidTQtDir( const TQString & path ) const
 {
 	return TQFile::exists( path + "/tqt.h" );
 }
@@ -101,10 +101,10 @@ void SettingsDialog::addUrlButton_clicked( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
-	if ( isValidQtDir( qtUrl->url() ) )
+	if ( isValidTQtDir( qtUrl->url() ) )
 	{
 		qtListBox->insertItem( qtUrl->url() );
-		if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) )
+		if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) )
 		{
 			qtListBox->setSelected( item, true );
 		}
@@ -112,7 +112,7 @@ void SettingsDialog::addUrlButton_clicked( )
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("This does not appear to be a valid Qt3 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
+		KMessageBox::error( this, i18n("This does not appear to be a valid TQt3 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
 	}
 
 }
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
index 118564fb..9a28b2ad 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
@@ -17,13 +17,14 @@
 class SettingsDialog : public SettingsDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~SettingsDialog();
   /*$PUBLIC_FUNCTIONS$*/
 
-  bool isValidQtDir( const TQString& path ) const;
+  bool isValidTQtDir( const TQString& path ) const;
 
   TQString qtDir() const;
   TQString configuration() const;
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index fa485d57..fc28b901 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SettingsDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsDialogBase</cstring>
     </property>
@@ -26,22 +26,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>161</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -75,7 +75,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
+        <widget class="TQPushButton" row="2" column="2">
             <property name="name">
                 <cstring>addUrlButton</cstring>
             </property>
@@ -96,7 +96,7 @@
                 <cstring>qtUrl</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -117,18 +117,18 @@ Only the selected entry will be used</string>
 <connections>
     <connection>
         <sender>qtListBox</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>SettingsDialogBase</receiver>
-        <slot>slotSelectionChanged(QListBoxItem*)</slot>
+        <slot>slotSelectionChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<slots>
-    <slot>slotSelectionChanged(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot>slotSelectionChanged(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index c7a8e9b6..32c078e1 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -57,14 +57,14 @@
 class ProblemItem: public KListViewItem
 {
 public:
-	ProblemItem( TQListView* parent, const TQString& problem,
+	ProblemItem( TQListView* tqparent, const TQString& problem,
 	             const TQString& file, const TQString& line, const TQString& column )
-			: KListViewItem( parent, problem, file, line, column )
+			: KListViewItem( tqparent, problem, file, line, column )
 	{}
 
-	ProblemItem( TQListViewItem* parent, const TQString& problem,
+	ProblemItem( TQListViewItem* tqparent, const TQString& problem,
 	             const TQString& file, const TQString& line, const TQString& column )
-			: KListViewItem( parent, problem, file, line, column )
+			: KListViewItem( tqparent, problem, file, line, column )
 	{}
 
 	int compare( TQListViewItem* item, int column, bool ascending ) const
@@ -82,8 +82,8 @@ public:
 
 };
 
-ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* parent, const char* name )
-: TQWidget( parent, name ? name : "problemreporter" ),
+ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* tqparent, const char* name )
+: TQWidget( tqparent, name ? name : "problemreporter" ),
 m_cppSupport( part ),
 // m_document( 0 ),
 m_markIface( 0 )
@@ -142,8 +142,8 @@ m_markIface( 0 )
 
 	m_gridLayout->addWidget(m_tabBar,0,0);
 	m_gridLayout->addMultiCellWidget(m_widgetStack,1,1,0,2);
-	m_gridLayout->addWidget(m_filterLabel,0,1,Qt::AlignRight);
-	m_gridLayout->addWidget(m_filterEdit,0,2,Qt::AlignLeft);
+	m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight);
+	m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft);
 
 	connect( m_filterEdit, TQT_SIGNAL(returnPressed()),
 	         this, TQT_SLOT(slotFilter()) );
@@ -175,7 +175,7 @@ void ProblemReporter::slotFilter()
 	if(!m_tabBar->isTabEnabled(5))
 		m_tabBar->setTabEnabled(5,true);
 
-	m_tabBar->tab(5)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() ));
+	m_tabBar->tab(5)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() ));
 	m_tabBar->setCurrentTab(5);
 
 	m_filteredList->clear();
@@ -198,7 +198,7 @@ void ProblemReporter::filterList(KListView* listview, const TQString& level)
 	TQListViewItemIterator it( listview );
 	while ( it.current() )
 	{
-		if ( it.current()->text(3).contains(m_filterEdit->text(),false))
+		if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false))
 		{
 			new KListViewItem(m_filteredList,level,
 			                  it.current()->text(0), it.current()->text(1),
@@ -356,7 +356,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p
 		m_markIface->addMark( p.line(), markType );
 
 	TQString msg = p.text();
-	msg = msg.replace( TQRegExp("\n"), "" );
+	msg = msg.tqreplace( TQRegExp("\n"), "" );
 
 	TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName);
 
@@ -416,7 +416,7 @@ TQString ProblemReporter::levelToString( int level ) const
 	case Problem::Level_Fixme:
 		return TQString( i18n("Fixme") );
 	default:
-		return TQString::null;
+		return TQString();
 	}
 }
 
diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h
index fc25523e..c2abb294 100644
--- a/languages/cpp/problemreporter.h
+++ b/languages/cpp/problemreporter.h
@@ -102,11 +102,12 @@ namespace KTextEditor
 	class Document;
 }
 
-class ProblemReporter: public QWidget
+class ProblemReporter: public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 );
+	ProblemReporter( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 );
 	virtual ~ProblemReporter();
 
 	void removeAllProblems( const TQString& filename );
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index 46fa7897..21717dd2 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -25,19 +25,19 @@
 
 #include <stdlib.h>
 
-const TQString QtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" );
+const TQString TQtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" );
 
-QtBuildConfig::QtBuildConfig( CppSupportPart * part, TQDomDocument* dom )
+TQtBuildConfig::TQtBuildConfig( CppSupportPart * part, TQDomDocument* dom )
 	: TQObject( part ), m_part( part ), m_dom( dom )
 {
 	init();
 }
 
-QtBuildConfig::~QtBuildConfig()
+TQtBuildConfig::~TQtBuildConfig()
 {
 }
 
-void QtBuildConfig::init( )
+void TQtBuildConfig::init( )
 {
 	m_used = DomUtil::readBoolEntry( *m_dom, m_configRoot + "/used", false );
 	m_version = DomUtil::readIntEntry( *m_dom, m_configRoot + "/version", 3 );
@@ -55,9 +55,9 @@ void QtBuildConfig::init( )
     m_designerPath = DomUtil::readEntry(*m_dom, m_configRoot + "/designer", "");
     m_designerPluginPaths = DomUtil::readListEntry(*m_dom, m_configRoot + "/designerpluginpaths", "path" );
 
-    if( m_root.isEmpty() || !isValidQtDir( m_root ) )
+    if( m_root.isEmpty() || !isValidTQtDir( m_root ) )
     {
-        findQtDir();
+        findTQtDir();
     }
     if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) )
     {
@@ -83,7 +83,7 @@ void QtBuildConfig::init( )
 	}
 }
 
-bool QtBuildConfig::isValidQtDir( const TQString& path ) const
+bool TQtBuildConfig::isValidTQtDir( const TQString& path ) const
 {
     TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+
                    "include"+TQString( TQChar( TQDir::separator() ) )+
@@ -91,30 +91,30 @@ bool QtBuildConfig::isValidQtDir( const TQString& path ) const
     return ( m_version == 4 || ( m_version != 4 && inc.exists() ) );
 }
 
-void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const
+void TQtBuildConfig::buildBinDirs( TQStringList & dirs ) const
 {
     if( m_version == 3 )
     {
         if( !m_root.isEmpty() )
             dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin");
-        dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin");
+        dirs << (::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin");
     }
     TQStringList paths = TQStringList::split(":",::getenv("PATH"));
     dirs += paths;
     TQString binpath = TQDir::rootDirPath() + "bin";
-    if( dirs.findIndex( binpath ) != -1 )
+    if( dirs.tqfindIndex( binpath ) != -1 )
         dirs << binpath;
 
     binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin";
-    if( dirs.findIndex( binpath ) != -1 )
+    if( dirs.tqfindIndex( binpath ) != -1 )
         dirs << binpath;
     binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin";
-    if( dirs.findIndex( binpath ) != -1 )
+    if( dirs.tqfindIndex( binpath ) != -1 )
         dirs << binpath;
 }
 
 
-TQString QtBuildConfig::findExecutable( const TQString& execname ) const
+TQString TQtBuildConfig::findExecutable( const TQString& execname ) const
 {
     TQStringList dirs;
     buildBinDirs( dirs );
@@ -130,27 +130,27 @@ TQString QtBuildConfig::findExecutable( const TQString& execname ) const
     return "";
 }
 
-bool QtBuildConfig::isExecutable( const TQString& path ) const
+bool TQtBuildConfig::isExecutable( const TQString& path ) const
 {
     TQFileInfo fi(path);
     return( fi.exists() && fi.isExecutable() );
 }
 
-void QtBuildConfig::findQtDir()
+void TQtBuildConfig::findTQtDir()
 {
     TQStringList qtdirs;
     if( m_version == 3 )
-        qtdirs.push_back( ::getenv("QTDIR") );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
+        qtdirs.push_back( ::getenv("TQTDIR") );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( m_version ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr" );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );
 
     for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it )
     {
         TQString qtdir = *it;
-        if( !qtdir.isEmpty() && isValidQtDir(qtdir) )
+        if( !qtdir.isEmpty() && isValidTQtDir(qtdir) )
         {
             m_root = qtdir;
             return;
@@ -158,7 +158,7 @@ void QtBuildConfig::findQtDir()
     }
 }
 
-void QtBuildConfig::store( )
+void TQtBuildConfig::store( )
 {
 	DomUtil::writeBoolEntry( *m_dom, m_configRoot + "/used", m_used );
 	DomUtil::writeIntEntry( *m_dom, m_configRoot + "/version", m_version );
@@ -172,45 +172,45 @@ void QtBuildConfig::store( )
 	emit stored();
 }
 
-void QtBuildConfig::setUsed( bool used )
+void TQtBuildConfig::setUsed( bool used )
 {
 	m_used = used;
 }
 
-void QtBuildConfig::setVersion( int version )
+void TQtBuildConfig::setVersion( int version )
 {
 	m_version = version;
 }
 
-void QtBuildConfig::setIncludeStyle( int style )
+void TQtBuildConfig::setIncludeStyle( int style )
 {
 	m_includeStyle = style;
 }
 
-void QtBuildConfig::setRoot( const TQString& root )
+void TQtBuildConfig::setRoot( const TQString& root )
 {
 	m_root = root;
 }
 
-void QtBuildConfig::setQMakePath( const TQString& path )
+void TQtBuildConfig::setTQMakePath( const TQString& path )
 {
     m_qmakePath = path;
 }
 
-void QtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx )
+void TQtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx )
 {
     m_designerPluginPaths = pfx;
 }
 
-void QtBuildConfig::setDesignerPath( const TQString& path )
+void TQtBuildConfig::setDesignerPath( const TQString& path )
 {
     m_designerPath = path;
 }
 
-void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration )
+void TQtBuildConfig::setDesignerIntegration( const TQString& designerIntegration )
 {
 	m_designerIntegration = designerIntegration;
 }
 #include "qtbuildconfig.moc"
 
-//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h
index 193f582d..df92869b 100644
--- a/languages/cpp/qtbuildconfig.h
+++ b/languages/cpp/qtbuildconfig.h
@@ -15,8 +15,8 @@
 	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 	Boston, MA 02110-1301, USA.
 */
-#ifndef QTBUILDCONFIG_H
-#define QTBUILDCONFIG_H
+#ifndef TQTBUILDCONFIG_H
+#define TQTBUILDCONFIG_H
 
 #include <tqobject.h>
 #include <tqstringlist.h>
@@ -25,17 +25,18 @@ class CppSupportPart;
 class TQDomDocument;
 
 /**
-	@brief The QtBuildConfig class stores all parameters related to the used Qt library
+	@brief The TQtBuildConfig class stores all parameters related to the used TQt library
 
 	@author Tobias Erbsland <te@profzone.ch>
 */
-class QtBuildConfig : public QObject
+class TQtBuildConfig : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	QtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
-	virtual ~QtBuildConfig();
+	TQtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
+	virtual ~TQtBuildConfig();
 
 	inline bool isUsed() const { return m_used; }
 	inline int version() const { return m_version; }
@@ -52,7 +53,7 @@ public:
 	void setRoot( const TQString& root );
     void setDesignerPath( const TQString& path );
     void setDesignerPluginPaths( const TQStringList& pfx );
-    void setQMakePath( const TQString& path );
+    void setTQMakePath( const TQString& path );
 	void setDesignerIntegration( const TQString& designerIntegration );
 	void init();
 
@@ -64,8 +65,8 @@ signals:
 
 private:
 
-    bool isValidQtDir( const TQString& ) const;
-    void findQtDir();
+    bool isValidTQtDir( const TQString& ) const;
+    void findTQtDir();
     TQString findExecutable( const TQString& ) const;
     void buildBinDirs( TQStringList& ) const;
     bool isExecutable( const TQString& ) const;
@@ -76,9 +77,9 @@ private:
 	bool m_used; ///< Flag if qt is used in this project.
 	int m_version; ///< The major version of the qt library (3 or 4)
 	int m_includeStyle; ///< The type of include style used (qt 3 or 4)
-	TQString m_root; ///< The root directory of the used qt installation for Qt3
-    TQString m_designerPath; ///< The path including the binary name of Qt Designer
-    TQString m_qmakePath; ///< The path including the binary name of QMake
+	TQString m_root; ///< The root directory of the used qt installation for TQt3
+    TQString m_designerPath; ///< The path including the binary name of TQt Designer
+    TQString m_qmakePath; ///< The path including the binary name of TQMake
     TQStringList m_designerPluginPaths; ///< The Prefix for Designer
 	TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer
 
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 9314aceb..83354fa8 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -40,12 +40,12 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part,
+TQtDesignerCppIntegration::TQtDesignerCppIntegration( KDevLanguageSupport *part,
 	                                                ImplementationWidget *impl )
-: QtDesignerIntegration( part, impl, true, 0 )
+: TQtDesignerIntegration( part, impl, true, 0 )
 {}
 
-void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass )
+void TQtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass )
 {
 	m_part->partController() ->editDocument( KURL( klass->fileName() ) );
 	KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController() ->activePart() );
@@ -60,7 +60,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	klass->getEndPosition( &line, &column );
 
 	// compute the insertion point map
-	TQMap<TQString, QPair<int, int> > points;
+	TQMap<TQString, TQPair<int, int> > points;
 
 	const FunctionList functionList = klass->functionList();
 	for ( FunctionList::ConstIterator it = functionList.begin(); it != functionList.end(); ++it )
@@ -68,9 +68,9 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 		int funEndLine, funEndColumn;
 		( *it ) ->getEndPosition( &funEndLine, &funEndColumn );
 		TQString access = accessID( *it );
-		QPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn );
+		TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn );
 
-		if ( !points.contains( access ) || points[ access ] < funEndPoint )
+		if ( !points.tqcontains( access ) || points[ access ] < funEndPoint )
 		{
 			points[ access ] = funEndPoint;
 		}
@@ -78,7 +78,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 
 	int insertedLine = 0;
 
-	TQString access = function.access + ( function.type == KInterfaceDesigner::ftQtSlot ? " slots" : "" );
+	TQString access = function.access + ( function.type == KInterfaceDesigner::ftTQtSlot ? " slots" : "" );
 
 	TQString str = function.returnType + " " + function.function;
 	if ( function.specifier == "virtual" )
@@ -90,20 +90,20 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	str += ";\n";
 	str = "    " + str;
 
-	QPair<int, int> pt;
-	if ( points.contains( access ) )
+	TQPair<int, int> pt;
+	if ( points.tqcontains( access ) )
 	{
 		pt = points[ access ];
 	}
 	else
 	{
 		str.prepend( access + ":\n" );
-		points[ access ] = qMakePair( line - 1, 0 );
+		points[ access ] = tqMakePair( line - 1, 0 );
 		pt = points[ access ]; // end of class declaration
 	}
 
 	editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str );
-	insertedLine += str.contains( TQChar( '\n' ) );
+	insertedLine += str.tqcontains( TQChar( '\n' ) );
 
 	CppSupportPart *cppPart = dynamic_cast<CppSupportPart *>( m_part );
 	cppPart->backgroundParser() ->addFile( klass->fileName() );
@@ -121,7 +121,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 
 	TQFileInfo fi( klass->fileName() );
 	TQString implementationFile = fi.absFilePath();
-	implementationFile.replace( ".h", ".cpp" );
+	implementationFile.tqreplace( ".h", ".cpp" );
 	
 	TQFileInfo fileInfo( implementationFile );
 	if ( !TQFile::exists( fileInfo.absFilePath() ) )
@@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 			}
 			else
 			{
-				if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.moc.*" ) ) )
+				if ( editIface->textLine( line ).tqcontains( TQRegExp( ".*#include .*\\.tqmoc.*" ) ) )
 					atLine = line;
 				break;
 			}
@@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 		atColumn = 0;
 	}
 	
-	//    editIface->insertLine( atLine + 1, TQString::fromLatin1("") );
+	//    editIface->insertLine( atLine + 1, TQString::tqfromLatin1("") );
 	kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl;
 	kdDebug() << "text: " << stri << endl;
 	editIface->insertText( atLine, atColumn, stri );
@@ -182,35 +182,35 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	cppPart->backgroundParser() ->addFile( implementationFile );
 }
 
-TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const
+TQString TQtDesignerCppIntegration::accessID( FunctionDom fun ) const
 {
 	if ( fun->isSignal() )
-		return TQString::fromLatin1( "signals" );
+		return TQString::tqfromLatin1( "signals" );
 
 	switch ( fun->access() )
 	{
 	case CodeModelItem::Public:
 		if ( fun->isSlot() )
-			return TQString::fromLatin1( "public slots" );
-		return TQString::fromLatin1( "public" );
+			return TQString::tqfromLatin1( "public slots" );
+		return TQString::tqfromLatin1( "public" );
 
 	case CodeModelItem::Protected:
 		if ( fun->isSlot() )
-			return TQString::fromLatin1( "protected slots" );
-		return TQString::fromLatin1( "protected" );
+			return TQString::tqfromLatin1( "protected slots" );
+		return TQString::tqfromLatin1( "protected" );
 
 	case CodeModelItem::Private:
 		if ( fun->isSlot() )
-			return TQString::fromLatin1( "private slots" );
-		return TQString::fromLatin1( "private" );
+			return TQString::tqfromLatin1( "private slots" );
+		return TQString::tqfromLatin1( "private" );
 	}
 
-	return TQString::null;
+	return TQString();
 }
 
-void QtDesignerCppIntegration::processImplementationName( TQString &name )
+void TQtDesignerCppIntegration::processImplementationName( TQString &name )
 {
-	name.replace( ".h", ".cpp" );
+	name.tqreplace( ".h", ".cpp" );
 }
 
 #include "qtdesignercppintegration.moc"
diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h
index 6721c9df..5fd95b58 100644
--- a/languages/cpp/qtdesignercppintegration.h
+++ b/languages/cpp/qtdesignercppintegration.h
@@ -17,16 +17,17 @@
 *   Free Software Foundation, Inc.,                                       *
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/
-#ifndef QTDESIGNERCPPINTEGRATION_H
-#define QTDESIGNERCPPINTEGRATION_H
+#ifndef TQTDESIGNERCPPINTEGRATION_H
+#define TQTDESIGNERCPPINTEGRATION_H
 
 #include <qtdesignerintegration.h>
 
-class QtDesignerCppIntegration : public QtDesignerIntegration
+class TQtDesignerCppIntegration : public TQtDesignerIntegration
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
+	TQtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
 
 protected:
 	virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass );
diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp
index 225bfc84..3d23f76c 100644
--- a/languages/cpp/simplecontext.cpp
+++ b/languages/cpp/simplecontext.cpp
@@ -27,7 +27,7 @@ SimpleType getGlobal( SimpleType t ) {
   SafetyCounter s( 50 );
   while( !global.scope().isEmpty() && s ) {
     if( !s ) { kdDebug( 9007 ) << "error" << endl; break; }
-    global = global->parent();
+    global = global->tqparent();
   }
 	if(  !global.scope().isEmpty() ) {kdDebug( 9007 ) << "ERROR WITH GLOBAL SCOPE" << endl; return SimpleType(); }
   return global;
diff --git a/languages/cpp/simplecontext.h b/languages/cpp/simplecontext.h
index d1fde70a..a0075554 100644
--- a/languages/cpp/simplecontext.h
+++ b/languages/cpp/simplecontext.h
@@ -134,12 +134,12 @@ class SimpleContext
     }
 
     //First the new name, aka "" for real imports, second the name to be imported
-    void addImport( const QPair<TQString, TQString>& import ) {
+    void addImport( const TQPair<TQString, TQString>& import ) {
       m_imports << import;
     }
 
     //Key the new name, aka "" for real imports, second the name to be imported
-    TQValueList<QPair<TQString, TQString> > imports() {
+    TQValueList<TQPair<TQString, TQString> > imports() {
       return m_imports;
     }
   
@@ -162,7 +162,7 @@ class SimpleContext
 
   private:
     TQValueList<SimpleVariable> m_vars;
-    TQValueList<QPair<TQString, TQString> > m_imports;
+    TQValueList<TQPair<TQString, TQString> > m_imports;
     SimpleContext* m_prev;
     SimpleType m_container;
 };
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index 5111a2a0..b496b96a 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -39,15 +39,15 @@ BuiltinTypes::BuiltinTypes() {
 }
 
 bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) {
-  return m_types.find( desc.name() ) != m_types.end();
+  return m_types.tqfind( desc.name() ) != m_types.end();
 }
 
 TQString BuiltinTypes::comment( const TypeDesc& desc ) {
-  TQMap<TQString, TQString>::iterator it = m_types.find( desc.name() );
+  TQMap<TQString, TQString>::iterator it = m_types.tqfind( desc.name() );
   if( it != m_types.end() ) {
     return *it;
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -301,7 +301,7 @@ TQString SimpleTypeImpl::operatorToString( Operator op ) {
     case ParenOp:
     return "paren-operator";
     default:
-    return TQString( "%1" ).arg( ( long ) op );
+    return TQString( "%1" ).tqarg( ( long ) op );
   };
 }
 
@@ -428,7 +428,7 @@ class TemplateParamMatch {
 			for( int a = 0; a < m_candidateParams.count(); a++ ) {
 				SimpleTypeImpl::TemplateParamInfo::TemplateParam t;
 				if( m_candidateParams.getParam( t, a ) ) {
-					if( !m_hadParameters.contains( t.name ) ) {
+					if( !m_hadParameters.tqcontains( t.name ) ) {
 						m_matched = false;
 					}
 				} else {
@@ -472,7 +472,7 @@ class TemplateParamMatch {
 					
 					t.value = val;
 					
-					if( m_hadParameters.contains( t.name ) && oldValue != t.value ) {
+					if( m_hadParameters.tqcontains( t.name ) && oldValue != t.value ) {
 						return false; ///We have a mismatch, two different values for the same template-parameter.
 					} else {
 						m_candidateParams.addParam( t );
@@ -793,9 +793,9 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
     }
   }
 
-  ///Ask parentsc
+  ///Ask tqparentsc
   if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) {
-    LocateResult rett = parent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode );
+    LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode );
     if ( rett->resolved() )
       return rett.increaseDepth();
     else
@@ -803,7 +803,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
         ret = rett.increaseDepth();
   }
 
-  ///Ask the bases and allow them to search in their parents.
+  ///Ask the bases and allow them to search in their tqparents.
   if ( ! ( mode & ExcludeBases ) ) {
     TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration
     TQValueList<LocateResult> bases = getBases();
@@ -832,7 +832,7 @@ void SimpleTypeImpl::breakReferences() {
   m_desc.resetResolved();
   //	m_trace.clear();
   m_masterProxy = 0;
-  invalidateCache();
+  tqinvalidateCache();
 }
 
 TypePointer SimpleTypeImpl::bigContainer() {
@@ -842,26 +842,26 @@ TypePointer SimpleTypeImpl::bigContainer() {
     return TypePointer( this );
 }
 
-SimpleType SimpleTypeImpl::parent() {
+SimpleType SimpleTypeImpl::tqparent() {
   if ( m_parent ) {
-    //ifVerbose( dbg() << "\"" << str() << "\": returning parent" << endl;
+    //ifVerbose( dbg() << "\"" << str() << "\": returning tqparent" << endl;
     return SimpleType( m_parent );
   } else {
-    ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl );
-    invalidateSecondaryCache();
+    ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl );
+    tqinvalidateSecondaryCache();
     TQStringList sc = scope();
 
     if ( !sc.isEmpty() ) {
       sc.pop_back();
       SimpleType r = SimpleType( sc, m_desc.includeFiles() );
       if ( &( *r.get() ) == this ) {
-        kdDebug( 9007 ) << "error: self set as parent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl;
+        kdDebug( 9007 ) << "error: self set as tqparent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl;
         return SimpleType( new SimpleTypeImpl( "" ) );
       }
       m_parent = r.get();
       return r;
     } else {
-      ifVerbose( dbg() << "\"" << str() << "\"warning: returning parent of global scope!" << endl );
+      ifVerbose( dbg() << "\"" << str() << "\"warning: returning tqparent of global scope!" << endl );
       return SimpleType( new SimpleTypeImpl( "" ) );
     }
   }
@@ -876,7 +876,7 @@ const TypeDesc& SimpleTypeImpl::desc() {
 
 TypeDesc& SimpleTypeImpl::descForEdit() {
   desc();
-  invalidateCache();
+  tqinvalidateCache();
   return m_desc;
 }
 
@@ -934,15 +934,15 @@ TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) {
 
 TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) {
   Q_UNUSED( depth );
-  if ( !m_scope.isEmpty() && parent() ) {
-    return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved();
+  if ( !m_scope.isEmpty() && tqparent() ) {
+    return tqparent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved();
   } else {
     return fullTypeResolved();
   }
 }
 
 void SimpleTypeImpl::checkTemplateParams () {
-  invalidateCache();
+  tqinvalidateCache();
   if ( ! m_scope.isEmpty() ) {
     TQString str = m_scope.back();
     m_desc = str;
@@ -956,7 +956,7 @@ void SimpleTypeImpl::checkTemplateParams () {
 }
 
 void SimpleTypeImpl::setScope( const TQStringList& scope ) {
-  invalidateCache();
+  tqinvalidateCache();
   m_scope = scope;
   if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) {
     //kdDebug() << "bad scope set " << kdBacktrace() << endl;
@@ -965,8 +965,8 @@ void SimpleTypeImpl::setScope( const TQStringList& scope ) {
 }
 
 SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) {
-  TQValueList<LocateResult> parents = getBases();
-  for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) {
+  TQValueList<LocateResult> tqparents = getBases();
+  for ( TQValueList<LocateResult>::iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
     if ( !( *it ) ->resolved() )
       continue;
     TypeOfResult type = ( *it ) ->resolved() ->typeOf( name );
@@ -985,20 +985,20 @@ void SimpleTypeImpl::setSlaveParent( SimpleTypeImpl& slave ) {
 }
 
 void SimpleTypeImpl::parseParams( TypeDesc desc ) {
-  invalidateCache();
+  tqinvalidateCache();
   m_desc = desc;
   m_desc.clearInstanceInfo();
 }
 
 void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) {
-  invalidateCache();
+  tqinvalidateCache();
   m_desc.templateParams() = desc.templateParams();
 }
 
 //SimpleTypeImpl::TemplateParamInfo implementation
 
 bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const {
-  TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.find( name );
+  TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.tqfind( name );
   if ( it != m_paramsByName.end() ) {
     target = *it;
     return true;
@@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQStrin
 }
 
 bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const {
-  TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number );
+  TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.tqfind( number );
   if ( it != m_paramsByNumber.end() ) {
     target = *it;
     return true;
@@ -1016,7 +1016,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int num
 }
 
 void SimpleTypeImpl::TemplateParamInfo::removeParam( int number ) {
-  TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number );
+  TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.tqfind( number );
   if ( it != m_paramsByNumber.end() ) {
     m_paramsByName.remove( ( *it ).name );
     m_paramsByNumber.remove( it );
diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h
index 19fb22cc..49b01ee0 100644
--- a/languages/cpp/simpletype.h
+++ b/languages/cpp/simpletype.h
@@ -42,7 +42,7 @@ class SimpleTypeFunctionInterface;
 
 typedef KSharedPtr<SimpleTypeImpl> TypePointer;
 
-///if this is set, imported items will get their parent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff)
+///if this is set, imported items will get their tqparent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff)
 //#define PHYSICAL_IMPORT
 
 enum Repository {
@@ -214,7 +214,7 @@ class SimpleTypeConfiguration {
         SimpleType::destroyStore();
       }
     }
-    void invalidate() {
+    void tqinvalidate() {
       m_invalid = true;
     }
 };
@@ -251,7 +251,7 @@ class SimpleTypeImpl : public KShared {
 
 	///Returns the template-specialization-string for classes
 	virtual TQString specialization() const {
-		return TQString::null;
+		return TQString();
 	}
 
     class TemplateParamInfo {
@@ -322,7 +322,7 @@ class SimpleTypeImpl : public KShared {
     };
 
 
-    ///Sets the parent of the given slave to either this class, or the proxy of this class
+    ///Sets the tqparent of the given slave to either this class, or the proxy of this class
     virtual void setSlaveParent( SimpleTypeImpl& slave );
 
     void setMasterProxy( TypePointer t ) {
@@ -410,11 +410,11 @@ class SimpleTypeImpl : public KShared {
     }
 
   protected:
-    virtual void invalidateCache() {}
+    virtual void tqinvalidateCache() {}
     ;
 
     ///Secondary cache also depends on the surrounding
-    virtual void invalidateSecondaryCache() {}
+    virtual void tqinvalidateSecondaryCache() {}
 
     virtual void setSecondaryCacheActive( bool active ) {
       Q_UNUSED( active );
@@ -422,7 +422,7 @@ class SimpleTypeImpl : public KShared {
 
     ///Primary cache is the one associated only with this object. It must only be cleared
     ///when the object pointed to changes
-    virtual void invalidatePrimaryCache( bool onlyNegative = false ) {}
+    virtual void tqinvalidatePrimaryCache( bool onlyNegative = false ) {}
 
     static TQString operatorToString( Operator op );
 
@@ -480,19 +480,19 @@ class SimpleTypeImpl : public KShared {
 		return ts;
 	}
 
-    ///sets the parent-type(type this one is nested in)
-    void setParent( TypePointer parent ) {
-      if( parent == m_parent ) return;
-      invalidateSecondaryCache();
-      if ( &( *parent ) == this ) {
+    ///sets the tqparent-type(type this one is nested in)
+    void setParent( TypePointer tqparent ) {
+      if( tqparent == m_parent ) return;
+      tqinvalidateSecondaryCache();
+      if ( &( *tqparent ) == this ) {
         kdDebug( 9007 ) << "setSlaveParent error\n" << kdBacktrace() << endl;
         return ;
       }
 
-      m_parent = parent;
+      m_parent = tqparent;
     }
 
-    ///returns whether the type has template-parameters, or one of the parent-types has template-parameters.
+    ///returns whether the type has template-parameters, or one of the tqparent-types has template-parameters.
     bool usingTemplates() const {
       return !m_desc.templateParams().isEmpty() || ( m_parent && m_parent->usingTemplates() );
     }
@@ -617,7 +617,7 @@ class SimpleTypeImpl : public KShared {
       ExcludeParents = 16,
       ExcludeNestedTypes = 32,
       ExcludeNamespaces = 64,
-      ForgetModeUpwards = 128,  ///forgets everything, even NoFail, while passing control to the parent
+      ForgetModeUpwards = 128,  ///forgets everything, even NoFail, while passing control to the tqparent
       LocateBase = 4 + 8 + 32 + 64 + 128,  ///searching in the scope visible while the base-declaration of a class
       NoFail = 256,
       TraceAliases = 512,  ///Stores a copy whenever an alias is applied
@@ -718,8 +718,8 @@ class SimpleTypeImpl : public KShared {
     ///Returns either itself, or the (namespace-)proxy this type is a slave of.
     TypePointer bigContainer();
 
-    ///Returns the parent, eg. the SimpleType this one is nested in.
-    SimpleType parent();
+    ///Returns the tqparent, eg. the SimpleType this one is nested in.
+    SimpleType tqparent();
 
     ///this must be a reference, so the desc can be manipulated in-place from outside
     const TypeDesc& desc();
@@ -779,31 +779,31 @@ class SimpleTypeImpl : public KShared {
     ///Used to set the include-files that were used to find this type(needed for lazy evaluation of the base-classes)
     void setFindIncludeFiles( const IncludeFiles& files );
 
-		///Should be called within the parent-namespace/class
+		///Should be called within the tqparent-namespace/class
 	virtual void chooseSpecialization( MemberInfo& member );
 	
 };
 
 
 class TypeTrace {
-    TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> > m_trace;
+    TQValueList<TQPair< SimpleTypeImpl::MemberInfo, TypeDesc> > m_trace;
   public:
 
-    TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >& trace() {
+    TQValueList<TQPair< SimpleTypeImpl::MemberInfo, TypeDesc> >& trace() {
       return m_trace;
     };
 
     void prepend( const SimpleTypeImpl::MemberInfo& t, const TypeDesc& tail = TypeDesc() ) {
-      m_trace.push_front( QPair< SimpleTypeImpl::MemberInfo, TypeDesc>( t, tail ) );
+      m_trace.push_front( TQPair< SimpleTypeImpl::MemberInfo, TypeDesc>( t, tail ) );
     }
 
 	void prepend( const TypeTrace& trace, int indent = 0 ) {
 /*		if( indent != 0 ) {
 		TQString ind;
 			for( int a = 0; a < indent; a++ ) ind += " ";
-			for( TQValueList<QPair< SimpleTypeImpl::MemberInfo, TypeDesc> >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) {
+			for( TQValueList<TQPair< SimpleTypeImpl::MemberInfo, TypeDesc> >::const_iterator it = trace.m_trace.end(); it != trace.m_trace.begin(); ) {
 				--it;
-				QPair<SimpleTypeImpl::MemberInfo, TypeDesc> item = *it;
+				TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> item = *it;
 				item.second.prependDecoration( ind );
 				m_trace.push_front( item );
 			}
diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h
index 3f950cbf..6744d5d8 100644
--- a/languages/cpp/simpletypecachebinder.h
+++ b/languages/cpp/simpletypecachebinder.h
@@ -203,7 +203,7 @@ class SimpleTypeCacheBinder : public Base {
      }
 
 #ifdef TEST_REMAP
-     typename MemberMap::iterator it = m_memberCache.find( key );
+     typename MemberMap::iterator it = m_memberCache.tqfind( key );
      if ( it == m_memberCache.end() ) dbgMajor() << "\"" << Base::str() << "\"remap failed with \"" << name.fullNameChain() << "\"" << endl;
 #endif
 
@@ -260,7 +260,7 @@ class SimpleTypeCacheBinder : public Base {
       (*r.first).second = t;
 
 #ifdef TEST_REMAP
-     typename LocateMap::iterator it = m_locateCache.find( desc );
+     typename LocateMap::iterator it = m_locateCache.tqfind( desc );
      if ( it == m_locateCache.end() ) dbgMajor() << "\"" << Base::str() << "\"remap failed with \"" << name.fullNameChain() << "\"" << endl;
 #endif
      return t;
@@ -293,7 +293,7 @@ class SimpleTypeCacheBinder : public Base {
     return new SimpleTypeCacheBinder<Base>( this );
    }
 
-   virtual void invalidatePrimaryCache( bool  onlyNegative ) {
+   virtual void tqinvalidatePrimaryCache( bool  onlyNegative ) {
     //if( !m_memberCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" primary caches cleared" << endl;
     if ( !onlyNegative)
      m_memberCache.clear();
@@ -307,7 +307,7 @@ class SimpleTypeCacheBinder : public Base {
     }
     m_classListCache.clear();
    }
-   virtual void invalidateSecondaryCache() {
+   virtual void tqinvalidateSecondaryCache() {
     //if( !m_locateCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" secondary caches cleared" << endl;
     m_locateCache.clear();
     m_haveBasesCache = false;
@@ -322,9 +322,9 @@ class SimpleTypeCacheBinder : public Base {
     primaryActive = active;
    }
 
-   virtual void invalidateCache() {
-    invalidatePrimaryCache( false );
-    invalidateSecondaryCache();
+   virtual void tqinvalidateCache() {
+    tqinvalidatePrimaryCache( false );
+    tqinvalidateSecondaryCache();
    };
   };
 
diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp
index f662acc5..9afdea75 100644
--- a/languages/cpp/simpletypecatalog.cpp
+++ b/languages/cpp/simpletypecatalog.cpp
@@ -279,13 +279,13 @@ TQStringList SimpleTypeCatalog::getBaseStrings() {
 
  TQStringList ret;
  TQMap<TQString, bool> bases;
-// try with parentsc
+// try with tqparentsc
  TQTime t;
  t.restart();
- TQValueList<Tag> parents( getBaseClassList() );
+ TQValueList<Tag> tqparents( getBaseClassList() );
 
- TQValueList<Tag>::Iterator it = parents.begin();
- while ( it != parents.end() ) {
+ TQValueList<Tag>::Iterator it = tqparents.begin();
+ while ( it != tqparents.end() ) {
   Tag & tag = *it;
   ++it;
 
diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h
index e22a3fcf..92563781 100644
--- a/languages/cpp/simpletypecatalog.h
+++ b/languages/cpp/simpletypecatalog.h
@@ -77,7 +77,7 @@ private:
   
   int pointerDepthFromString( const TQString& str ) {
     TQRegExp ptrRx( "(\\*|\\&)" );
-    TQString ptr = str.mid( str.find( ptrRx ) );
+    TQString ptr = str.mid( str.tqfind( ptrRx ) );
     TQStringList ptrList = TQStringList::split( "", ptr );
     return ptrList.size();
   }
@@ -100,7 +100,7 @@ protected:
     TypeDesc m_desc;
     TypePointer m_parent;
     
-    CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer parent ) : m_tag( tag ) , m_desc( desc ), m_parent( parent )   {
+    CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer tqparent ) : m_tag( tag ) , m_desc( desc ), m_parent( tqparent )   {
     }
     
     virtual TypePointer build();
diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp
index 3fc1ce52..d0c2c2af 100644
--- a/languages/cpp/simpletypefunction.cpp
+++ b/languages/cpp/simpletypefunction.cpp
@@ -455,7 +455,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb
   if ( ret.memberType == MemberInfo::Function || ret.memberType == MemberInfo::Variable || ret.memberType == MemberInfo::Template || ret.memberType == MemberInfo::Typedef || ret.memberType == MemberInfo::NestedType ) {
     //For redirected types it is necessary to add the include-files of the context they were searched in.
     //That is not quite correct, but it makes sure that at least the same namespace-aliases will be activated while the search for the type,
-    //Which is necessary because the alias is parented by exactly this class.
+    //Which is necessary because the alias is tqparented by exactly this class.
 
     ret.type->addIncludeFiles( name.includeFiles() );
   }
@@ -494,7 +494,7 @@ DeclarationInfo SimpleTypeCodeModel::getDeclarationInfo() {
 
 TQString SimpleTypeCodeModel::specialization() const {
   const ClassModel* klass = dynamic_cast<const ClassModel*>( m_item.data() );
-  if ( !klass ) return TQString::null;
+  if ( !klass ) return TQString();
   return klass->getSpecializationDeclaration();
 }
 
@@ -553,8 +553,8 @@ TQStringList SimpleTypeCodeModel::getBaseStrings() {
 
   if ( !m_item || ( klass = dynamic_cast<ClassModel*>( & ( *m_item ) ) ) == 0 ) return ret;
 
-  TQStringList parents = klass->baseClassList();
-  for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) {
+  TQStringList tqparents = klass->baseClassList();
+  for ( TQStringList::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
     ret << *it;
   }
 
@@ -572,8 +572,8 @@ TypePointer SimpleTypeCodeModel::CodeModelBuildInfo::build() {
 TypeDesc SimpleTypeCodeModelFunction::getReturnType() {
   if ( item() ) {
     IncludeFiles files;
-    if( parent() )
-      files = parent()->getFindIncludeFiles();
+    if( tqparent() )
+      files = tqparent()->getFindIncludeFiles();
     if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) {
       TypeDesc d = m->resultType();
       d.setIncludeFiles( files );
@@ -597,8 +597,8 @@ TQValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() {
 
   if ( item() ) {
     IncludeFiles files;
-    if( parent() )
-      files = parent()->getFindIncludeFiles();
+    if( tqparent() )
+      files = tqparent()->getFindIncludeFiles();
     if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) {
       ArgumentList l = m->argumentList();
       for ( ArgumentList::iterator it = l.begin(); it != l.end(); ++it ) {
@@ -642,7 +642,7 @@ TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() {
 
 //SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo implementation
 
-SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ) : m_desc( desc ), m_parent( parent ) {
+SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ) : m_desc( desc ), m_parent( tqparent ) {
 
   for ( FunctionDefinitionList::iterator it = items.begin(); it != items.end(); ++it ) {
     m_items << model_cast<FunctionDom> ( *it );
diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h
index 90b5fcab..86f32a65 100644
--- a/languages/cpp/simpletypefunction.h
+++ b/languages/cpp/simpletypefunction.h
@@ -139,7 +139,7 @@ public:
                     ///paramInfo now contains the information for all implicit types
         }
         
-        return this->parent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) );
+        return this->tqparent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) );
       } else {
         ifVerbose( dbg() << "failed to find a fitting overloaded method" << endl );
       }
@@ -239,7 +239,7 @@ protected:
     TypeDesc m_desc;
     TypePointer m_parent;
     
-    CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer parent ) : m_item( item ), m_desc( desc ), m_parent( parent ) {
+    CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer tqparent ) : m_item( item ), m_desc( desc ), m_parent( tqparent ) {
     }
     
     virtual TypePointer build();
@@ -281,9 +281,9 @@ public:
     TypeDesc m_desc;
     TypePointer m_parent;
     
-    CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer parent ) : m_items( items ), m_desc( desc ), m_parent( parent ) {
+    CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer tqparent ) : m_items( items ), m_desc( desc ), m_parent( tqparent ) {
     }
-    CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent );
+    CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent );
     
     virtual TypePointer build();
   };
@@ -317,7 +317,7 @@ public:
     TypeDesc m_desc;
     TypePointer m_parent;
     
-    CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) {
+    CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer tqparent ) : m_tags( tags ), m_desc( desc ), m_parent( tqparent ) {
     }
     
     virtual TypePointer build();
diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp
index f7937db1..048eb9ad 100644
--- a/languages/cpp/simpletypenamespace.cpp
+++ b/languages/cpp/simpletypenamespace.cpp
@@ -116,7 +116,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe
 
   ImportList m_aliasImports;
 
-  AliasMap::iterator itt = m_aliases.find( name.name() );
+  AliasMap::iterator itt = m_aliases.tqfind( name.name() );
 
   if ( itt != m_aliases.end() && !( *itt ).empty() ) {
     ifVerbose( dbg() << "\"" << str() << "\": namespace-sub-aliases \"" << name.name() << "\"" << "\" requested, locating targets" << endl );
@@ -159,7 +159,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe
       if ( mem.memberType != MemberInfo::Namespace ) {
 #ifdef PHYSICAL_IMPORT
         TypePointer b = mem.build();
-        if ( b && !( b->parent()->masterProxy().data() == this ) ) {
+        if ( b && !( b->tqparent()->masterProxy().data() == this ) ) {
           b = b ->clone(); //expensive, cache is not shared
           b->setParent( this );
 
@@ -169,7 +169,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe
         if( mem.memberType == MemberInfo::NestedType )
           chooseSpecialization( mem );
         TypePointer b = mem.build();
-        if( b && b->parent() && b->parent()->masterProxy().data() == this )
+        if( b && b->tqparent() && b->tqparent()->masterProxy().data() == this )
           b->setParent( this );
 #endif
         return mem;
@@ -224,10 +224,10 @@ void SimpleTypeNamespace::addAliasMap( const TypeDesc& name, const TypeDesc& ali
   if ( symmetric )
     addAliasMap( alias, name, files, recurse, false );
 
-  invalidateSecondaryCache();
-  invalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached)
+  tqinvalidateSecondaryCache();
+  tqinvalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached)
 
-  AliasMap::iterator it = m_aliases.find( name.name() );
+  AliasMap::iterator it = m_aliases.tqfind( name.name() );
   if ( it == m_aliases.end() )
     it = m_aliases.insert( name.name(), ImportList() );
 
@@ -253,7 +253,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
   if ( m_activeSlaves.empty() || !safetyCounter.ok() ) return possibleSlaves;
 //   if( !isRecursion ) {
 //     ///Test the cache
-//     SlavesCache::const_iterator it = m_slavesCache.find( files );
+//     SlavesCache::const_iterator it = m_slavesCache.tqfind( files );
 //     if( it != m_slavesCache.end() && it->second.first == m_slavesCache.size() ) return; ///The cache already contains a valid entry, and the work is done
 //   }
 
@@ -302,7 +302,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
 #ifdef PHYSICALLY_IMPORT_NAMESPACES
         if ( desc.resolved()->masterProxy().data() != this ) {
           desc.setResolved( desc.resolved()->clone() ); //expensive, cache is not shared
-          desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the parents of all found members correctly
+          desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the tqparents of all found members correctly
         }
 #endif
         d.first.first = desc;
@@ -320,8 +320,8 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
 
 void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) {
   while ( !map.isEmpty() ) {
-    int mid = map.find( "=" );
-    int mid2 = map.find( "<<" );
+    int mid = map.tqfind( "=" );
+    int mid2 = map.tqfind( "<<" );
     int found = mid;
     int len = 1;
     if ( mid2 != -1 && ( mid2 < found || found == -1 ) ) {
@@ -331,7 +331,7 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files )
     if ( found == -1 )
       break;
 
-    int end = map.find( ";", found + len );
+    int end = map.tqfind( ";", found + len );
     if ( end == -1 ) {
       //break;
       end = map.length();
@@ -344,15 +344,15 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files )
   }
 }
 
-void SimpleTypeNamespace::invalidatePrimaryCache( bool onlyNegative ) {
+void SimpleTypeNamespace::tqinvalidatePrimaryCache( bool onlyNegative ) {
   //m_slavesCache.clear();
-  SimpleTypeImpl::invalidatePrimaryCache( onlyNegative );
+  SimpleTypeImpl::tqinvalidatePrimaryCache( onlyNegative );
 }
 
 void SimpleTypeNamespace::addImport( const TypeDesc& import, const IncludeFiles& files, TypePointer perspective ) {
   //ifVerbose( dbg() << "
   if ( !perspective ) perspective = this;
-  invalidateCache();
+  tqinvalidateCache();
   TypeDesc d = import;
   if ( d.resolved() ) {
     #ifdef PHYSICALLY_IMPORT_NAMESPACES
@@ -377,7 +377,7 @@ bool SimpleTypeNamespace::hasNode() const {
 
 SimpleTypeNamespace::SlaveList SimpleTypeNamespace::getSlaves( const IncludeFiles& files ) {
   /*  ///Test the cache
-  SlavesCache::const_iterator it = m_slavesCache.find( files );
+  SlavesCache::const_iterator it = m_slavesCache.tqfind( files );
   if( it != m_slavesCache.end() && it->second.first == m_activeSlaves.size() ) return it->second.second; ///The cache already contains a valid entry, and the work is done*/
 
   std::set<size_t> allSlaves = updateAliases( files );
diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h
index b465cfb6..ab5131c7 100644
--- a/languages/cpp/simpletypenamespace.h
+++ b/languages/cpp/simpletypenamespace.h
@@ -135,7 +135,7 @@ class SimpleTypeNamespace : public SimpleTypeImpl {
       return true;
     }
 
-    virtual void invalidatePrimaryCache( bool onlyNegative = false );
+    virtual void tqinvalidatePrimaryCache( bool onlyNegative = false );
   
     virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type =  MemberInfo::AllTypes );
 
diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp
index bcea1a05..e0c9bfd6 100644
--- a/languages/cpp/store_walker.cpp
+++ b/languages/cpp/store_walker.cpp
@@ -53,7 +53,7 @@ void StoreWalker::parseTranslationUnit( const ParsedFile& ast )
 	m_anon = 0;
 	m_imports.clear();
 	
-	m_imports << QPair<TQMap<TQString, ClassDom>, TQStringList>(TQMap<TQString, ClassDom>(), TQStringList());
+	m_imports << TQPair<TQMap<TQString, ClassDom>, TQStringList>(TQMap<TQString, ClassDom>(), TQStringList());
 	TreeParser::parseTranslationUnit( ast );
 	m_imports.pop_back();
 }
@@ -519,7 +519,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast )
 	klass->setEndPosition( endLine, endColumn );
 	klass->setFileName( m_fileName );
 	
-	int i = className.find( '<' );
+	int i = className.tqfind( '<' );
 	if( i != -1 ) {
 		klass->setSpecializationDeclaration( className.mid( i ) );
 		className = className.left( i );
@@ -900,7 +900,7 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom
 			
 			if ( param->declarator() )
 			{
-				TQString text = declaratorToString( param->declarator(), TQString::null, true );
+				TQString text = declaratorToString( param->declarator(), TQString(), true );
 				if ( !text.isEmpty() )
 					arg->setName( text );
 			}
@@ -917,7 +917,7 @@ void StoreWalker::parseFunctionArguments( DeclaratorAST* declarator, FunctionDom
 TQString StoreWalker::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator )
 {
 	if ( !typeSpec || !declarator )
-		return TQString::null;
+		return TQString();
 	
 	TQString text;
 	
@@ -982,7 +982,7 @@ ClassDom StoreWalker::findClassFromScope( const TQStringList& scope )
 {
 	TQString scopeText = scope.join("::");
 	if( !m_imports.isEmpty() ) {
-		TQMapIterator<TQString, ClassDom> it = m_imports.back().first.find( scopeText );
+		TQMapIterator<TQString, ClassDom> it = m_imports.back().first.tqfind( scopeText );
 		if( it != m_imports.back().first.end() ) {
 			return *it;
 		}
@@ -1052,7 +1052,7 @@ ClassDom StoreWalker::classFromScope(const TQStringList& scope) {
 
 	if( c ) {
 		///Check the file that overrides the code-model file
-		it = m_overrides.find( c->fileName() );
+		it = m_overrides.tqfind( c->fileName() );
 		
 		//Find the class within the file that is overriding the one in code-model.
 		if( it != m_overrides.end() ) {
diff --git a/languages/cpp/store_walker.h b/languages/cpp/store_walker.h
index 49c4bb8f..1e646d79 100644
--- a/languages/cpp/store_walker.h
+++ b/languages/cpp/store_walker.h
@@ -115,7 +115,7 @@ private:
     HashedString m_hashedFileName;
 	TQStringList m_currentScope;
 	CodeModel* m_store;
-	TQValueList<QPair<TQMap<TQString, ClassDom>, TQStringList> > m_imports;
+	TQValueList<TQPair<TQMap<TQString, ClassDom>, TQStringList> > m_imports;
 	int m_currentAccess;
 	bool m_inSlots;
 	bool m_inSignals;
diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp
index 6ad55925..4eae290a 100644
--- a/languages/cpp/storeconverter.cpp
+++ b/languages/cpp/storeconverter.cpp
@@ -140,7 +140,7 @@ void StoreConverter::parseArguments(FunctionDom function, CppFunction<Tag> &cppF
 	{
 		ArgumentDom arg = m_model->create<ArgumentModel>();
 		arg->setType(*it);
-		arg->setName(cppFun.argumentNames()[args.findIndex(*it)]);
+		arg->setName(cppFun.argumentNames()[args.tqfindIndex(*it)]);
 		
 		function->addArgument(arg);
 	}
diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp
index 13a39de2..bc1a8dc7 100644
--- a/languages/cpp/stringhelpers.cpp
+++ b/languages/cpp/stringhelpers.cpp
@@ -36,9 +36,9 @@ TQString clearComments( TQString str ) {
   int lastPos = 0;
   int pos;
   int len = str.length();
-  while( (pos = str.find( "/*", lastPos )) != -1 ) {
+  while( (pos = str.tqfind( "/*", lastPos )) != -1 ) {
     if( !s ) return str;
-    int i = str.find( "*/", pos );
+    int i = str.tqfind( "*/", pos );
     if( i != -1 && i <= len - 2 ) {
       clearStr( str, pos, i+2 );
       lastPos = i+2;
@@ -49,9 +49,9 @@ TQString clearComments( TQString str ) {
   }
   
   lastPos = 0;
-  while( (pos = str.find( "//", lastPos )) != -1 ) {
+  while( (pos = str.tqfind( "//", lastPos )) != -1 ) {
     if( !s ) return str;
-    int i = str.find( "\n", pos );
+    int i = str.tqfind( "\n", pos );
     if( i != -1 && i <= len - 1 ) {
       clearStr( str, pos, i+1 );
       lastPos = i+1;
@@ -66,17 +66,17 @@ TQString clearComments( TQString str ) {
 
 TQString cutTemplateParams( TQString str ) {
   int p;
-  if( (p = str.find('<') ) != -1) {
+  if( (p = str.tqfind('<') ) != -1) {
     return str.left( p );
   }
   
-  return str.stripWhiteSpace().replace('*',"");
+  return str.stripWhiteSpace().tqreplace('*',"");
 }
 
-QPair<TQString, TQString> splitTemplateParams( TQString str ) {
-  QPair<TQString, TQString> ret;
+TQPair<TQString, TQString> splitTemplateParams( TQString str ) {
+  TQPair<TQString, TQString> ret;
   int p;
-  if( (p = str.find('<') ) != -1) {
+  if( (p = str.tqfind('<') ) != -1) {
     ret.first = str.left( p ).stripWhiteSpace();
     ret.second = str.mid( p ).stripWhiteSpace();
   } else {
@@ -238,8 +238,8 @@ int countExtract( TQChar c, const TQString& str ) {
 
 TQString templateParamFromString( int num, TQString str ) {
   if( str.endsWith("::") ) str.truncate( str.length() - 2 );
-  int begin = str.find('<');
-  int end = str.findRev('>');
+  int begin = str.tqfind('<');
+  int end = str.tqfindRev('>');
   
   if(begin == -1 || end == -1) return "";
   
diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h
index c8783413..a6815f2b 100644
--- a/languages/cpp/stringhelpers.h
+++ b/languages/cpp/stringhelpers.h
@@ -30,7 +30,7 @@ TQString clearComments( TQString str );
 
 TQString cutTemplateParams( TQString str );
 
-QPair<TQString, TQString> splitTemplateParams( TQString str );
+TQPair<TQString, TQString> splitTemplateParams( TQString str );
 
 bool parenFits( TQChar c1, TQChar c2 );
 
@@ -63,8 +63,8 @@ TQStringList splitType( TQString str ) ;
 class ParamIterator {
   public:
     ParamIterator( TQString parens, TQString source ) : m_source( source ), m_parens( parens ), m_cur( 0 ), m_curEnd ( 0 ) {
-      int begin = m_source.find( m_parens[ 0 ] );
-      int end = m_source.findRev( m_parens[ 1 ] );
+      int begin = m_source.tqfind( m_parens[ 0 ] );
+      int end = m_source.tqfindRev( m_parens[ 1 ] );
 	    m_prefix = m_source.left( begin );
 	    
       if ( begin == -1 || end == -1 && end - begin > 1 )
diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp
index c7b3e1f1..3e96646a 100644
--- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp
+++ b/languages/cpp/subclassing_template/subclass_qt4_template.cpp
@@ -2,8 +2,8 @@
 
 #include "$NEWFILENAMELC$.h"
 
-$NEWCLASS$::$NEWCLASS$(TQWidget* parent, Qt::WFlags fl)
-: $QTBASECLASS$( parent, fl ), Ui::$BASECLASS$()
+$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, TQt::WFlags fl)
+: $TQTBASECLASS$( tqparent, fl ), Ui::$BASECLASS$()
 {
 	setupUi(this);
 }
diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h
index a84cf0d0..64ba390e 100644
--- a/languages/cpp/subclassing_template/subclass_qt4_template.h
+++ b/languages/cpp/subclassing_template/subclass_qt4_template.h
@@ -2,15 +2,16 @@
 #ifndef $NEWFILENAMEUC$_H
 #define $NEWFILENAMEUC$_H
 
-#include <$QTBASECLASS$>
+#include <$TQTBASECLASS$>
 #include "ui_$BASEFILENAME$.h"
 
-class $NEWCLASS$ : public $QTBASECLASS$, private Ui::$BASECLASS$
+class $NEWCLASS$ : public $TQTBASECLASS$, private Ui::$BASECLASS$
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  $NEWCLASS$(TQWidget* parent = 0, Qt::WFlags fl = 0 );
+  $NEWCLASS$(TQWidget* tqparent = 0, TQt::WFlags fl = 0 );
   ~$NEWCLASS$();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/subclassing_template/subclass_template.cpp b/languages/cpp/subclassing_template/subclass_template.cpp
index adc89082..8373a260 100644
--- a/languages/cpp/subclassing_template/subclass_template.cpp
+++ b/languages/cpp/subclassing_template/subclass_template.cpp
@@ -2,8 +2,8 @@
 
 #include "$NEWFILENAMELC$.h"
 
-$NEWCLASS$::$NEWCLASS$(TQWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl)
-: $BASECLASS$(parent,name$CAN_BE_MODAL_CPP2$,fl)
+$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl)
+: $BASECLASS$(tqparent,name$CAN_BE_MODAL_CPP2$,fl)
 {
 }
 
diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h
index 8e238bae..7f9d2ae2 100644
--- a/languages/cpp/subclassing_template/subclass_template.h
+++ b/languages/cpp/subclassing_template/subclass_template.h
@@ -7,9 +7,10 @@
 class $NEWCLASS$ : public $BASECLASS$
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  $NEWCLASS$(TQWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 );
+  $NEWCLASS$(TQWidget* tqparent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 );
   ~$NEWCLASS$();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 562cd010..62b154da 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -54,11 +54,11 @@
 #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true)
 
 
-SlotItem::SlotItem(TQListView *parent,const TQString &methodName,
+SlotItem::SlotItem(TQListView *tqparent,const TQString &methodName,
                    const TQString &specifier,
                    const TQString &access, const TQString &returnType,
                    bool isFunc,bool callBaseClass)
-: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox)
+: TQCheckListItem(tqparent,methodName,TQCheckListItem::CheckBox)
 {
 	setOn(true);
 	m_methodName = methodName;
@@ -94,9 +94,9 @@ void SlotItem::setAllreadyInSubclass()
 
 
 SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile,
-                               TQStringList &newFileNames, TQWidget* parent,
+                               TQStringList &newFileNames, TQWidget* tqparent,
                                const char* name,bool modal, WFlags fl)
-: SubclassingDlgBase(parent,name,modal,fl),
+: SubclassingDlgBase(tqparent,name,modal,fl),
 m_newFileNames(newFileNames), m_cppSupport( cppSupport )
 
 {
@@ -117,8 +117,8 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport )
 
 SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile,
                                const TQString &filename, TQStringList &dummy,
-                               TQWidget* parent, const char* name, bool modal, WFlags fl)
-: SubclassingDlgBase(parent, name, modal, fl),
+                               TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: SubclassingDlgBase(tqparent, name, modal, fl),
 m_newFileNames(dummy), m_cppSupport( cppSupport )
 
 {
@@ -144,8 +144,8 @@ m_newFileNames(dummy), m_cppSupport( cppSupport )
 	for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt)
 	{
 		kdDebug() << "base class " << baseClass << " class " << (*classIt)->name()
-			<< " parents " << (*classIt)->baseClassList().join(",") << endl;
-		if ( (*classIt)->baseClassList().findIndex(baseClass) != -1 )
+			<< " tqparents " << (*classIt)->baseClassList().join(",") << endl;
+		if ( (*classIt)->baseClassList().tqfindIndex(baseClass) != -1 )
 		{
 			kdDebug() << "base class matched " << endl;
 			m_edClassName->setText((*classIt)->name());
@@ -167,7 +167,7 @@ bool SubclassingDlg::alreadyInSubclass(const TQString &method)
 {
 	for (uint i=0;i<m_parsedMethods.count();i++)
 	{
-		if (method.find(m_parsedMethods[i])==0)
+		if (method.tqfind(m_parsedMethods[i])==0)
 			return true;
 	}
 	return false;
@@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile()
 
   // Special widget specific slots
 	SlotItem *newSlot;
-	m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog");
+	m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING);
 
-	if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") )
+	if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) )
 		m_canBeModal = false;
 	else
 		m_canBeModal = true;
-	if (m_qtBaseClassName != "TQWidget")
+	if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING)
 	{
 		newSlot = new SLOT_ACCEPT;
 		newSlot->setOn(false);
@@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile()
 		m_slots << newSlot;
 	}
 
-	if (m_qtBaseClassName == "TQWizard")
+	if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING)
 	{
 		newSlot = new SLOT_NEXT;
 		m_slotView->insertItem(newSlot);
@@ -276,14 +276,14 @@ void SubclassingDlg::updateDlg()
 {
 }
 
-void SubclassingDlg::replace(TQString &string, const TQString& search, const TQString& replace)
+void SubclassingDlg::tqreplace(TQString &string, const TQString& search, const TQString& tqreplace)
 {
-	int nextPos = string.find(search);
+	int nextPos = string.tqfind(search);
 	unsigned int searchLength = search.length();
 	while (nextPos>-1)
 	{
-		string = string.replace(nextPos,searchLength,replace);
-		nextPos = string.find(search,nextPos+replace.length());
+		string = string.tqreplace(nextPos,searchLength,tqreplace);
+		nextPos = string.tqfind(search,nextPos+tqreplace.length());
 	}
 }
 
@@ -304,24 +304,24 @@ bool SubclassingDlg::loadBuffer(TQString &buffer, const TQString& filename)
 
 bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal)
 {
-	replace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper());
-	replace(buffer,"$BASEFILENAMELC$",m_formName.lower());
-	replace(buffer,"$BASEFILENAME$",m_formName);
-	replace(buffer,"$NEWCLASS$",m_edClassName->text());
-	replace(buffer,"$QTBASECLASS$", m_qtBaseClassName );
-	replace(buffer,"$BASECLASS$",m_baseClassName);
-	replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower());
+	tqreplace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper());
+	tqreplace(buffer,"$BASEFILENAMELC$",m_formName.lower());
+	tqreplace(buffer,"$BASEFILENAME$",m_formName);
+	tqreplace(buffer,"$NEWCLASS$",m_edClassName->text());
+	tqreplace(buffer,"$TQTBASECLASS$", m_qtBaseClassName );
+	tqreplace(buffer,"$BASECLASS$",m_baseClassName);
+	tqreplace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower());
 	if (canBeModal)
 	{
-		replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE");
-		replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal");
-		replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal");
+		tqreplace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE");
+		tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal");
+		tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",", modal");
 	}
 	else
 	{
-		replace(buffer,"$CAN_BE_MODAL_H$","");
-		replace(buffer,"$CAN_BE_MODAL_CPP1$","");
-		replace(buffer,"$CAN_BE_MODAL_CPP2$","");
+		tqreplace(buffer,"$CAN_BE_MODAL_H$","");
+		tqreplace(buffer,"$CAN_BE_MODAL_CPP1$","");
+		tqreplace(buffer,"$CAN_BE_MODAL_CPP2$","");
 	}
 
 	return true;
@@ -378,8 +378,8 @@ void SubclassingDlg::accept()
 		TQFileInfo fi(m_filename + ".h");
 		TQString module = fi.baseName();
 		TQString basefilename = fi.baseName(true);
-		buffer.replace(TQRegExp("\\$MODULE\\$"),module);
-		buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename);
+		buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module);
+		buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename);
 	}
 	else
 		loadBuffer(buffer,m_filename+".h");
@@ -411,12 +411,12 @@ void SubclassingDlg::accept()
 			if (!slitem->m_isFunc)
 			{
 				declBuild += spacer.fill(' ',43-declBuild.length()) + slitem->m_methodName + ";";
-				replace(buffer,"/*$PUBLIC_SLOTS$*/",declBuild);
+				tqreplace(buffer,"/*$PUBLIC_SLOTS$*/",declBuild);
 			}
 			else
 			{
 				declBuild += spacer.fill(' ',47-declBuild.length()) + slitem->m_methodName + ";";
-				replace(buffer,"/*$PUBLIC_FUNCTIONS$*/",declBuild);
+				tqreplace(buffer,"/*$PUBLIC_FUNCTIONS$*/",declBuild);
 			}
 		}
 		if (slitem->m_access=="protected")
@@ -424,12 +424,12 @@ void SubclassingDlg::accept()
 			if (!slitem->m_isFunc)
 			{
 				declBuild += spacer.fill(' ',46-declBuild.length()) + slitem->m_methodName + ";";
-				replace(buffer,"/*$PROTECTED_SLOTS$*/",declBuild);
+				tqreplace(buffer,"/*$PROTECTED_SLOTS$*/",declBuild);
 			}
 			else
 			{
 				declBuild += spacer.fill(' ',50-declBuild.length()) + slitem->m_methodName + ";";
-				replace(buffer,"/*$PROTECTED_FUNCTIONS$*/",declBuild);
+				tqreplace(buffer,"/*$PROTECTED_FUNCTIONS$*/",declBuild);
 			}
 		}
 	}
@@ -458,7 +458,7 @@ void SubclassingDlg::accept()
 		"/*$SPECIALIZATION$*/\n"
 		"$RETURNTYPE$ $NEWCLASS$::$METHOD$\n"
 		"{\n"
-		"  $QTBASECLASS$::$METHOD$;\n"
+		"  $TQTBASECLASS$::$METHOD$;\n"
 		"}\n";
 
 
@@ -473,10 +473,10 @@ void SubclassingDlg::accept()
 		TQFileInfo fi(m_filename + ".cpp");
 		TQString module = fi.baseName();
 		TQString basefilename = fi.baseName(true);
-		buffer.replace(TQRegExp("\\$MODULE\\$"),module);
-		buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename);
+		buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module);
+		buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename);
 		if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem))
-			buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n";
+			buffer += "\n#include \"$NEWFILENAMELC$.tqmoc\"\n";
 	}
 	else
 		loadBuffer(buffer,m_filename+".cpp");
@@ -489,11 +489,11 @@ void SubclassingDlg::accept()
 		    slitem->m_alreadyInSubclass)
 			continue;
 	TQString impl = slitem->m_callBaseClass ? implementation_callbase : implementation;
-		replace(impl,"$RETURNTYPE$",slitem->m_returnType);
-		replace(impl,"$NEWCLASS$",m_edClassName->text());
-		replace(impl,"$METHOD$", slitem->m_methodName);
-		replace(impl,"$QTBASECLASS$", m_qtBaseClassName);
-		replace(buffer,"/*$SPECIALIZATION$*/",impl);
+		tqreplace(impl,"$RETURNTYPE$",slitem->m_returnType);
+		tqreplace(impl,"$NEWCLASS$",m_edClassName->text());
+		tqreplace(impl,"$METHOD$", slitem->m_methodName);
+		tqreplace(impl,"$TQTBASECLASS$", m_qtBaseClassName);
+		tqreplace(buffer,"/*$SPECIALIZATION$*/",impl);
 	}
 
 	if (reformat_box->isChecked())
diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h
index c49ad683..ca07059a 100644
--- a/languages/cpp/subclassingdlg.h
+++ b/languages/cpp/subclassingdlg.h
@@ -20,10 +20,10 @@ class TQStringList;
 class TQDomDocument;
 class CppSupportPart;
 
-class SlotItem : public QCheckListItem
+class SlotItem : public TQCheckListItem
 {
 public:
-	SlotItem( TQListView *parent, const TQString &text,
+	SlotItem( TQListView *tqparent, const TQString &text,
 	          const TQString &specifier, const TQString &Access,
 	          const TQString &returnType, bool isFunc,
 	          bool callBaseClass = false );
@@ -42,10 +42,10 @@ class SubclassingDlg : public SubclassingDlgBase
 {
 public:
 	SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames,
-	                TQWidget* parent = 0, const char* name = 0,
+	                TQWidget* tqparent = 0, const char* name = 0,
 	                bool modal = FALSE, WFlags fl = 0 );
 	SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy,
-	                TQWidget* parent = 0, const char* name = 0,
+	                TQWidget* tqparent = 0, const char* name = 0,
 	                bool modal = FALSE, WFlags fl = 0 );
 	~SubclassingDlg();
 
@@ -54,7 +54,7 @@ private:
 	TQString readBaseClassName();
 	void updateDlg();
 	bool replaceKeywords( TQString &buffer, bool canBeModal = true );
-	void replace( TQString &string, const TQString& search, const TQString& replace );
+	void tqreplace( TQString &string, const TQString& search, const TQString& tqreplace );
 	bool saveBuffer( TQString &buffer, const TQString& filename );
 	bool loadBuffer( TQString &buffer, const TQString& filename );
 	bool alreadyInSubclass( const TQString &method );
diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui
index c732b244..a43beb05 100644
--- a/languages/cpp/subclassingdlgbase.ui
+++ b/languages/cpp/subclassingdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>SubclassingDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SubclassingDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,12 +30,12 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Specialize following slots:</string>
+                        <string>&amp;Specialize following Q_SLOTS:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>m_slotView</cstring>
@@ -46,7 +46,7 @@
                         <cstring>m_edClassName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <cstring>m_edClassName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -89,7 +89,7 @@
                         <cstring>m_edFileName</cstring>
                     </property>
                 </widget>
-                <widget class="QListView" row="3" column="0" rowspan="1" colspan="3">
+                <widget class="TQListView" row="3" column="0" rowspan="1" colspan="3">
                     <column>
                         <property name="text">
                             <string>Method</string>
@@ -149,7 +149,7 @@
                         <cstring>m_slotView</cstring>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>reformat_box</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <string>Re&amp;format source</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="2">
+                <widget class="TQCheckBox" row="4" column="2">
                     <property name="name">
                         <cstring>reformatDefault_box</cstring>
                     </property>
@@ -175,7 +175,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>m_btnOk</cstring>
             </property>
@@ -186,7 +186,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>m_btnCancel</cstring>
             </property>
@@ -204,7 +204,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>
@@ -236,9 +236,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>onChangedClassName()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp
index 15849ad1..2ac8d54b 100644
--- a/languages/cpp/tag_creator.cpp
+++ b/languages/cpp/tag_creator.cpp
@@ -47,10 +47,10 @@ void TagCreator::parseDeclaration( DeclarationAST* ast )
 {
 	if( ast->nodeType() == NodeType_AccessDeclaration ||
 	    m_currentAccess.isEmpty() ||
-	    m_currentAccess.contains("private")	||	///In order to correctly evaluate templates, the private members are necessary too
-	    m_currentAccess.contains("public") ||
-	    m_currentAccess.contains("protected") ||
-	    m_currentAccess.contains("signals") )
+	    m_currentAccess.tqcontains("private")	||	///In order to correctly evaluate templates, the private members are necessary too
+	    m_currentAccess.tqcontains("public") ||
+	    m_currentAccess.tqcontains("protected") ||
+	    m_currentAccess.tqcontains("signals") )
 	{
 		TreeParser::parseDeclaration( ast );
 	}
@@ -59,7 +59,7 @@ void TagCreator::parseDeclaration( DeclarationAST* ast )
 void TagCreator::parseTranslationUnit( const ParsedFile& ast )
 {
 	m_currentScope.clear();
-	m_currentAccess = TQString::null;
+	m_currentAccess = TQString();
 	m_inSlots = false;
 	m_inSignals = false;
 	m_anon = 0;
@@ -78,9 +78,9 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast )
 	ast.write( stream );
 	tag.setAttribute( "cppparsedfile", data );
 	tag.setAttribute( "includedFrom", ast.includedFrom() );
-	tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) );
-	tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) );
-	tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) );
+	tag.setAttribute( "skippedLines", TQString("%1").tqarg( ast.skippedLines()) );
+	tag.setAttribute( "macroValueHash", TQString("%1").tqarg( ast.usedMacros().valueHash()) );
+	tag.setAttribute( "macroIdHash", TQString("%1").tqarg( ast.usedMacros().idHash() ) );
 	
   	tag.setScope( m_currentScope );
   	if( !ast->comment().isEmpty() )
@@ -362,7 +362,7 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast )
 	checkTemplateDeclarator( tag );
 	
 	TQString arguments = tag.attribute( "a" ).toStringList().join( "," );
-tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) );
+tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.tqreplace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) );
 	
 	tagBuilder.setAccess( TagUtils::stringToAccess( m_currentAccess ) );
 	
@@ -469,7 +469,7 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast )
 	
 	tag.setFileName( m_fileName );
 
-	int i = className.find( '<' );
+	int i = className.tqfind( '<' );
 	TQString specialization;
 	
 	if( i != -1 ) {
@@ -748,7 +748,7 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator )
 			
 			TQString name;
 			if( param->declarator() ){
-				name = declaratorToString(param->declarator(), TQString::null, true );
+				name = declaratorToString(param->declarator(), TQString(), true );
 			}
 			
 			TQString type = typeOfDeclaration( param->typeSpec(), param->declarator() );
@@ -773,7 +773,7 @@ void TagCreator::parseFunctionArguments( Tag& tag, DeclaratorAST* declarator )
 TQString TagCreator::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator )
 {
 	if( !typeSpec || !declarator )
-		return TQString::null;
+		return TQString();
 	
 	TQString text;
 	
@@ -862,7 +862,7 @@ int TagUtils::stringToAccess( const TQString & access )
 		<< "public slots" << "protected slots" << "private slots"
 		<< "signals";
 	
-	int idx = l.findIndex( access );
+	int idx = l.tqfindIndex( access );
 	return idx == -1 ? 0 : idx+1;
 }
 
@@ -878,7 +878,7 @@ TQString TagUtils::accessToString( int id )
 	if( l.at(id-1) != l.end() )
 		return l[ id-1 ];
 	
-	return TQString::null;
+	return TQString();
 }
 
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h
index e142d837..9e52bb5e 100644
--- a/languages/cpp/typedecoration.h
+++ b/languages/cpp/typedecoration.h
@@ -47,9 +47,9 @@ class TypeDecoration {
     }
 
     void operator += ( const TypeDecoration& rhs ) {
-      if ( !m_decoration_front.contains( rhs.m_decoration_front ) )
+      if ( !m_decoration_front.tqcontains( rhs.m_decoration_front ) )
         m_decoration_front += rhs.m_decoration_front;
-      if ( !m_decoration_back.contains( rhs.m_decoration_back ) )
+      if ( !m_decoration_back.tqcontains( rhs.m_decoration_back ) )
         m_decoration_back += rhs.m_decoration_back;
     }
 
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index 89d32931..b238b734 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -150,7 +150,7 @@ TypeDesc::TypeDesc( const TypeDesc& rhs ) {
 bool TypeDesc::isValidType() const {
   if ( !m_data )
     return false;
-  if ( m_data->m_cleanName.find( "->" ) != -1 || m_data->m_cleanName.contains( '.' ) || m_data->m_cleanName.contains( ' ' ) || m_data->m_cleanName.isEmpty() )
+  if ( m_data->m_cleanName.tqfind( "->" ) != -1 || m_data->m_cleanName.tqcontains( '.' ) || m_data->m_cleanName.tqcontains( ' ' ) || m_data->m_cleanName.isEmpty() )
     return false;
 
   for ( TemplateParams::const_iterator it = m_data->m_templateParams.begin(); it != m_data->m_templateParams.end(); ++it ) {
@@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() {
 
     int len = m_cleanName.length();
     for ( int a = 0; a < len; a++ )
-			ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1));
+			ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1));
 
 
     int n = 1;
@@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() {
 	
 		int len = m_cleanName.length();
 		for ( int a = 0; a < len; a++ )
-			ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1));
+			ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1));
 	
 	
 		int n = 1;
@@ -590,7 +590,7 @@ void TypeDesc::makeDataPrivate() {
   if ( m_data.count() > 1 ) {
     m_data = new TypeDescData( *m_data );
   }
-	m_data->invalidateKey();
+	m_data->tqinvalidateKey();
 }
 
 TypeDesc& TypeDesc::makePrivate() {
@@ -708,7 +708,7 @@ void TypeDesc::init( TQString stri ) {
 	///Since function-names are also processed by this function, this check has to be done
 	if( shorten ) {
   ///Remove any prefixes like const or typename(very limited algorithm)
-		int len = str.find( "<" );
+		int len = str.tqfind( "<" );
 		if ( len == -1 )
 			len = str.length();
 		int currentStart = 0;
diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h
index ddb072d2..0759b74e 100644
--- a/languages/cpp/typedesc.h
+++ b/languages/cpp/typedesc.h
@@ -158,7 +158,7 @@ struct TypeDescData : public KShared {
 
 	TypeDescData() : m_hashValid( false ), m_hash2Valid( false ) {
 	}
-	void invalidateKey() {
+	void tqinvalidateKey() {
 		m_hashValid = false;
 		m_hash2Valid = false;
 	}
diff --git a/languages/csharp/README.dox b/languages/csharp/README.dox
index 6d256b08..36797a75 100644
--- a/languages/csharp/README.dox
+++ b/languages/csharp/README.dox
@@ -12,7 +12,7 @@ and images.
 \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
 
 \feature csharp programming language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/csharp/csharpconfigwidget.cpp b/languages/csharp/csharpconfigwidget.cpp
index 620f7881..dea62747 100644
--- a/languages/csharp/csharpconfigwidget.cpp
+++ b/languages/csharp/csharpconfigwidget.cpp
@@ -17,8 +17,8 @@
 
 
 CSharpConfigWidget::CSharpConfigWidget(TQDomDocument &projectDom,
-                                       TQWidget *parent, const char *name)
-    : CSharpConfigWidgetBase(parent, name), dom(projectDom)
+                                       TQWidget *tqparent, const char *name)
+    : CSharpConfigWidgetBase(tqparent, name), dom(projectDom)
 {
     interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevcsharpsupport/run/interpreter"));
     terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevcsharpsupport/run/terminal"));
diff --git a/languages/csharp/csharpconfigwidget.h b/languages/csharp/csharpconfigwidget.h
index a44570cd..25b6e58f 100644
--- a/languages/csharp/csharpconfigwidget.h
+++ b/languages/csharp/csharpconfigwidget.h
@@ -19,9 +19,10 @@
 class CSharpConfigWidget : public CSharpConfigWidgetBase
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 );
+    CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 );
     ~CSharpConfigWidget();
 
 public slots:
diff --git a/languages/csharp/csharpconfigwidgetbase.ui b/languages/csharp/csharpconfigwidgetbase.ui
index dbf4d3ae..1b7dd060 100644
--- a/languages/csharp/csharpconfigwidgetbase.ui
+++ b/languages/csharp/csharpconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>CSharpConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>csharp_config_widget</cstring>
     </property>
@@ -20,7 +20,7 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>interpreter_label</cstring>
             </property>
@@ -31,7 +31,7 @@
                 <cstring>interpreter_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -72,7 +72,7 @@
                 <enum>Minimum</enum>
             </property>
         </spacer>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>terminal_box</cstring>
             </property>
@@ -96,6 +96,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index d0bc9be6..0c67b155 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -48,8 +48,8 @@ typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
 static const KDevPluginInfo data("kdevcsharpsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
 
-CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
+CSharpSupportPart::CSharpSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport(&data, tqparent, name ? name : "CSharpSupportPart")
 {
     setInstance(CSharpSupportFactory::instance());
 
@@ -166,7 +166,7 @@ void CSharpSupportPart::savedFile(const KURL &fileName)
 #if 0  // not needed anymore
     kdDebug(9016) << "savedFile()" << endl;
 
-    if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) {
+    if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) {
         maybeParse(fileName);
         emit updatedSourceInfo();
     }
@@ -215,7 +215,7 @@ void CSharpSupportPart::slotStartInterpreter()
 void CSharpSupportPart::slotExecuteString()
 {
     bool ok;
-    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0);
+    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString(), &ok, 0);
     if (ok) {
         cmd.prepend("'");
         cmd.append("'");
diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h
index 35d2b7ba..df2390c8 100644
--- a/languages/csharp/csharpsupportpart.h
+++ b/languages/csharp/csharpsupportpart.h
@@ -19,9 +19,10 @@
 class CSharpSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CSharpSupportPart( TQObject *parent, const char *name, const TQStringList & );
+    CSharpSupportPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~CSharpSupportPart();
 
 protected:
diff --git a/languages/fortran/README.dox b/languages/fortran/README.dox
index 65a4e645..d0a5e953 100644
--- a/languages/fortran/README.dox
+++ b/languages/fortran/README.dox
@@ -14,7 +14,7 @@ and images.
 \maintainer <a href="mailto:nth maintainer AT provider.com">nth maintainer full name</a>
 
 \feature Fortran language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
index 66a12fbb..f6c3465e 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
@@ -25,8 +25,8 @@ extern "C" {
 }
 
 
-PgiOptionsFactory::PgiOptionsFactory(TQObject *parent, const char *name)
-    : KLibFactory(parent, name)
+PgiOptionsFactory::PgiOptionsFactory(TQObject *tqparent, const char *name)
+    : KLibFactory(tqparent, name)
 {
     instance();
 }
@@ -39,15 +39,15 @@ PgiOptionsFactory::~PgiOptionsFactory()
 }
 
 
-TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name,
+TQObject *PgiOptionsFactory::createObject(TQObject *tqparent, const char *name,
                                          const char * /*classname*/, const TQStringList &args)
 {
     if (args.count() > 0 && qstrcmp(args[0].latin1(), "pghpf") == 0) {
         kdDebug(9021) << "Building PgiOptions for PGHPF" << endl;
-        return new PgiOptionsPlugin(PgiOptionsPlugin::PGHPF, parent, name);
+        return new PgiOptionsPlugin(PgiOptionsPlugin::PGHPF, tqparent, name);
     } else if (args.count() > 0 && qstrcmp(args[0].latin1(), "pgf77") == 0) {
         kdDebug(9021) << "Building PgiOptions for PGF77" << endl;
-        return new PgiOptionsPlugin(PgiOptionsPlugin::PGF77, parent, name);
+        return new PgiOptionsPlugin(PgiOptionsPlugin::PGF77, tqparent, name);
     } else {
         kdDebug(9021) << "Wrong args for kdevpgioptions library" << endl;
         if (args.count() > 0)
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
index 4fd73b7f..e66e0cf2 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h
@@ -18,12 +18,13 @@
 class PgiOptionsFactory : public KLibFactory
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PgiOptionsFactory( TQObject *parent=0, const char *name=0 );
+    PgiOptionsFactory( TQObject *tqparent=0, const char *name=0 );
     ~PgiOptionsFactory();
 
-    virtual TQObject* createObject( TQObject *parent, const char *name,
+    virtual TQObject* createObject( TQObject *tqparent, const char *name,
                                    const char *classname, const TQStringList &args);
     static KInstance *instance();
 
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
index 8f22453a..267c67f0 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
@@ -72,10 +72,10 @@ const char * const hpf_flags[] = {
 
 
 
-class GeneralTab : public QWidget
+class GeneralTab : public TQWidget
 {
 public:
-    GeneralTab( TQWidget *parent=0, const char *name=0 );
+    GeneralTab( TQWidget *tqparent=0, const char *name=0 );
     ~GeneralTab();
 
     void readFlags(TQStringList *str);
@@ -83,10 +83,10 @@ public:
 };
 
 
-class OptimizationTab : public QWidget
+class OptimizationTab : public TQWidget
 {
 public:
-    OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 );
+    OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 );
     ~OptimizationTab();
 
     void readFlags(TQStringList *str);
@@ -98,10 +98,10 @@ private:
 };
 
 
-class HpfTab : public QWidget
+class HpfTab : public TQWidget
 {
 public:
-    HpfTab( TQWidget *parent=0, const char *name=0 );
+    HpfTab( TQWidget *tqparent=0, const char *name=0 );
     ~HpfTab();
 
     void readFlags(TQStringList *str);
@@ -112,11 +112,11 @@ private:
 };
 
 
-OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name)
-    : TQWidget(parent, name)
+OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *group = new TQVButtonGroup(i18n("Optimization Level"), this);
     Odefault = new TQRadioButton(i18n("Default"), group);
@@ -127,7 +127,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent,
 
     if (type == PgiOptionsPlugin::PGHPF) {
         optBox = new TQListView(this);
-        optBox->addColumn(TQString::null);
+        optBox->addColumn(TQString());
         optBox->header()->hide();
         for (const char * const *p = optimization_flags; *p; ++p) {
             new TQCheckListItem(optBox, *p, TQCheckListItem::CheckBox);
@@ -137,7 +137,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent,
         optBox = 0;
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 
@@ -150,7 +150,7 @@ void OptimizationTab::readFlags(TQStringList *list)
     if (optBox) {
         TQListViewItem *item = optBox->firstChild();
         for (; item; item = item->nextSibling()) {
-            TQStringList::Iterator sli = list->find(item->text(0));
+            TQStringList::Iterator sli = list->tqfind(item->text(0));
             if (sli != list->end()) {
                 static_cast<TQCheckListItem*>(item)->setOn(true);
                 list->remove(sli);
@@ -159,17 +159,17 @@ void OptimizationTab::readFlags(TQStringList *list)
     }
     
     TQStringList::Iterator sli;
-    sli = list->find("-O0");
+    sli = list->tqfind("-O0");
     if (sli != list->end()) {
         O0->setChecked(true);
         list->remove(sli);
     }
-    sli = list->find("-O1");
+    sli = list->tqfind("-O1");
     if (sli != list->end()) {
         O1->setChecked(true);
         list->remove(sli);
     }
-    sli = list->find("-O2");
+    sli = list->tqfind("-O2");
     if (sli != list->end()) {
         O2->setChecked(true);
         list->remove(sli);
@@ -195,20 +195,20 @@ void OptimizationTab::writeFlags(TQStringList *list)
 }
 
 
-HpfTab::HpfTab(TQWidget *parent, const char *name)
-    : TQWidget(parent, name)
+HpfTab::HpfTab(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     hpfBox = new TQListView(this);
-    hpfBox->addColumn(TQString::null);
+    hpfBox->addColumn(TQString());
     hpfBox->header()->hide();
     for (const char * const *p = hpf_flags; *p; ++p)
         new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox);
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 
@@ -220,7 +220,7 @@ void HpfTab::readFlags(TQStringList *list)
 {
     TQListViewItem *item = hpfBox->firstChild();
     for (; item; item = item->nextSibling()) {
-        TQStringList::Iterator sli = list->find(item->text(0));
+        TQStringList::Iterator sli = list->tqfind(item->text(0));
         if (sli != list->end()) {
             static_cast<TQCheckListItem*>(item)->setOn(true);
             list->remove(sli);
@@ -239,9 +239,9 @@ void HpfTab::writeFlags(TQStringList *list)
 }
 
 
-PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name)
+PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *tqparent, const char *name)
     : KDialogBase(Tabbed, (type == PgiOptionsPlugin::PGHPF)? i18n("PGHPF Compiler Options") : i18n("PGF77 Compiler Options"),
-                  Ok|Cancel, Ok, parent, name, true)
+                  Ok|Cancel, Ok, tqparent, name, true)
 {
     TQVBox *vbox;
 
@@ -299,8 +299,8 @@ TQString PgiOptionsDialog::flags() const
 }
 
 
-PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name)
-    : KDevCompilerOptions(parent, name)
+PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *tqparent, const char *name)
+    : KDevCompilerOptions(tqparent, name)
 {
     pgitype = type;
 }
@@ -310,9 +310,9 @@ PgiOptionsPlugin::~PgiOptionsPlugin()
 {}
 
 
-TQString PgiOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
+TQString PgiOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags)
 {
-    PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, parent, "pgi options dialog");
+    PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, tqparent, "pgi options dialog");
     TQString newFlags = flags;
     dlg->setFlags(flags);
     if (dlg->exec() == TQDialog::Accepted)
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
index aba83fbc..28392c0d 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
@@ -24,14 +24,15 @@ class HpfTab;
 class PgiOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { PGHPF, PGF77 };
     
-    PgiOptionsPlugin( Type type, TQObject *parent=0, const char *name=0 );
+    PgiOptionsPlugin( Type type, TQObject *tqparent=0, const char *name=0 );
     ~PgiOptionsPlugin();
 
-    virtual TQString exec(TQWidget *parent, const TQString &flags);
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags);
 
 private:
     Type pgitype;
@@ -41,7 +42,7 @@ private:
 class PgiOptionsDialog : public KDialogBase
 {
 public:
-    PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 );
+    PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 );
     ~PgiOptionsDialog();
 
     void setFlags(const TQString &flags);
diff --git a/languages/fortran/fixedformparser.cpp b/languages/fortran/fixedformparser.cpp
index 312d811e..8f07ad4a 100644
--- a/languages/fortran/fixedformparser.cpp
+++ b/languages/fortran/fixedformparser.cpp
@@ -73,7 +73,7 @@ void FixedFormParser::parse(const TQString &fileName)
     while (!stream.atEnd()) {
         ++lineNum;
         TQCString str = stream.readLine().local8Bit();
-        if (!str.isEmpty() && TQCString("*Cc#!").find(str[0]) != -1)
+        if (!str.isEmpty() && TQCString("*Cc#!").tqfind(str[0]) != -1)
             continue;
         // Continuation line
         if (str.length() > 6 && str.left(5) == "     " && str[5] != ' ') {
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 7d4ed1bc..63a06584 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -48,8 +48,8 @@ typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory;
 static const KDevPluginInfo data("kdevfortransupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) )
 
-FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
+FortranSupportPart::FortranSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport(&data, tqparent, name ? name : "FortranSupportPart")
 {
     setInstance(FortranSupportFactory::instance());
 
@@ -151,7 +151,7 @@ void FortranSupportPart::slotFtnchek()
         }
     }
 
-    makeFrontend()->queueCommand(TQString::null, cmdline);
+    makeFrontend()->queueCommand(TQString(), cmdline);
 }
 
 
@@ -267,7 +267,7 @@ void FortranSupportPart::savedFile(const KURL &fileName)
 {
     kdDebug(9019) << "savedFile()" << endl;
 
-    if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) {
+    if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) {
         maybeParse(fileName.path());
         emit addedSourceInfo( fileName.path() );
     }
diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h
index 2a6f8787..8bd5872b 100644
--- a/languages/fortran/fortransupportpart.h
+++ b/languages/fortran/fortransupportpart.h
@@ -23,9 +23,10 @@ class KDevMakeFrontend;
 class FortranSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FortranSupportPart( TQObject *parent, const char *name, const TQStringList & );
+    FortranSupportPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~FortranSupportPart();
 
 protected:
diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp
index 1c50a1e1..eaef8434 100644
--- a/languages/fortran/ftnchekconfigwidget.cpp
+++ b/languages/fortran/ftnchekconfigwidget.cpp
@@ -22,12 +22,12 @@
 #include "domutil.h"
 
 
-class FtnchekItem : public QCheckListItem
+class FtnchekItem : public TQCheckListItem
 {
 public:
-    FtnchekItem(TQListView *parent, const TQString &flagstr,
+    FtnchekItem(TQListView *tqparent, const TQString &flagstr,
                 const TQString &description)
-        : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox),
+        : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox),
           flag(flagstr), desc(description)
     {
         setText(1, desc);
@@ -48,7 +48,7 @@ void FtnchekItem::readFlagsToListView(TQListView *listview, TQStringList *list)
     TQListViewItem *item = listview->firstChild();
     for (; item; item = item->nextSibling()) {
         FtnchekItem *flitem = static_cast<FtnchekItem*>(item);
-        TQStringList::Iterator sli = list->find(flitem->flag);
+        TQStringList::Iterator sli = list->tqfind(flitem->flag);
         if (sli != list->end()) {
             flitem->setOn(true);
             list->remove(sli);
@@ -70,21 +70,21 @@ void FtnchekItem::writeFlagsFromListView(TQListView *listview, TQStringList *lis
 }
 
 
-class FtnchekToolTip : public QToolTip
+class FtnchekToolTip : public TQToolTip
 {
 public:
-    FtnchekToolTip(TQWidget *parent)
-        : TQToolTip(parent)
+    FtnchekToolTip(TQWidget *tqparent)
+        : TQToolTip(tqparent)
     {}
 protected:
     void maybeTip(const TQPoint &pos)
     {
-        TQListView *listview = static_cast<TQListView*>(parentWidget());
+        TQListView *listview = static_cast<TQListView*>(tqparentWidget());
         TQListViewItem *item = listview->itemAt(pos);
         FtnchekItem *flitem = static_cast<FtnchekItem*>(item);
 
         if (item)
-            tip(listview->itemRect(item), flitem->desc);
+            tip(listview->tqitemRect(item), flitem->desc);
     }
 };
 
@@ -141,14 +141,14 @@ const char *f77_flags[] = {
 
 const char *portability_flags[] = {
     "backslash",        I18N_NOOP("Backslash characters in strings"),
-    "common-alignment", I18N_NOOP("COMMON block variables not in descending order of storage sizes"),
+    "common-tqalignment", I18N_NOOP("COMMON block variables not in descending order of storage sizes"),
     "hollerith",        I18N_NOOP("Hollerith constants"),
     0,                  0
 };
 
 
-FtnchekConfigWidget::FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name)
-    : FtnchekConfigWidgetBase(parent, name), dom(projectDom)
+FtnchekConfigWidget::FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name)
+    : FtnchekConfigWidgetBase(tqparent, name), dom(projectDom)
 {
     arguments_group = new TQButtonGroup;
     arguments_group->insert(argumentsall_button);
diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchekconfigwidget.h
index 703b2462..78cdd93e 100644
--- a/languages/fortran/ftnchekconfigwidget.h
+++ b/languages/fortran/ftnchekconfigwidget.h
@@ -20,9 +20,10 @@ class TQButtonGroup;
 class FtnchekConfigWidget : public FtnchekConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name);
+    FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name);
     ~FtnchekConfigWidget();
 
 public slots:
diff --git a/languages/fortran/ftnchekconfigwidgetbase.ui b/languages/fortran/ftnchekconfigwidgetbase.ui
index b6bb2184..d7180514 100644
--- a/languages/fortran/ftnchekconfigwidgetbase.ui
+++ b/languages/fortran/ftnchekconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>FtnchekConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ftcheck_config_widget</cstring>
     </property>
@@ -25,11 +25,11 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>TabWidget4</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -40,7 +40,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox" row="0" column="2">
+                    <widget class="TQCheckBox" row="0" column="2">
                         <property name="name">
                             <cstring>extern_box</cstring>
                         </property>
@@ -48,7 +48,7 @@
                             <string>&amp;External subprograms without definition</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="2">
+                    <widget class="TQCheckBox" row="1" column="2">
                         <property name="name">
                             <cstring>division_box</cstring>
                         </property>
@@ -56,7 +56,7 @@
                             <string>&amp;Divisions</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>declare_box</cstring>
                         </property>
@@ -64,7 +64,7 @@
                             <string>&amp;Identifiers without explicit type</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="0">
+                    <widget class="TQCheckBox" row="1" column="0">
                         <property name="name">
                             <cstring>pure_box</cstring>
                         </property>
@@ -82,14 +82,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>TextLabel1</cstring>
                         </property>
@@ -100,7 +100,7 @@
                             <cstring>argumentsall_button</cstring>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="4" column="0">
+                    <widget class="TQRadioButton" row="4" column="0">
                         <property name="name">
                             <cstring>argumentsall_button</cstring>
                         </property>
@@ -111,7 +111,7 @@
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="5" column="0">
+                    <widget class="TQRadioButton" row="5" column="0">
                         <property name="name">
                             <cstring>argumentsonly_button</cstring>
                         </property>
@@ -132,7 +132,7 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -149,14 +149,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QRadioButton" row="4" column="2">
+                    <widget class="TQRadioButton" row="4" column="2">
                         <property name="name">
                             <cstring>commonall_button</cstring>
                         </property>
@@ -164,7 +164,7 @@
                             <string>All</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="5" column="2">
+                    <widget class="TQRadioButton" row="5" column="2">
                         <property name="name">
                             <cstring>commononly_button</cstring>
                         </property>
@@ -175,7 +175,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QListView" row="6" column="0">
+                    <widget class="TQListView" row="6" column="0">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -205,7 +205,7 @@
                             <enum>NoColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QListView" row="6" column="2">
+                    <widget class="TQListView" row="6" column="2">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -235,7 +235,7 @@
                             <enum>NoColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="2">
+                    <widget class="TQLabel" row="3" column="2">
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
@@ -248,7 +248,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -259,7 +259,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QRadioButton" row="2" column="0">
+                    <widget class="TQRadioButton" row="2" column="0">
                         <property name="name">
                             <cstring>truncationonly_button</cstring>
                         </property>
@@ -270,7 +270,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel4</cstring>
                         </property>
@@ -281,7 +281,7 @@
                             <cstring>truncationall_button</cstring>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="1" column="0">
+                    <widget class="TQRadioButton" row="1" column="0">
                         <property name="name">
                             <cstring>truncationall_button</cstring>
                         </property>
@@ -289,7 +289,7 @@
                             <string>All</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="2">
+                    <widget class="TQLabel" row="0" column="2">
                         <property name="name">
                             <cstring>TextLabel3</cstring>
                         </property>
@@ -300,7 +300,7 @@
                             <cstring>usageall_button</cstring>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="1" column="2">
+                    <widget class="TQRadioButton" row="1" column="2">
                         <property name="name">
                             <cstring>usageall_button</cstring>
                         </property>
@@ -308,7 +308,7 @@
                             <string>All</string>
                         </property>
                     </widget>
-                    <widget class="QListView" row="3" column="0">
+                    <widget class="TQListView" row="3" column="0">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -338,7 +338,7 @@
                             <enum>NoColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="2" column="2">
+                    <widget class="TQRadioButton" row="2" column="2">
                         <property name="name">
                             <cstring>usageonly_button</cstring>
                         </property>
@@ -359,14 +359,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QListView" row="3" column="2">
+                    <widget class="TQListView" row="3" column="2">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -398,7 +398,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -409,7 +409,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                    <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>f77all_button</cstring>
                         </property>
@@ -417,7 +417,7 @@
                             <string>All</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
+                    <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>f77only_button</cstring>
                         </property>
@@ -428,7 +428,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QListView" row="3" column="0">
+                    <widget class="TQListView" row="3" column="0">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -458,7 +458,7 @@
                             <enum>NoColumn</enum>
                         </property>
                     </widget>
-                    <widget class="QListView" row="3" column="2">
+                    <widget class="TQListView" row="3" column="2">
                         <column>
                             <property name="text">
                                 <string></string>
@@ -498,14 +498,14 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel4_2</cstring>
                         </property>
@@ -516,7 +516,7 @@
                             <cstring>f77all_button</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="2">
+                    <widget class="TQLabel" row="0" column="2">
                         <property name="name">
                             <cstring>TextLabel3_2</cstring>
                         </property>
@@ -527,7 +527,7 @@
                             <cstring>portabilityall_button</cstring>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="1" column="2">
+                    <widget class="TQRadioButton" row="1" column="2">
                         <property name="name">
                             <cstring>portabilityall_button</cstring>
                         </property>
@@ -535,7 +535,7 @@
                             <string>All</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="2" column="2">
+                    <widget class="TQRadioButton" row="2" column="2">
                         <property name="name">
                             <cstring>portabilityonly_button</cstring>
                         </property>
@@ -579,6 +579,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp
index 623e816f..f205ddd3 100644
--- a/languages/java/JavaLexer.cpp
+++ b/languages/java/JavaLexer.cpp
@@ -275,7 +275,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken JavaLexer::nextToken()
 					theRetToken=_returnToken;
 				}
 				else if ((LA(1) == 0x3d /* '=' */ ) && (LA(2) == 0x3d /* '=' */ )) {
-					mEQUAL(true);
+					mETQUAL(true);
 					theRetToken=_returnToken;
 				}
 				else if ((LA(1) == 0x21 /* '!' */ ) && (LA(2) == 0x3d /* '=' */ )) {
@@ -571,9 +571,9 @@ void JavaLexer::mASSIGN(bool _createToken) {
 	_saveIndex=0;
 }
 
-void JavaLexer::mEQUAL(bool _createToken) {
+void JavaLexer::mETQUAL(bool _createToken) {
 	int _ttype; ANTLR_USE_NAMESPACE(antlr)RefToken _token; ANTLR_USE_NAMESPACE(std)string::size_type _begin = text.length();
-	_ttype = EQUAL;
+	_ttype = ETQUAL;
 	ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex;
 	
 	match("==");
diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.hpp
index 9d185686..85d661be 100644
--- a/languages/java/JavaLexer.hpp
+++ b/languages/java/JavaLexer.hpp
@@ -68,7 +68,7 @@ public:
 	public: void mCOLON(bool _createToken);
 	public: void mCOMMA(bool _createToken);
 	public: void mASSIGN(bool _createToken);
-	public: void mEQUAL(bool _createToken);
+	public: void mETQUAL(bool _createToken);
 	public: void mLNOT(bool _createToken);
 	public: void mBNOT(bool _createToken);
 	public: void mNOT_EQUAL(bool _createToken);
diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp
index 1021c6a0..eb17df00 100644
--- a/languages/java/JavaRecognizer.cpp
+++ b/languages/java/JavaRecognizer.cpp
@@ -4181,7 +4181,7 @@ void JavaRecognizer::equalityExpression() {
 		}
 		{ // ( ... )*
 		for (;;) {
-			if ((LA(1) == NOT_EQUAL || LA(1) == EQUAL)) {
+			if ((LA(1) == NOT_EQUAL || LA(1) == ETQUAL)) {
 				{
 				switch ( LA(1)) {
 				case NOT_EQUAL:
@@ -4194,14 +4194,14 @@ void JavaRecognizer::equalityExpression() {
 					match(NOT_EQUAL);
 					break;
 				}
-				case EQUAL:
+				case ETQUAL:
 				{
 					RefJavaAST tmp139_AST = RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST);
 					if ( inputState->guessing == 0 ) {
 						tmp139_AST = astFactory->create(LT(1));
 						astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(tmp139_AST));
 					}
-					match(EQUAL);
+					match(ETQUAL);
 					break;
 				}
 				default:
@@ -4272,7 +4272,7 @@ void JavaRecognizer::relationalExpression() {
 		case BXOR:
 		case BAND:
 		case NOT_EQUAL:
-		case EQUAL:
+		case ETQUAL:
 		case LT_:
 		case GT:
 		case LE:
@@ -4969,7 +4969,7 @@ void JavaRecognizer::postfixExpression() {
 				case BXOR:
 				case BAND:
 				case NOT_EQUAL:
-				case EQUAL:
+				case ETQUAL:
 				case LT_:
 				case GT:
 				case LE:
@@ -5107,7 +5107,7 @@ void JavaRecognizer::postfixExpression() {
 					case BXOR:
 					case BAND:
 					case NOT_EQUAL:
-					case EQUAL:
+					case ETQUAL:
 					case LT_:
 					case GT:
 					case LE:
@@ -5235,7 +5235,7 @@ void JavaRecognizer::postfixExpression() {
 		case BXOR:
 		case BAND:
 		case NOT_EQUAL:
-		case EQUAL:
+		case ETQUAL:
 		case LT_:
 		case GT:
 		case LE:
@@ -5581,7 +5581,7 @@ void JavaRecognizer::newExpression() {
 			case BXOR:
 			case BAND:
 			case NOT_EQUAL:
-			case EQUAL:
+			case ETQUAL:
 			case LT_:
 			case GT:
 			case LE:
@@ -5651,7 +5651,7 @@ void JavaRecognizer::newExpression() {
 			case BXOR:
 			case BAND:
 			case NOT_EQUAL:
-			case EQUAL:
+			case ETQUAL:
 			case LT_:
 			case GT:
 			case LE:
@@ -6113,7 +6113,7 @@ const char* JavaRecognizer::tokenNames[] = {
 	"BXOR",
 	"BAND",
 	"NOT_EQUAL",
-	"EQUAL",
+	"ETQUAL",
 	"LT_",
 	"GT",
 	"LE",
@@ -6173,7 +6173,7 @@ const unsigned long JavaRecognizer::_tokenSet_4_data_[] = { 0UL, 67215360UL, 687
 // SEMI LBRACK RBRACK IDENT LCURLY RCURLY COMMA "implements" LPAREN RPAREN 
 // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN 
 // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION 
-// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_4(_tokenSet_4_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_5_data_[] = { 0UL, 8192UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI 
@@ -6204,13 +6204,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_9(_tokenSet_9_d
 const unsigned long JavaRecognizer::_tokenSet_10_data_[] = { 0UL, 67182592UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK IDENT RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_10(_tokenSet_10_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_11_data_[] = { 0UL, 201433088UL, 683008UL, 4194296UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI LBRACK RBRACK IDENT DOT RCURLY COMMA LPAREN RPAREN ASSIGN COLON 
 // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN 
 // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR 
-// LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_11(_tokenSet_11_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_12_data_[] = { 0UL, 32768UL, 8192UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // LBRACK LPAREN 
@@ -6235,7 +6235,7 @@ const unsigned long JavaRecognizer::_tokenSet_16_data_[] = { 2UL, 4294943616UL,
 // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" 
 // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6275,7 +6275,7 @@ const unsigned long JavaRecognizer::_tokenSet_22_data_[] = { 0UL, 4294878080UL,
 // COLON "if" "for" "while" "do" "break" "continue" "return" "switch" "throw" 
 // "try" PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN 
 // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR 
-// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR 
+// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR 
 // PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT 
 // CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_22(_tokenSet_22_data_,12);
@@ -6323,7 +6323,7 @@ const unsigned long JavaRecognizer::_tokenSet_29_data_[] = { 0UL, 4294878080UL,
 // COLON "if" "else" "for" "while" "do" "break" "continue" "return" "switch" 
 // "throw" "case" "default" "try" "finally" "catch" PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6348,7 +6348,7 @@ const unsigned long JavaRecognizer::_tokenSet_33_data_[] = { 0UL, 536780800UL, 2
 // SEMI LBRACK "void" "boolean" "byte" "char" "short" "int" "float" "long" 
 // "double" IDENT DOT STAR LPAREN "this" "super" ASSIGN PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6377,7 +6377,7 @@ const unsigned long JavaRecognizer::_tokenSet_39_data_[] = { 0UL, 402759680UL, 6
 // SEMI LBRACK RBRACK DOT STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN 
 // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN 
 // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR 
-// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
+// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
 // DIV MOD INC DEC 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_39(_tokenSet_39_data_,12);
 const unsigned long JavaRecognizer::_tokenSet_40_data_[] = { 0UL, 73728UL, 543744UL, 0UL, 0UL, 0UL, 0UL, 0UL };
@@ -6395,7 +6395,7 @@ const unsigned long JavaRecognizer::_tokenSet_43_data_[] = { 0UL, 536780800UL, 2
 // "double" IDENT DOT STAR COMMA LPAREN "this" "super" ASSIGN PLUS_ASSIGN 
 // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN 
 // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR 
-// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
+// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
 // DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL 
 // STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_43(_tokenSet_43_data_,12);
@@ -6467,18 +6467,18 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_55(_tokenSet_55
 const unsigned long JavaRecognizer::_tokenSet_56_data_[] = { 0UL, 73728UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_56(_tokenSet_56_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_57_data_[] = { 0UL, 73728UL, 674816UL, 134217720UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_57(_tokenSet_57_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_58_data_[] = { 0UL, 73728UL, 674816UL, 1073741816UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_58(_tokenSet_58_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_59_data_[] = { 0UL, 268435456UL, 0UL, 0UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
@@ -6487,13 +6487,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_59(_tokenSet_59
 const unsigned long JavaRecognizer::_tokenSet_60_data_[] = { 0UL, 73728UL, 674816UL, 4294967288UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_60(_tokenSet_60_data_,8);
 const unsigned long JavaRecognizer::_tokenSet_61_data_[] = { 0UL, 268509184UL, 674816UL, 4294967288UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI RBRACK STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_61(_tokenSet_61_data_,12);
 const unsigned long JavaRecognizer::_tokenSet_62_data_[] = { 0UL, 134086656UL, 106496UL, 0UL, 65472UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
@@ -6506,7 +6506,7 @@ const unsigned long JavaRecognizer::_tokenSet_63_data_[] = { 0UL, 536846336UL, 7
 // "long" "double" IDENT DOT STAR RCURLY COMMA LPAREN RPAREN "this" "super" 
 // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN 
 // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION 
-// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL 
+// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL 
 // SR BSR PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" 
 // NUM_INT CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_63(_tokenSet_63_data_,12);
@@ -6518,7 +6518,7 @@ const unsigned long JavaRecognizer::_tokenSet_64_data_[] = { 0UL, 4294943616UL,
 // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" 
 // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN 
 // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN 
-// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL 
+// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL 
 // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT 
 // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL 
 // NUM_FLOAT NUM_LONG NUM_DOUBLE 
@@ -6533,7 +6533,7 @@ const unsigned long JavaRecognizer::_tokenSet_66_data_[] = { 0UL, 402759680UL, 6
 // SEMI LBRACK RBRACK DOT STAR LCURLY RCURLY COMMA RPAREN ASSIGN COLON 
 // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN 
 // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR 
-// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR 
+// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR 
 // PLUS MINUS DIV MOD INC DEC 
 const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_66(_tokenSet_66_data_,12);
 
diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp
index fab59972..4dafc60e 100644
--- a/languages/java/JavaRecognizer.hpp
+++ b/languages/java/JavaRecognizer.hpp
@@ -103,7 +103,7 @@
  *		o  supports UNICODE?
  *		   Using Unicode charVocabulay makes code file big, but only
  *		   in the bitsets at the end. I need to make ANTLR generate
- *		   unicode bitsets more efficiently.
+ *		   tqunicode bitsets more efficiently.
  * Version 1.19 (April 25, 2002)
  *		Terence added in nice fixes by John Pybus concerning floating
  *		constants and problems with super() calls.  John did a nice
diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp
index 1bdb9522..ac5cfc5e 100644
--- a/languages/java/JavaStoreWalker.cpp
+++ b/languages/java/JavaStoreWalker.cpp
@@ -1046,9 +1046,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 #line 264 "java.store.g"
 		
 										meth->setResultType( tp );
-										if( m.contains("public") )
+										if( m.tqcontains("public") )
 										    meth->setAccess( CodeModelItem::Public );
-										else if( m.contains("protected") )
+										else if( m.tqcontains("protected") )
 										    meth->setAccess( CodeModelItem::Protected );
 										else
 										    meth->setAccess( CodeModelItem::Private );
@@ -1096,14 +1096,14 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 #line 300 "java.store.g"
 		
 										attr->setType( tp );
-										if( m.contains("public") )
+										if( m.tqcontains("public") )
 										    attr->setAccess( CodeModelItem::Public );
-										else if( m.contains("protected") )
+										else if( m.tqcontains("protected") )
 										    attr->setAccess( CodeModelItem::Protected );
 										else
 										    attr->setAccess( CodeModelItem::Private );
 		
-										attr->setStatic( m.contains("static") );
+										attr->setStatic( m.tqcontains("static") );
 										
 #line 1109 "JavaStoreWalker.cpp"
 	}
@@ -1144,9 +1144,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 		_t = _t->getNextSibling();
 #line 247 "java.store.g"
 		
-										if( m.contains("public") )
+										if( m.tqcontains("public") )
 										    meth->setAccess( CodeModelItem::Public );
-										else if( m.contains("protected") )
+										else if( m.tqcontains("protected") )
 										    meth->setAccess( CodeModelItem::Protected );
 										else
 										    meth->setAccess( CodeModelItem::Private );
@@ -1212,9 +1212,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) {
 #line 282 "java.store.g"
 		
 										meth->setResultType( tp );
-										if( m.contains("public") )
+										if( m.tqcontains("public") )
 										    meth->setAccess( CodeModelItem::Public );
-										else if( m.contains("protected") )
+										else if( m.tqcontains("protected") )
 										    meth->setAccess( CodeModelItem::Protected );
 										else
 										    meth->setAccess( CodeModelItem::Private );
@@ -2447,11 +2447,11 @@ void JavaStoreWalker::expr(RefJavaAST _t) {
 			_t = _t->getNextSibling();
 			break;
 		}
-		case EQUAL:
+		case ETQUAL:
 		{
 			RefJavaAST __t145 = _t;
 			RefJavaAST tmp104_AST_in = _t;
-			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL);
+			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL);
 			_t = _t->getFirstChild();
 			expr(_t);
 			_t = _retTree;
@@ -2830,7 +2830,7 @@ void JavaStoreWalker::primaryExpression(RefJavaAST _t) {
 			case BXOR:
 			case BAND:
 			case NOT_EQUAL:
-			case EQUAL:
+			case ETQUAL:
 			case LT_:
 			case GT:
 			case LE:
@@ -3389,7 +3389,7 @@ const char* JavaStoreWalker::tokenNames[] = {
 	"BXOR",
 	"BAND",
 	"NOT_EQUAL",
-	"EQUAL",
+	"ETQUAL",
 	"LT_",
 	"GT",
 	"LE",
diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.hpp
index 44322944..6f20deaf 100644
--- a/languages/java/JavaStoreWalkerTokenTypes.hpp
+++ b/languages/java/JavaStoreWalkerTokenTypes.hpp
@@ -125,7 +125,7 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes {
 		BXOR = 114,
 		BAND = 115,
 		NOT_EQUAL = 116,
-		EQUAL = 117,
+		ETQUAL = 117,
 		LT_ = 118,
 		GT = 119,
 		LE = 120,
diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.hpp
index e36fa54c..64a6486b 100644
--- a/languages/java/JavaTokenTypes.hpp
+++ b/languages/java/JavaTokenTypes.hpp
@@ -125,7 +125,7 @@ struct CUSTOM_API JavaTokenTypes {
 		BXOR = 114,
 		BAND = 115,
 		NOT_EQUAL = 116,
-		EQUAL = 117,
+		ETQUAL = 117,
 		LT_ = 118,
 		GT = 119,
 		LE = 120,
diff --git a/languages/java/KDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h
index ae5ee39f..da8ed9b3 100644
--- a/languages/java/KDevJavaSupportIface.h
+++ b/languages/java/KDevJavaSupportIface.h
@@ -10,6 +10,7 @@ class JavaSupportPart;
 class KDevJavaSupportIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
     KDevJavaSupportIface( JavaSupportPart* javaSupport );
diff --git a/languages/java/README.dox b/languages/java/README.dox
index 49af1e43..618ddd50 100644
--- a/languages/java/README.dox
+++ b/languages/java/README.dox
@@ -13,7 +13,7 @@ and images.
 \maintainer <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
 
 \feature Java language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a>
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index 1ead5458..0a25ea22 100644
--- a/languages/java/app_templates/kappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
@@ -22,10 +22,10 @@ public class %{APPNAME}View extends QWidget
 
     QHBoxLayout top_layout;
 
-public %{APPNAME}View(QWidget parent)
+public %{APPNAME}View(QWidget tqparent)
 {
-    super(parent, null);
-    // setup our layout manager to automatically add our widgets
+    super(tqparent, null);
+    // setup our tqlayout manager to automatically add our widgets
     top_layout = new QHBoxLayout(this);
     top_layout.setAutoAdd(true);
 
diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java
index a50fdb31..4ba240f9 100644
--- a/languages/java/app_templates/kappjava/pref.java
+++ b/languages/java/app_templates/kappjava/pref.java
@@ -28,22 +28,22 @@ public %{APPNAME}Preferences()
 }
 
 public class %{APPNAME}PrefPageOne extends QFrame {
-public %{APPNAME}PrefPageOne(QWidget parent)
+public %{APPNAME}PrefPageOne(QWidget tqparent)
 {
-    super(parent);
-    QHBoxLayout layout = new QHBoxLayout(this);
-    layout.setAutoAdd(true);
+    super(tqparent);
+    QHBoxLayout tqlayout = new QHBoxLayout(this);
+    tqlayout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
 }
 
 public class %{APPNAME}PrefPageTwo extends QFrame {
-public %{APPNAME}PrefPageTwo(QWidget parent)
+public %{APPNAME}PrefPageTwo(QWidget tqparent)
 {
-    super(parent);
-    QHBoxLayout layout = new QHBoxLayout(this);
-    layout.setAutoAdd(true);
+    super(tqparent);
+    QHBoxLayout tqlayout = new QHBoxLayout(this);
+    tqlayout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
diff --git a/languages/java/app_templates/superwaba/src-Makefile b/languages/java/app_templates/superwaba/src-Makefile
index 84b55ece..f2a2a1ab 100644
--- a/languages/java/app_templates/superwaba/src-Makefile
+++ b/languages/java/app_templates/superwaba/src-Makefile
@@ -114,7 +114,7 @@ WABAEXTRADIR    = $(WABADIR)/superwaba
 ################################################################################
 # the classpath will have to tell java where to find the waba stuff.
 #
-# the CLASSPATH here is set to let java find
+# the CLASSPATH here is set to let java tqfind
 # - the classes it needs to produce the executable class files
 # - the waba.applet class, Warp.class, and Exegen.class
 #
@@ -198,7 +198,7 @@ $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES)
 # $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES)
 #	$(WARP) $(WARPFLAGS) $(PDBBASENAME) $(MAINCLASS) $(EXTRACLASSES)
 
-#  Below, we just tell make how to create foo.class if it can find
+#  Below, we just tell make how to create foo.class if it can tqfind
 #  foo.java
 
 %.class: %.java
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 0820b4d1..e1f058c7 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -16,11 +16,7 @@
 #include "kdevdeepcopy.h"
 #include "kdevdriver.h"
 
-#if QT_VERSION < 0x030100
-#include <kdevmutex.h>
-#else
 #include <tqmutex.h>
-#endif
 
 #include <kparts/part.h>
 #include <ktexteditor/editinterface.h>
@@ -92,7 +88,7 @@ public:
 	    return contents;
 	}
 
-	return TQString::null;
+	return TQString();
     }
 
     virtual bool isModified( const TQString& fileName )
@@ -126,7 +122,7 @@ public:
 	return m_fileList.count();
     }
 
-    QPair<TQString, bool> front() const
+    TQPair<TQString, bool> front() const
     {
 	TQMutexLocker locker( &m_mutex );
 	return m_fileList.front();
@@ -141,7 +137,7 @@ public:
     void push_back( const TQString& fileName, bool readFromDisk=false )
     {
 	TQMutexLocker locker( &m_mutex );
-	m_fileList.append( qMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?!
+	m_fileList.append( tqMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?!
     }
 
     void pop_front()
@@ -150,10 +146,10 @@ public:
 	m_fileList.pop_front();
     }
 
-    bool contains( const TQString& fileName ) const
+    bool tqcontains( const TQString& fileName ) const
     {
 	TQMutexLocker locker( &m_mutex );
-	TQValueList< QPair<TQString, bool> >::ConstIterator it = m_fileList.begin();
+	TQValueList< TQPair<TQString, bool> >::ConstIterator it = m_fileList.begin();
 	while( it != m_fileList.end() ){
 	    if( (*it).first == fileName )
 		return true;
@@ -165,7 +161,7 @@ public:
     void remove( const TQString& fileName )
     {
 	TQMutexLocker locker( &m_mutex );
-	TQValueList< QPair<TQString, bool> >::Iterator it = m_fileList.begin();
+	TQValueList< TQPair<TQString, bool> >::Iterator it = m_fileList.begin();
 	while( it != m_fileList.end() ){
 	    if( (*it).first == fileName )
 		m_fileList.remove( it );
@@ -175,7 +171,7 @@ public:
 
 private:
     mutable TQMutex m_mutex;
-    TQValueList< QPair<TQString, bool> > m_fileList;
+    TQValueList< TQPair<TQString, bool> > m_fileList;
 };
 
 BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* consumed )
@@ -203,7 +199,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk )
     TQString fn = deepCopy( fileName );
 
     bool added = false;
-    if( !m_fileList->contains(fn) ){
+    if( !m_fileList->tqcontains(fn) ){
         m_fileList->push_back( fn, readFromDisk );
 	added = true;
     }
@@ -261,7 +257,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
 
     static_cast<KDevSourceProvider*>( m_driver->sourceProvider() )->setReadFromDisk( false );
 
-    if( m_unitDict.find(fileName) != m_unitDict.end() ){
+    if( m_unitDict.tqfind(fileName) != m_unitDict.end() ){
 	Unit* u = m_unitDict[ fileName ];
 	m_unitDict.remove( fileName );
 	delete( u );
@@ -270,13 +266,13 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
 
     m_unitDict.insert( fileName, unit );
 
-    if( m_fileList->contains(fileName) ){
-        kdDebug(9013) << "========================> FILE: " << fileName << " IN QUEUE <=============" << endl;
+    if( m_fileList->tqcontains(fileName) ){
+        kdDebug(9013) << "========================> FILE: " << fileName << " IN TQUEUE <=============" << endl;
     } else {
         KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) );
     }
 
-    m_currentFile = TQString::null;
+    m_currentFile = TQString();
 
     if( m_fileList->isEmpty() )
 	m_isEmpty.wakeAll();
@@ -286,7 +282,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk )
 
 Unit* BackgroundParser::findUnit( const TQString& fileName )
 {
-    TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName );
+    TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName );
     return it != m_unitDict.end() ? *it : 0;
 }
 
@@ -346,7 +342,7 @@ void BackgroundParser::run()
             break;
         }
 
-	QPair<TQString, bool> entry = m_fileList->front();
+	TQPair<TQString, bool> entry = m_fileList->front();
         TQString fileName = entry.first;
 	bool readFromDisk = entry.second;
 	m_currentFile = fileName;
diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h
index 4cc52f33..fee2bc78 100644
--- a/languages/java/backgroundparser.h
+++ b/languages/java/backgroundparser.h
@@ -40,7 +40,7 @@ protected:
     void operator = ( const Unit& source );
 };
 
-class BackgroundParser: public QThread
+class BackgroundParser: public TQThread
 {
 public:
     BackgroundParser( JavaSupportPart*, TQWaitCondition* consumed );
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index 580f60c4..1e6a7f1a 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ConfigureProblemReporter</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigureProblemReporter</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,15 +30,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>bgParserCheckbox</cstring>
                             </property>
@@ -46,7 +46,7 @@
                                 <string>&amp;Enable background parsing</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>delayLabel</cstring>
                             </property>
@@ -61,13 +61,13 @@
                             <property name="text">
                                 <string>msec</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QSlider">
+                <widget class="TQSlider">
                     <property name="name">
                         <cstring>delaySlider</cstring>
                     </property>
@@ -92,7 +92,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -132,14 +132,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>61</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton" row="3" column="1">
+                <widget class="TQPushButton" row="3" column="1">
                     <property name="name">
                         <cstring>pushButton6</cstring>
                     </property>
@@ -150,7 +150,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>pushButton5</cstring>
                     </property>
@@ -161,7 +161,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="1">
+                <widget class="TQPushButton" row="0" column="1">
                     <property name="name">
                         <cstring>pushButton3</cstring>
                     </property>
@@ -172,7 +172,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>pushButton4</cstring>
                     </property>
@@ -238,7 +238,7 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>accept()</slot>
@@ -248,9 +248,9 @@
     <slot>removeSpecialHeader()</slot>
     <slot>moveUpSpecialHeader()</slot>
     <slot>moveDownSpecialHeader()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index f68a0c80..1da526ca 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -46,7 +46,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
 
 void ConfigureProblemReporter::setDelayLabel( int delay )
 {
-    delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) );
+    delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) );
 }
 
 
diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp
index f856fc74..9a4bccdf 100644
--- a/languages/java/driver.cpp
+++ b/languages/java/driver.cpp
@@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName )
 {
     m_problems.remove( fileName );
 
-    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName );
+    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName );
     if( it != m_parsedUnits.end() ){
 	RefJavaAST unit = *it;
 	m_parsedUnits.remove( it );
@@ -110,7 +110,7 @@ void Driver::remove( const TQString & fileName )
 
 RefJavaAST Driver::takeTranslationUnit( const TQString& fileName )
 {
-    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName );
+    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName );
     RefJavaAST unit( *it );
     //m_parsedUnits.remove( it );
     m_parsedUnits[ fileName] = 0;
@@ -119,7 +119,7 @@ RefJavaAST Driver::takeTranslationUnit( const TQString& fileName )
 
 RefJavaAST Driver::translationUnit( const TQString& fileName ) const
 {
-    TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.find( fileName );
+    TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.tqfind( fileName );
     return it != m_parsedUnits.end() ? *it : RefJavaAST();
 }
 
@@ -130,7 +130,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem )
 
 TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName )
 {
-    TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName );
+    TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName );
     if( it != m_problems.end() )
         return it.data();
 
@@ -141,7 +141,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN
 
 TQValueList < Problem > Driver::problems( const TQString & fileName ) const
 {
-    TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName );
+    TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName );
     if( it != m_problems.end() )
 	return it.data();
     return TQValueList<Problem>();
@@ -152,7 +152,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc
     TQFileInfo fileInfo( fileName );
     TQString absFilePath = fileInfo.absFilePath();
 
-    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( absFilePath );
+    TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( absFilePath );
 
     if( force && it != m_parsedUnits.end() ){
 	takeTranslationUnit( absFilePath );
@@ -199,7 +199,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc
 
     }
 
-    m_currentFileName = TQString::null;
+    m_currentFileName = TQString();
     lexer = 0;
 
     fileParsed( fileName );
diff --git a/languages/java/java.g b/languages/java/java.g
index 1f825ec5..59f7e0cd 100644
--- a/languages/java/java.g
+++ b/languages/java/java.g
@@ -97,7 +97,7 @@ options {
  *		o  supports UNICODE?
  *		   Using Unicode charVocabulay makes code file big, but only
  *		   in the bitsets at the end. I need to make ANTLR generate
- *		   unicode bitsets more efficiently.
+ *		   tqunicode bitsets more efficiently.
  * Version 1.19 (April 25, 2002)
  *		Terence added in nice fixes by John Pybus concerning floating
  *		constants and problems with super() calls.  John did a nice
@@ -698,7 +698,7 @@ handler
 //            ( 2)  * / %
 //            ( 1)  ++ -- +(unary) -(unary)  ~  !  (type)
 //                  []   () (method call)  . (dot -- identifier qualification)
-//                  new   ()  (explicit parenthesis)
+//                  new   ()  (explicit tqparenthesis)
 //
 // the last two are not usually on a precedence chart; I put them in
 // to point out that new has a higher precedence than '.', so you
@@ -1050,7 +1050,7 @@ options {
 	k=4;                   // four characters of lookahead
 //	charVocabulary='\u0003'..'\uFFFF';
 	charVocabulary='\u0003'..'\u00FF';
-	// without inlining some bitset tests, couldn't do unicode;
+	// without inlining some bitset tests, couldn't do tqunicode;
 	// I need to make ANTLR generate smaller bitsets; see
 	// bottom of JavaLexer.java
 	codeGenBitsetTestThreshold=20;
diff --git a/languages/java/java.store.g b/languages/java/java.store.g
index b69b7323..d7e28c22 100644
--- a/languages/java/java.store.g
+++ b/languages/java/java.store.g
@@ -245,9 +245,9 @@ ctorDef returns [ FunctionDom meth ]				{
 		m=modifiers methodHead[meth] slist
 		)
 								{
-								if( m.contains("public") )
+								if( m.tqcontains("public") )
 								    meth->setAccess( CodeModelItem::Public );
-								else if( m.contains("protected") )
+								else if( m.tqcontains("protected") )
 								    meth->setAccess( CodeModelItem::Protected );
 								else
 								    meth->setAccess( CodeModelItem::Private );
@@ -263,9 +263,9 @@ methodDecl returns [ FunctionDom meth ]  			{
 	:	#(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth])
 								{
 								meth->setResultType( tp );
-								if( m.contains("public") )
+								if( m.tqcontains("public") )
 								    meth->setAccess( CodeModelItem::Public );
-								else if( m.contains("protected") )
+								else if( m.tqcontains("protected") )
 								    meth->setAccess( CodeModelItem::Protected );
 								else
 								    meth->setAccess( CodeModelItem::Private );
@@ -281,9 +281,9 @@ methodDef returns [ FunctionDom meth ]  			{
 	:	#(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth] (slist)?)
 								{
 								meth->setResultType( tp );
-								if( m.contains("public") )
+								if( m.tqcontains("public") )
 								    meth->setAccess( CodeModelItem::Public );
-								else if( m.contains("protected") )
+								else if( m.tqcontains("protected") )
 								    meth->setAccess( CodeModelItem::Protected );
 								else
 								    meth->setAccess( CodeModelItem::Private );
@@ -299,14 +299,14 @@ variableDef returns [ VariableDom attr ] 			{
 	:	#(VARIABLE_DEF m=modifiers tp=typeSpec variableDeclarator[attr] varInitializer)
 								{
 								attr->setType( tp );
-								if( m.contains("public") )
+								if( m.tqcontains("public") )
 								    attr->setAccess( CodeModelItem::Public );
-								else if( m.contains("protected") )
+								else if( m.tqcontains("protected") )
 								    attr->setAccess( CodeModelItem::Protected );
 								else
 								    attr->setAccess( CodeModelItem::Private );
 
-								attr->setStatic( m.contains("static") );
+								attr->setStatic( m.tqcontains("static") );
 								}
 	;
 
diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h
index e325e635..36cda51b 100644
--- a/languages/java/javasupport_events.h
+++ b/languages/java/javasupport_events.h
@@ -18,18 +18,14 @@
 #include <tqevent.h>
 #include <tqvaluelist.h>
 
-#if QT_VERSION < 0x030100
-#include <kdevmutex.h>
-#else
 #include <tqmutex.h>
-#endif
 
 enum
 {
     Event_FileParsed = TQEvent::User + 1000
 };
 
-class FileParsedEvent: public QCustomEvent
+class FileParsedEvent: public TQCustomEvent
 {
 public:
     FileParsedEvent( const TQString& fileName, const TQValueList<Problem>& problems )
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 62d4811f..e8f62fa1 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -118,8 +118,8 @@ public:
     }
 };
 
-JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"),
+JavaSupportPart::JavaSupportPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+    : KDevLanguageSupport(JavaSupportFactory::info(), tqparent, name ? name : "KDevJavaSupport"),
       m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ),
       m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false )
 {
@@ -267,13 +267,13 @@ void JavaSupportPart::activePartChanged(KParts::Part *part)
     m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part );
     m_activeViewCursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView ) : 0;
 
-    m_activeFileName = TQString::null;
+    m_activeFileName = TQString();
 
     if (m_activeDocument) {
 	m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() );
         TQFileInfo fi( m_activeFileName );
         TQString ext = fi.extension();
-        if (fileExtensions().contains(ext))
+        if (fileExtensions().tqcontains(ext))
             enabled = true;
     }
 
@@ -395,7 +395,7 @@ void JavaSupportPart::savedFile(const KURL &fileName)
     kdDebug(9013) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl;
 
     TQStringList projectFileList = project()->allFiles();
-    if (projectFileList.contains(fileName.mid ( m_projectDirectory.length() + 1 ))) {
+    if (projectFileList.tqcontains(fileName.mid ( m_projectDirectory.length() + 1 ))) {
 	maybeParse( fileName );
 	emit addedSourceInfo( fileName );
     }
@@ -481,25 +481,6 @@ void JavaSupportPart::initialParse( )
     return;
 }
 
-#if QT_VERSION < 0x030100
-// Taken from qt-3.2/tools/qdatetime.java/TQDateTime::toTime_t() and modified for normal function
-uint toTime_t(TQDateTime t)
-{
-    tm brokenDown;
-    brokenDown.tm_sec = t.time().second();
-    brokenDown.tm_min = t.time().minute();
-    brokenDown.tm_hour = t.time().hour();
-    brokenDown.tm_mday = t.date().day();
-    brokenDown.tm_mon = t.date().month() - 1;
-    brokenDown.tm_year = t.date().year() - 1900;
-    brokenDown.tm_isdst = -1;
-    int secsSince1Jan1970UTC = (int) mktime( &brokenDown );
-    if ( secsSince1Jan1970UTC < -1 )
-    secsSince1Jan1970UTC = -1;
-    return (uint) secsSince1Jan1970UTC;
-}
-#endif
-
 bool
 JavaSupportPart::parseProject( )
 {
@@ -524,7 +505,7 @@ JavaSupportPart::parseProject( )
     TQDir d( m_projectDirectory );
 
     TQDataStream stream;
-    TQMap< TQString, QPair<uint, uint> > pcs;
+    TQMap< TQString, TQPair<uint, uint> > pcs;
 
     if( TQFileInfo( project()->projectDirectory() + "/" +
 			    project()->projectName().lower() + ".kdevelop.pcs" ).exists() )
@@ -550,7 +531,7 @@ JavaSupportPart::parseProject( )
 		uint offset;
 
 		stream >> fn >> ts >> offset;
-		pcs[ fn ] = qMakePair( ts, offset );
+		pcs[ fn ] = tqMakePair( ts, offset );
 	    }
 	}
     }
@@ -575,15 +556,11 @@ JavaSupportPart::parseProject( )
 
 	    if( isValidSource(absFilePath) ){
 		TQDateTime t = fileInfo.lastModified();
-		if( m_timestamp.contains(absFilePath) && m_timestamp[absFilePath] == t )
+		if( m_timestamp.tqcontains(absFilePath) && m_timestamp[absFilePath] == t )
 		    continue;
 
-#if QT_VERSION >= 0x030100
-		if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){
-#else
-		if( pcs.contains(absFilePath) && toTime_t(t) == pcs[absFilePath].first ){
-#endif
-		    stream.device()->at( pcs[absFilePath].second );
+		if( pcs.tqcontains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){
+		    stream.tqdevice()->at( pcs[absFilePath].second );
 		    FileDom file = codeModel()->create<FileModel>();
 		    file->read( stream );
 		    codeModel()->addFile( file );
@@ -630,7 +607,7 @@ void JavaSupportPart::maybeParse( const TQString& fileName )
 	return;
     }
 
-    TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path );
+    TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path );
     if( it != m_timestamp.end() && *it == t ){
 	return;
     }
@@ -689,12 +666,12 @@ TQStringList JavaSupportPart::modifiedFileList()
 
 	TQFileInfo fileInfo( m_projectDirectory, fileName );
 
-	if( !fileExtensions().contains(fileInfo.extension()) )
+	if( !fileExtensions().tqcontains(fileInfo.extension()) )
 	    continue;
 
 	TQDateTime t = fileInfo.lastModified();
 	TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() );
-	TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path );
+	TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path );
 	if( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t )
 	    continue;
 
@@ -792,7 +769,7 @@ void JavaSupportPart::setPcsVersion( int version )
 
 TQString JavaSupportPart::formatTag( const Tag & /*inputTag*/ )
 {
-    return TQString::null;
+    return TQString();
 }
 
 void JavaSupportPart::removeWithReferences( const TQString & fileName )
@@ -810,7 +787,7 @@ void JavaSupportPart::removeWithReferences( const TQString & fileName )
 bool JavaSupportPart::isValidSource( const TQString& fileName ) const
 {
     TQFileInfo fileInfo( fileName );
-    return fileExtensions().contains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore");
+    return fileExtensions().tqcontains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore");
 }
 
 TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription )
@@ -882,26 +859,22 @@ void JavaSupportPart::saveProjectSourceInfo( )
     stream << int( fileList.size() );
     for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
 	const FileDom dom = (*it);
-#if QT_VERSION >= 0x030100
   stream << dom->name() << m_timestamp[ dom->name() ].toTime_t();
-#else
-  stream << dom->name() << toTime_t(m_timestamp[ dom->name() ]);
-#endif
-	offsets.insert( dom->name(), stream.device()->at() );
+	offsets.insert( dom->name(), stream.tqdevice()->at() );
 	stream << (uint)0; // dummy offset
     }
 
     for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
 	const FileDom dom = (*it);
-	int offset = stream.device()->at();
+	int offset = stream.tqdevice()->at();
 
 	dom->write( stream );
 
-	int end = stream.device()->at();
+	int end = stream.tqdevice()->at();
 
-	stream.device()->at( offsets[dom->name()] );
+	stream.tqdevice()->at( offsets[dom->name()] );
 	stream << offset;
-	stream.device()->at( end );
+	stream.tqdevice()->at( end );
     }
 }
 
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index 51230ff8..4b624c80 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -49,9 +49,10 @@ namespace KTextEditor
 class JavaSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    JavaSupportPart( TQObject *parent, const char *name, const TQStringList &args );
+    JavaSupportPart( TQObject *tqparent, const char *name, const TQStringList &args );
     virtual ~JavaSupportPart();
 
     bool isValid() const { return m_valid; }
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index a5beaaf2..f287f70d 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -54,13 +54,13 @@
 class ProblemItem: public KListViewItem
 {
 public:
-    ProblemItem( TQListView* parent, const TQString& level, const TQString& problem,
+    ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem,
 		 const TQString& file, const TQString& line, const TQString& column  )
-	: KListViewItem( parent, level, problem, file, line, column ) {}
+	: KListViewItem( tqparent, level, problem, file, line, column ) {}
 
-    ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem,
+    ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem,
 		 const TQString& file, const TQString& line, const TQString& column  )
-	: KListViewItem( parent, level, problem, file, line, column ) {}
+	: KListViewItem( tqparent, level, problem, file, line, column ) {}
 
     int compare( TQListViewItem* item, int column, bool ascending ) const {
 	if( column == 2 || column == 3 ){
@@ -75,8 +75,8 @@ public:
 
 };
 
-ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const char* name )
-    : KListView( parent, name ? name : "problemreporter" ),
+ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* tqparent, const char* name )
+    : KListView( tqparent, name ? name : "problemreporter" ),
       m_javaSupport( part ),
       m_document( 0 ),
       m_markIface( 0 )
@@ -214,7 +214,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p
     }
 
     TQString msg = p.text();
-    msg = msg.replace( TQRegExp("\n"), "" );
+    msg = msg.tqreplace( TQRegExp("\n"), "" );
 
     new ProblemItem( this,
 		     levelToString( p.level() ),
@@ -267,15 +267,15 @@ TQString ProblemReporter::levelToString( int level ) const
     switch( level )
     {
     case Problem::Level_Error:
-	return TQString::fromLatin1( "Error" );
+	return TQString::tqfromLatin1( "Error" );
     case Problem::Level_Warning:
-	return TQString::fromLatin1( "Warning" );
+	return TQString::tqfromLatin1( "Warning" );
     case Problem::Level_Todo:
-	return TQString::fromLatin1( "Todo" );
+	return TQString::tqfromLatin1( "Todo" );
     case Problem::Level_Fixme:
-	return TQString::fromLatin1( "Fixme" );
+	return TQString::tqfromLatin1( "Fixme" );
     default:
-        return TQString::null;
+        return TQString();
     }
 }
 
diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h
index b349b371..4ac7876d 100644
--- a/languages/java/problemreporter.h
+++ b/languages/java/problemreporter.h
@@ -38,8 +38,9 @@ namespace KTextEditor{
 
 class ProblemReporter: public KListView{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProblemReporter( JavaSupportPart* part, TQWidget* parent=0, const char* name=0 );
+    ProblemReporter( JavaSupportPart* part, TQWidget* tqparent=0, const char* name=0 );
     virtual ~ProblemReporter();
 
     void removeAllProblems( const TQString& filename );
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 5717858a..6d290532 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -37,8 +37,8 @@
 #include <kdevelop/domutil.h>
 #include <kdevelop/codemodel.h>
 
-JSCodeCompletion::JSCodeCompletion(TQObject *parent, const char *name)
-		: TQObject(parent, name)
+JSCodeCompletion::JSCodeCompletion(TQObject *tqparent, const char *name)
+		: TQObject(tqparent, name)
 {
 	m_argWidgetShow = false;
 	m_completionBoxShow=false;
diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h
index 03247917..4586836f 100644
--- a/languages/kjssupport/jscodecompletion.h
+++ b/languages/kjssupport/jscodecompletion.h
@@ -26,11 +26,12 @@ The code completion engine for Javascript.
  
 @author ian reinhart geiser
 */
-class JSCodeCompletion : public QObject
+class JSCodeCompletion : public TQObject
 {
 		Q_OBJECT
+  TQ_OBJECT
 	public:
-		JSCodeCompletion(TQObject *parent = 0, const char *name = 0);
+		JSCodeCompletion(TQObject *tqparent = 0, const char *name = 0);
 
 		~JSCodeCompletion();
 		void setActiveEditorPart(KParts::Part* editorPart);
diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp
index 31882e7c..318ff44e 100644
--- a/languages/kjssupport/kjsproblems.cpp
+++ b/languages/kjssupport/kjsproblems.cpp
@@ -23,14 +23,14 @@
 class KJSProblemItem: public KListViewItem
 {
 	public:
-		KJSProblemItem( TQListView* parent, const TQString& level, const TQString& problem,
+		KJSProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem,
 		             const TQString& file, const TQString& line, const TQString& column  )
-				: KListViewItem( parent, level, problem, file, line, column )
+				: KListViewItem( tqparent, level, problem, file, line, column )
 		{}
 
-		KJSProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem,
+		KJSProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem,
 		             const TQString& file, const TQString& line, const TQString& column  )
-				: KListViewItem( parent, level, problem, file, line, column )
+				: KListViewItem( tqparent, level, problem, file, line, column )
 		{}
 
 		int compare( TQListViewItem* item, int column, bool ascending ) const
@@ -48,7 +48,7 @@ class KJSProblemItem: public KListViewItem
 
 };
 
-KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : KListView(parent,name), m_part(part)
+KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *tqparent, const char *name) : KListView(tqparent,name), m_part(part)
 {
 	addColumn ("File");
 	addColumn ("Line #");
diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h
index 7ca0d3ee..8c5d37a1 100644
--- a/languages/kjssupport/kjsproblems.h
+++ b/languages/kjssupport/kjsproblems.h
@@ -28,9 +28,10 @@ class kjsSupportPart;
 class KJSProblems : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 
-    KJSProblems(kjsSupportPart *part, TQWidget *parent = 0L, const char *name = 0L);
+    KJSProblems(kjsSupportPart *part, TQWidget *tqparent = 0L, const char *name = 0L);
     ~KJSProblems();
 
     void clearItems();
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index dcb8c1e3..8f6afda3 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -62,8 +62,8 @@ class typeProperty
 		int depth;
 };
 
-kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
+kjsSupportPart::kjsSupportPart(TQObject *tqparent, const char *name, const TQStringList& )
+: KDevLanguageSupport(&data, tqparent, name ? name : "kjsSupportPart" )
 {
 	setInstance(kjsSupportFactory::instance());
 	setXMLFile("kdevkjssupport.rc");
@@ -157,7 +157,7 @@ void kjsSupportPart::savedFile(const TQString &fileName)
 {
 
 
-	if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 )))
+	if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 )))
 	{
 		kdDebug(9014) << "parse file " << fileName << endl;
 		parse( fileName );
@@ -326,10 +326,10 @@ void kjsSupportPart::parse(const TQString &fileName)
 				m_problemReporter->addLine(m_file->fileName(), lineNo, errorMessage.qstring());
 			}
 
-			if( line.contains("{") )
+			if( line.tqcontains("{") )
 				++depth;
 				
-			if( line.contains("}") )
+			if( line.tqcontains("}") )
 				--depth;
 
                        ++lineNo;
@@ -429,7 +429,7 @@ void kjsSupportPart::contextMenu(TQPopupMenu * popupMenu, const Context *context
 		int id = popupMenu->insertItem(i18n("Implement Slots"),
 			this, TQT_SLOT(implementSlots()));
 	else
-		m_selectedUI = TQString::null;
+		m_selectedUI = TQString();
 }
 
 void kjsSupportPart::implementSlots()
diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h
index 5e7ccdfc..3ea2b5da 100644
--- a/languages/kjssupport/kjssupport_part.h
+++ b/languages/kjssupport/kjssupport_part.h
@@ -46,8 +46,9 @@ class typeProperty;
 class kjsSupportPart : public KDevLanguageSupport
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		kjsSupportPart(TQObject *parent, const char *name, const TQStringList &);
+		kjsSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
 		~kjsSupportPart();
 	protected:
 		virtual Features features();
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index 284d0471..c9393f00 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -53,11 +53,11 @@
 #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true)
 
 
-SlotItem::SlotItem(TQListView *parent,const TQString &methodName,
+SlotItem::SlotItem(TQListView *tqparent,const TQString &methodName,
                    const TQString &specifier,
                    const TQString &access, const TQString &returnType,
                    bool isFunc,bool callBaseClass)
-: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox)
+: TQCheckListItem(tqparent,methodName,TQCheckListItem::CheckBox)
 {
   setOn(true);
   m_methodName = methodName;
@@ -94,8 +94,8 @@ void SlotItem::setAllreadyInSubclass()
 
 
 SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames,
-                               TQWidget* parent, const char* name,bool modal, WFlags fl)
-: SubclassingDlgBase(parent,name,modal,fl),
+                               TQWidget* tqparent, const char* name,bool modal, WFlags fl)
+: SubclassingDlgBase(tqparent,name,modal,fl),
 m_newFileNames(newFileNames), m_kjsSupport( kjsSupport )
 //=================================================
 {
@@ -116,8 +116,8 @@ m_newFileNames(newFileNames), m_kjsSupport( kjsSupport )
 
 
 /*SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy,
-                               TQWidget* parent, const char* name,bool modal, WFlags fl)
-: SubclassingDlgBase(parent,name,modal,fl),
+                               TQWidget* tqparent, const char* name,bool modal, WFlags fl)
+: SubclassingDlgBase(tqparent,name,modal,fl),
 m_newFileNames(dummy), m_kjsSupport( kjsSupport )
 //=================================================
 {
@@ -143,7 +143,7 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport )
   for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt)
   {
     kdDebug() << "base class " << baseClass << " class " << (*classIt)->name()
-        << " parents " << (*classIt)->baseClassList().join(",") << endl;
+        << " tqparents " << (*classIt)->baseClassList().join(",") << endl;
     if ( (*classIt)->baseClassList().findIndex(baseClass) != -1 )
     {
       kdDebug() << "base class matched " << endl;
@@ -165,7 +165,7 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport )
 bool SubclassingDlg::alreadyInSubclass(const TQString &method)
 {
   for (uint i=0;i<m_parsedMethods.count();i++)
-    if (method.find(m_parsedMethods[i])==0)
+    if (method.tqfind(m_parsedMethods[i])==0)
       return true;
   return false;
 }
@@ -188,13 +188,13 @@ void SubclassingDlg::readUiFile()
 
   // Special widget specific slots
   SlotItem *newSlot;
-  m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog");
+  m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING);
 
-  if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") )
+  if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) )
     m_canBeModal = false;
   else
     m_canBeModal = true;
-  if (m_qtBaseClassName != "TQWidget")
+  if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING)
   {
       newSlot = new SLOT_ACCEPT;
       newSlot->setOn(false);
@@ -211,7 +211,7 @@ void SubclassingDlg::readUiFile()
       m_slots << newSlot;
   }
 
-  if (m_qtBaseClassName == "TQWizard")
+  if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING)
   {
     newSlot = new SLOT_NEXT;
     m_slotView->insertItem(newSlot);
@@ -293,15 +293,15 @@ void SubclassingDlg::updateDlg()
 {
 }
 
-void SubclassingDlg::replace(TQString &string, const TQString& search, const TQString& replace)
+void SubclassingDlg::tqreplace(TQString &string, const TQString& search, const TQString& tqreplace)
 //==========================================================================================
 {
-  int nextPos = string.find(search);
+  int nextPos = string.tqfind(search);
   unsigned int searchLength = search.length();
   while (nextPos>-1)
   {
-    string = string.replace(nextPos,searchLength,replace);
-    nextPos = string.find(search,nextPos+replace.length());
+    string = string.tqreplace(nextPos,searchLength,tqreplace);
+    nextPos = string.tqfind(search,nextPos+tqreplace.length());
   }
 }
 
@@ -324,23 +324,23 @@ bool SubclassingDlg::loadBuffer(TQString &buffer, const TQString& filename)
 bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal)
 //===================================================================
 {
-  replace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper());
-  replace(buffer,"$BASEFILENAMELC$",m_formName.lower());
-  replace(buffer,"$BASEFILENAME$",m_formName);
-  replace(buffer,"$NEWCLASS$",m_edClassName->text());
-  replace(buffer,"$BASECLASS$",m_baseClassName);
-  replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower());
+  tqreplace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper());
+  tqreplace(buffer,"$BASEFILENAMELC$",m_formName.lower());
+  tqreplace(buffer,"$BASEFILENAME$",m_formName);
+  tqreplace(buffer,"$NEWCLASS$",m_edClassName->text());
+  tqreplace(buffer,"$BASECLASS$",m_baseClassName);
+  tqreplace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower());
   if (canBeModal)
   {
-    replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE");
-    replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal");
-    replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal");
+    tqreplace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE");
+    tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal");
+    tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",", modal");
   }
   else
   {
-    replace(buffer,"$CAN_BE_MODAL_H$","");
-    replace(buffer,"$CAN_BE_MODAL_CPP1$","");
-    replace(buffer,"$CAN_BE_MODAL_CPP2$","");
+    tqreplace(buffer,"$CAN_BE_MODAL_H$","");
+    tqreplace(buffer,"$CAN_BE_MODAL_CPP1$","");
+    tqreplace(buffer,"$CAN_BE_MODAL_CPP2$","");
   }
 
   return true;
@@ -397,8 +397,8 @@ void SubclassingDlg::accept()
     TQFileInfo fi(m_filename + ".js");
     TQString module = fi.baseName();
     TQString basefilename = fi.baseName(true);
-    buffer.replace(TQRegExp("\\$MODULE\\$"),module);
-    buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename);    
+    buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module);
+    buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename);    
   }
   else
     loadBuffer(buffer,m_filename+".js");
@@ -419,11 +419,11 @@ void SubclassingDlg::accept()
          slitem->m_alreadyInSubclass)
       continue;
     TQString impl = implementation;
-    replace(impl,"$RETURNTYPE$",slitem->m_returnType);
-    replace(impl,"$NEWCLASS$",m_edClassName->text());
-    replace(impl,"$METHOD$", slitem->m_methodName);
-    replace(impl,"$QTBASECLASS$", m_qtBaseClassName);
-    replace(buffer,"/*$SPECIALIZATION$*/",impl);
+    tqreplace(impl,"$RETURNTYPE$",slitem->m_returnType);
+    tqreplace(impl,"$NEWCLASS$",m_edClassName->text());
+    tqreplace(impl,"$METHOD$", slitem->m_methodName);
+    tqreplace(impl,"$TQTBASECLASS$", m_qtBaseClassName);
+    tqreplace(buffer,"/*$SPECIALIZATION$*/",impl);
   }
   kdDebug() << buffer << endl;
 
diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h
index 7d168ec0..c3573643 100644
--- a/languages/kjssupport/subclassingdlg.h
+++ b/languages/kjssupport/subclassingdlg.h
@@ -20,10 +20,10 @@ class TQStringList;
 class TQDomDocument;
 class kjsSupportPart;
 
-class SlotItem : public QCheckListItem
+class SlotItem : public TQCheckListItem
 {
   public:
-                  SlotItem(TQListView *parent,const TQString &text,
+                  SlotItem(TQListView *tqparent,const TQString &text,
                            const TQString &specifier, const TQString &Access,
                            const TQString &returnType,bool isFunc,
                            bool callBaseClass=false);
@@ -42,10 +42,10 @@ class SubclassingDlg : public SubclassingDlgBase
 {
 public:
                         SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames,
-                                       TQWidget* parent = 0, const char* name = 0,
+                                       TQWidget* tqparent = 0, const char* name = 0,
                                        bool modal = FALSE, WFlags fl = 0 );
 /*                        SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy,
-                                       TQWidget* parent = 0, const char* name = 0,
+                                       TQWidget* tqparent = 0, const char* name = 0,
                                        bool modal = FALSE, WFlags fl = 0 );*/
                         ~SubclassingDlg();
 
@@ -54,7 +54,7 @@ private:
   TQString               readBaseClassName();
   void                  updateDlg();
   bool                  replaceKeywords(TQString &buffer, bool canBeModal=true);
-  void                  replace(TQString &string, const TQString& search, const TQString& replace);
+  void                  tqreplace(TQString &string, const TQString& search, const TQString& tqreplace);
   bool                  saveBuffer(TQString &buffer, const TQString& filename);
   bool                  loadBuffer(TQString &buffer, const TQString& filename);
   bool                  alreadyInSubclass(const TQString &method);
diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui
index fea5ef6d..711250bd 100644
--- a/languages/kjssupport/subclassingdlgbase.ui
+++ b/languages/kjssupport/subclassingdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SubclassingDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SubclassingDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>reformat_box</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <string>Re&amp;format source</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="2">
+                <widget class="TQCheckBox" row="4" column="2">
                     <property name="name">
                         <cstring>reformatDefault_box</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>Reformat source by &amp;default</string>
                     </property>
                 </widget>
-                <widget class="QListView" row="3" column="0" rowspan="1" colspan="3">
+                <widget class="TQListView" row="3" column="0" rowspan="1" colspan="3">
                     <column>
                         <property name="text">
                             <string>Method</string>
@@ -114,23 +114,23 @@
                         <cstring>m_slotView</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Specialize following slots:</string>
+                        <string>&amp;Specialize following Q_SLOTS:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>m_slotView</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
+                <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>m_edFileName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <cstring>m_edFileName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -168,14 +168,14 @@
                         <cstring>m_edClassName</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+                <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>m_edClassName</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>m_btnOk</cstring>
             </property>
@@ -186,7 +186,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>m_btnCancel</cstring>
             </property>
@@ -204,7 +204,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>
@@ -245,9 +245,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>onChangedClassName()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox
index 2e141fd3..6dfb64ab 100644
--- a/languages/lib/debugger/Mainpage.dox
+++ b/languages/lib/debugger/Mainpage.dox
@@ -12,7 +12,7 @@ This library contains classes to implement debugger support for a programming la
 Each debugger support plugin must interact with an editor to set breakpoints,
 jump to execution points, etc. This kind of interaction is implemented in
 @ref Debugger class. Your debugger support plugin just need to create
-an instance of @ref Debugger class and connect its signals, for example:
+an instance of @ref Debugger class and connect its Q_SIGNALS, for example:
 @code
 m_debugger = new Debugger( partController() );
 
diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp
index 5d33ee8c..8bfebb33 100644
--- a/languages/lib/debugger/debugger.cpp
+++ b/languages/lib/debugger/debugger.cpp
@@ -50,7 +50,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool
     iface->removeMark( lineNum, Breakpoint | ActiveBreakpoint | ReachedBreakpoint | DisabledBreakpoint );
 
     BPItem bpItem(fileName, lineNum);
-    TQValueList<BPItem>::Iterator it = BPList.find(bpItem);
+    TQValueList<BPItem>::Iterator it = BPList.tqfind(bpItem);
     if (it != BPList.end())
     {
 //        kdDebug(9012) << "Removing BP=" << fileName << ":" << lineNum << endl;
diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h
index f1a48452..0b813f66 100644
--- a/languages/lib/debugger/debugger.h
+++ b/languages/lib/debugger/debugger.h
@@ -24,7 +24,7 @@ class BPItem
 {
 public:
     /**
-    * default ctor - required from QValueList
+    * default ctor - required from TQValueList
     */
     BPItem() : m_fileName(""), m_lineNum(0)
     {}
@@ -57,6 +57,7 @@ private:
 class Debugger : public KDevDebugger
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/languages/lib/debugger/kdevdebugger.cpp b/languages/lib/debugger/kdevdebugger.cpp
index b9ee4a05..416f567c 100644
--- a/languages/lib/debugger/kdevdebugger.cpp
+++ b/languages/lib/debugger/kdevdebugger.cpp
@@ -19,8 +19,8 @@
 */
 #include "kdevdebugger.h"
 
-KDevDebugger::KDevDebugger(TQObject *parent, const char *name)
-  : TQObject(parent, name)
+KDevDebugger::KDevDebugger(TQObject *tqparent, const char *name)
+  : TQObject(tqparent, name)
 {
 }
 
diff --git a/languages/lib/debugger/kdevdebugger.h b/languages/lib/debugger/kdevdebugger.h
index 288854e5..f1e50987 100644
--- a/languages/lib/debugger/kdevdebugger.h
+++ b/languages/lib/debugger/kdevdebugger.h
@@ -31,13 +31,14 @@
 * Base class to handle signals from the editor that relate to breakpoints 
 * and the execution point of the debugger.
 */
-class KDevDebugger : public QObject
+class KDevDebugger : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
     
 public:
     
-  KDevDebugger(TQObject *parent=0, const char *name=0);
+  KDevDebugger(TQObject *tqparent=0, const char *name=0);
   ~KDevDebugger();
 
   /**
diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp
index c961657b..6198f9bc 100644
--- a/languages/lib/designer_integration/implementationwidget.cpp
+++ b/languages/lib/designer_integration/implementationwidget.cpp
@@ -40,10 +40,10 @@
 namespace ImplUtils{
 class ClassItem: public KListViewItem{
 public:
-    ClassItem(KListViewItem *parent, ClassDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
-    ClassItem(KListView *parent, ClassDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    ClassItem(KListViewItem *tqparent, ClassDom dom)
+        :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    ClassItem(KListView *tqparent, ClassDom dom)
+        :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
     ClassDom dom() const { return m_dom; }
 private:
     ClassDom m_dom;
@@ -51,18 +51,18 @@ private:
 
 class NamespaceItem: public KListViewItem{
 public:
-    NamespaceItem(KListViewItem *parent, NamespaceDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
-    NamespaceItem(KListView *parent, NamespaceDom dom)
-        :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    NamespaceItem(KListViewItem *tqparent, NamespaceDom dom)
+        :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
+    NamespaceItem(KListView *tqparent, NamespaceDom dom)
+        :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); }
     NamespaceDom dom() const { return m_dom; }
 private:
     NamespaceDom m_dom;
 };
 }
 
-ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal)
-    :CreateImplemenationWidgetBase(parent, name, modal), m_part(part)
+ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* tqparent, const char* name, bool modal)
+    :CreateImplemenationWidgetBase(tqparent, name, modal), m_part(part)
 {
 }
 
@@ -77,28 +77,28 @@ void ImplementationWidget::init(const TQString &formName)
     TQDomDocument doc;
     DomUtil::openDOMFile(doc, m_formName);
     m_baseClassName = DomUtil::elementByPathExt(doc, "class").text();
-    setCaption(i18n("Create or Select Implementation Class for: %1").arg(m_baseClassName));
+    setCaption(i18n("Create or Select Implementation Class for: %1").tqarg(m_baseClassName));
     
     KListViewItem *item = new KListViewItem(classView, i18n("Namespaces &amp;&amp; Classes"));
     item->setOpen(true);
     processNamespaces(m_part->codeModel()->globalNamespace(), item);
 }
 
-void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *parent)
+void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *tqparent)
 {
     const NamespaceList nslist = dom->namespaceList();
     for (NamespaceList::const_iterator it = nslist.begin(); it != nslist.end(); ++it)
-        processNamespaces(*it, new ImplUtils::NamespaceItem(parent, *it));
+        processNamespaces(*it, new ImplUtils::NamespaceItem(tqparent, *it));
     const ClassList cllist = dom->classList();
     for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it)
-        processClasses(*it, new ImplUtils::ClassItem(parent, *it));    
+        processClasses(*it, new ImplUtils::ClassItem(tqparent, *it));    
 }
 
-void ImplementationWidget::processClasses(ClassDom dom, KListViewItem *parent)
+void ImplementationWidget::processClasses(ClassDom dom, KListViewItem *tqparent)
 {
     const ClassList cllist = dom->classList();
     for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it)
-        processClasses(*it, new ImplUtils::ClassItem(parent, *it));    
+        processClasses(*it, new ImplUtils::ClassItem(tqparent, *it));    
 }
 
 ImplementationWidget::~ImplementationWidget()
diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h
index b639b0e8..91f93228 100644
--- a/languages/lib/designer_integration/implementationwidget.h
+++ b/languages/lib/designer_integration/implementationwidget.h
@@ -40,8 +40,9 @@ Subclasses of this class should reimplement only pure virtual functions in the c
 class ImplementationWidget : public CreateImplemenationWidgetBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false);
+    ImplementationWidget(KDevLanguageSupport *part, TQWidget* tqparent = 0, const char* name = 0, bool modal = false);
     virtual ~ImplementationWidget();
     /*$PUBLIC_FUNCTIONS$*/
 
@@ -60,8 +61,8 @@ protected:
     the number of classes being displayed as possible implementation classes.*/
     void init(const TQString &formName);
     
-    void processNamespaces(NamespaceDom dom, KListViewItem *parent);
-    void processClasses(ClassDom dom, KListViewItem *parent);
+    void processNamespaces(NamespaceDom dom, KListViewItem *tqparent);
+    void processClasses(ClassDom dom, KListViewItem *tqparent);
     
     /**Creates a class and adds it to a project. No need to reimplement.*/
     bool createClass();
diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui
index 1a39d39e..fece6815 100644
--- a/languages/lib/designer_integration/implementationwidgetbase.ui
+++ b/languages/lib/designer_integration/implementationwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CreateImplemenationWidgetBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CreateImplemenationWidgetBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,14 +37,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -81,7 +81,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -92,7 +92,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>createButton</cstring>
                     </property>
@@ -133,15 +133,15 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>classNameLabel</cstring>
                             </property>
@@ -159,7 +159,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>useButton</cstring>
                     </property>
@@ -167,15 +167,15 @@
                         <string>Use &amp;existing class</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="2" column="0">
+                <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>layout2_2</cstring>
+                        <cstring>tqlayout2_2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>fileNameLabel</cstring>
                             </property>
@@ -257,10 +257,10 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">classNameChanged(const QString &amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp
index f66b1b61..f46bd422 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.cpp
+++ b/languages/lib/designer_integration/qtdesignerintegration.cpp
@@ -38,48 +38,48 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerIntegration::QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
+TQtDesignerIntegration::TQtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
     :KDevDesignerIntegration(part, name), m_part(part), m_impl(impl),
     m_classHasDefinitions(classHasDefinitions)
 {
 }
 
-QtDesignerIntegration::~QtDesignerIntegration()
+TQtDesignerIntegration::~TQtDesignerIntegration()
 {
     delete m_impl;
 }
 
-void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function)
+void TQtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "QtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl;
+    kdDebug() << "TQtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl;
 
-    if (!m_implementations.contains(formName))
+    if (!m_implementations.tqcontains(formName))
         if (!selectImplementation(formName))
             return;
 
     ClassDom klass = m_implementations[formName];
     if (!klass)
     {
-        KMessageBox::error(0, i18n("Cannot find implementation class for form: %1").arg(formName));
+        KMessageBox::error(0, i18n("Cannot find implementation class for form: %1").tqarg(formName));
         return;
     }
 
     addFunctionToClass(function, klass);
 }
 
-void QtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function)
+void TQtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "QtDesignerIntegration::editFunction: form: " << formName
+    kdDebug() << "TQtDesignerIntegration::editFunction: form: " << formName
         << ", old function: " << oldFunction.function
         << ", function: " << function.function << endl;
 }
 
-void QtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function)
+void TQtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "QtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl;
+    kdDebug() << "TQtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl;
 }
 
-bool QtDesignerIntegration::selectImplementation(const TQString &formName)
+bool TQtDesignerIntegration::selectImplementation(const TQString &formName)
 {
     TQFileInfo fi(formName);
     if (!fi.exists())
@@ -93,7 +93,7 @@ bool QtDesignerIntegration::selectImplementation(const TQString &formName)
     return false;
 }
 
-void QtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
+void TQtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
 {
     TQDomElement el = DomUtil::elementByPath(dom, path + "/qtdesigner");
     if (el.isNull())
@@ -117,9 +117,9 @@ void QtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
     }
 }
 
-void QtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
+void TQtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
 {
-    kdDebug() << "QtDesignerIntegration::saveSettings" << endl;
+    kdDebug() << "TQtDesignerIntegration::saveSettings" << endl;
     TQDomElement el = DomUtil::createElementByPath(dom, path + "/qtdesigner");
     for (TQMap<TQString, ClassDom>::const_iterator it = m_implementations.begin();
         it != m_implementations.end(); ++it)
@@ -134,13 +134,13 @@ void QtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
     }
 }
 
-void QtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName)
+void TQtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName)
 {
-    kdDebug() << "QtDesignerIntegration::openFunction, formName = " << formName
+    kdDebug() << "TQtDesignerIntegration::openFunction, formName = " << formName
         << ", functionName = " << functionName << endl;
     TQString fn = functionName;
-    if (fn.find("(") > 0)
-        fn.remove(fn.find("("), fn.length());
+    if (fn.tqfind("(") > 0)
+        fn.remove(fn.tqfind("("), fn.length());
 
     if (!m_implementations[formName])
         return;
@@ -177,14 +177,14 @@ void QtDesignerIntegration::openFunction(const TQString &formName, const TQStrin
     m_part->partController()->editDocument(KURL(impl), line, col);
 }
 
-void QtDesignerIntegration::processImplementationName(TQString &// name
+void TQtDesignerIntegration::processImplementationName(TQString &// name
                                                       )
 {
 }
 
-void QtDesignerIntegration::openSource(const TQString &formName)
+void TQtDesignerIntegration::openSource(const TQString &formName)
 {
-    if (!m_implementations.contains(formName))
+    if (!m_implementations.tqcontains(formName))
         if (!selectImplementation(formName))
             return;
     TQString impl = m_implementations[formName]->fileName();
diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h
index a31310eb..9a750fbd 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.h
+++ b/languages/lib/designer_integration/qtdesignerintegration.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QTDESIGNERINTEGRATION_H
-#define QTDESIGNERINTEGRATION_H
+#ifndef TQTDESIGNERINTEGRATION_H
+#define TQTDESIGNERINTEGRATION_H
 
 #include <tqmap.h>
 
@@ -29,19 +29,20 @@ class KDevLanguageSupport;
 class ImplementationWidget;
 
 /**
-Qt Designer integration base class.
+TQt Designer integration base class.
 Contains language-independent implementation part of a @ref KDevDesignerIntegration interface.
 Ready to use in KDevelop language support plugins.
 
 Subclasses of this class should reimplement only pure virtual functions in the common case.
 */
-class QtDesignerIntegration : public KDevDesignerIntegration
+class TQtDesignerIntegration : public KDevDesignerIntegration
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
+    TQtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
         bool classHasDefinitions, const char* name = 0);
-    virtual ~QtDesignerIntegration();
+    virtual ~TQtDesignerIntegration();
 
 public slots:
     virtual void addFunction(const TQString& formName, KInterfaceDesigner::Function function);
@@ -65,7 +66,7 @@ protected:
     separate files for interface and implementation parts of a class. For example,
     C++ language support plugin will do:
     @code
-    name.replace(".h", ".cpp");
+    name.tqreplace(".h", ".cpp");
     @endcode*/
     virtual void processImplementationName(TQString &name);
     
diff --git a/languages/lib/interfaces/kdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp
index c4b4e664..457c131f 100644
--- a/languages/lib/interfaces/kdevpcsimporter.cpp
+++ b/languages/lib/interfaces/kdevpcsimporter.cpp
@@ -20,8 +20,8 @@
 #include "kdevpcsimporter.h"
 #include "kdevpcsimporter.moc"
 
-KDevPCSImporter::KDevPCSImporter( TQObject * parent, const char * name )
-    : TQObject( parent, name )
+KDevPCSImporter::KDevPCSImporter( TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name )
 {
 }
 
@@ -29,7 +29,7 @@ KDevPCSImporter::~ KDevPCSImporter( )
 {
 }
 
-TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ )
+TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*tqparent*/, const char * /*name*/ )
 {
     return 0;
 }
diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h
index 962b99f3..37547252 100644
--- a/languages/lib/interfaces/kdevpcsimporter.h
+++ b/languages/lib/interfaces/kdevpcsimporter.h
@@ -32,18 +32,19 @@ These plugins are used by language support plugins to fill symbol stores
 with symbol information from certain files. The purpose of the importer
 is to provide file selection wizard.
 */
-class KDevPCSImporter: public QObject
+class KDevPCSImporter: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevPCSImporter( TQObject* parent=0, const char* name=0 );
+    KDevPCSImporter( TQObject* tqparent=0, const char* name=0 );
     virtual ~KDevPCSImporter();
 
     virtual TQString dbName() const = 0;
     virtual TQStringList includePaths() = 0;
     virtual TQStringList fileList() = 0;
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 };
 
 #endif // KDEVPCSIMPORTER_H
diff --git a/languages/pascal/PascalLexer.cpp b/languages/pascal/PascalLexer.cpp
index 28f532f8..29475545 100644
--- a/languages/pascal/PascalLexer.cpp
+++ b/languages/pascal/PascalLexer.cpp
@@ -172,7 +172,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken PascalLexer::nextToken()
 			}
 			case 0x3d /* '=' */ :
 			{
-				mEQUAL(true);
+				mETQUAL(true);
 				theRetToken=_returnToken;
 				break;
 			}
@@ -508,9 +508,9 @@ void PascalLexer::mCOLON(bool _createToken) {
 	_saveIndex=0;
 }
 
-void PascalLexer::mEQUAL(bool _createToken) {
+void PascalLexer::mETQUAL(bool _createToken) {
 	int _ttype; ANTLR_USE_NAMESPACE(antlr)RefToken _token; ANTLR_USE_NAMESPACE(std)string::size_type _begin = text.length();
-	_ttype = EQUAL;
+	_ttype = ETQUAL;
 	ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex;
 	
 	match('=' /* charlit */ );
diff --git a/languages/pascal/PascalLexer.hpp b/languages/pascal/PascalLexer.hpp
index 99a14959..c2232e65 100644
--- a/languages/pascal/PascalLexer.hpp
+++ b/languages/pascal/PascalLexer.hpp
@@ -77,7 +77,7 @@ public:
 	public: void mCOMMA(bool _createToken);
 	public: void mSEMI(bool _createToken);
 	public: void mCOLON(bool _createToken);
-	public: void mEQUAL(bool _createToken);
+	public: void mETQUAL(bool _createToken);
 	public: void mNOT_EQUAL(bool _createToken);
 	public: void mLTH(bool _createToken);
 	public: void mLE(bool _createToken);
diff --git a/languages/pascal/PascalParser.cpp b/languages/pascal/PascalParser.cpp
index 172f4a49..80655b41 100644
--- a/languages/pascal/PascalParser.cpp
+++ b/languages/pascal/PascalParser.cpp
@@ -1193,7 +1193,7 @@ void PascalParser::constantDeclarationPart() {
 		{ // ( ... )+
 		int _cnt47=0;
 		for (;;) {
-			if ((LA(1) == IDENT) && (LA(2) == EQUAL)) {
+			if ((LA(1) == IDENT) && (LA(2) == ETQUAL)) {
 				constantDeclaration();
 				if (inputState->guessing==0) {
 					astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1581,7 +1581,7 @@ void PascalParser::constantDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		expression();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1615,7 +1615,7 @@ void PascalParser::typedConstantDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		typedConstant();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1644,7 +1644,7 @@ void PascalParser::stringConstantDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		string();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1697,7 +1697,7 @@ void PascalParser::typeDeclaration() {
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
 		}
-		match(EQUAL);
+		match(ETQUAL);
 		type();
 		if (inputState->guessing==0) {
 			astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST));
@@ -1771,7 +1771,7 @@ void PascalParser::type() {
 		case BYTE:
 		case WORD:
 		case CARDINAL:
-		case QWORD:
+		case TQWORD:
 		case BOOLEAN:
 		case BYTEBOOL:
 		case LONGBOOL:
@@ -3234,7 +3234,7 @@ void PascalParser::expression() {
 		}
 		{
 		switch ( LA(1)) {
-		case EQUAL:
+		case ETQUAL:
 		case LE:
 		case GE:
 		case LTH:
@@ -3717,7 +3717,7 @@ void PascalParser::simpleType() {
 		case BYTE:
 		case WORD:
 		case CARDINAL:
-		case QWORD:
+		case TQWORD:
 		case BOOLEAN:
 		case BYTEBOOL:
 		case LONGBOOL:
@@ -3783,7 +3783,7 @@ void PascalParser::subrangeTypeOrTypeIdentifier() {
 		}
 		case SEMI:
 		case RPAREN:
-		case EQUAL:
+		case ETQUAL:
 		case RBRACK:
 		{
 			break;
@@ -3891,7 +3891,7 @@ void PascalParser::stringType() {
 		}
 		case SEMI:
 		case RPAREN:
-		case EQUAL:
+		case ETQUAL:
 		case RBRACK:
 		{
 			break;
@@ -4154,9 +4154,9 @@ void PascalParser::ordinalType() {
 			ordinalType_AST = RefPascalAST(currentAST.root);
 			break;
 		}
-		case QWORD:
+		case TQWORD:
 		{
-			match(QWORD);
+			match(TQWORD);
 			ordinalType_AST = RefPascalAST(currentAST.root);
 			break;
 		}
@@ -5033,7 +5033,7 @@ void PascalParser::proceduralTypePart1() {
 		}
 		case SEMI:
 		case RPAREN:
-		case EQUAL:
+		case ETQUAL:
 		case RBRACK:
 		{
 			break;
@@ -6535,9 +6535,9 @@ void PascalParser::expressionSign() {
 			expressionSign_AST = RefPascalAST(currentAST.root);
 			break;
 		}
-		case EQUAL:
+		case ETQUAL:
 		{
-			match(EQUAL);
+			match(ETQUAL);
 			expressionSign_AST = RefPascalAST(currentAST.root);
 			break;
 		}
@@ -8571,7 +8571,7 @@ void PascalParser::operatorDefinition() {
 			}
 			break;
 		}
-		case EQUAL:
+		case ETQUAL:
 		case LE:
 		case GE:
 		case LTH:
@@ -8707,9 +8707,9 @@ void PascalParser::comparisonOperatorDefinition() {
 	try {      // for error handling
 		{
 		switch ( LA(1)) {
-		case EQUAL:
+		case ETQUAL:
 		{
-			match(EQUAL);
+			match(ETQUAL);
 			break;
 		}
 		case LE:
@@ -9283,7 +9283,7 @@ const char* PascalParser::tokenNames[] = {
 	"\"label\"",
 	"\"const\"",
 	"\"resourcestring\"",
-	"EQUAL",
+	"ETQUAL",
 	"\"type\"",
 	"\"var\"",
 	"COLON",
@@ -9417,7 +9417,7 @@ const char* PascalParser::tokenNames[] = {
 	"\"self\"",
 	"METHOD",
 	"ADDSUBOR",
-	"ASSIGNEQUAL",
+	"ASSIGNETQUAL",
 	"SIGN",
 	"FUNC",
 	"NODE_NOT_EMIT",
@@ -9450,7 +9450,7 @@ const unsigned long PascalParser::_tokenSet_3_data_[] = { 121634818UL, 177988UL,
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_3(_tokenSet_3_data_,8);
 const unsigned long PascalParser::_tokenSet_4_data_[] = { 994050050UL, 706736UL, 101056512UL, 4294963649UL, 833972167UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" COMMA "index" "name" LPAREN RPAREN "finalization" 
-// EQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK 
+// ETQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK 
 // POINTER "constructor" "destructor" "class" "property" "read" "write" 
 // "default" "nodefault" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" 
 // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" AT PLUSEQ MINUSEQ STAREQ 
@@ -9515,7 +9515,7 @@ const unsigned long PascalParser::_tokenSet_20_data_[] = { 100663296UL, 177988UL
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_20(_tokenSet_20_data_,12);
 const unsigned long PascalParser::_tokenSet_21_data_[] = { 1061158914UL, 720868UL, 67239936UL, 4294840768UL, 825581575UL, 8UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" "exports" COMMA "index" "name" "begin" RPAREN "initialization" 
-// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON 
 // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" 
 // "class" "property" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" 
 // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" 
@@ -9525,7 +9525,7 @@ const unsigned long PascalParser::_tokenSet_22_data_[] = { 16777216UL, 0UL, 0UL,
 // SEMI 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_22(_tokenSet_22_data_,6);
 const unsigned long PascalParser::_tokenSet_23_data_[] = { 16777216UL, 2080UL, 67108864UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI RPAREN EQUAL RBRACK 
+// SEMI RPAREN ETQUAL RBRACK 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_23(_tokenSet_23_data_,8);
 const unsigned long PascalParser::_tokenSet_24_data_[] = { 0UL, 4UL, 536870920UL, 0UL, 206215168UL, 8UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // "begin" NUM_INT "case" "goto" "if" "while" "repeat" "for" "with" "raise" 
@@ -9538,7 +9538,7 @@ const unsigned long PascalParser::_tokenSet_25_data_[] = { 121634818UL, 178116UL
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_25(_tokenSet_25_data_,12);
 const unsigned long PascalParser::_tokenSet_26_data_[] = { 16777216UL, 1818406UL, 67108864UL, 192UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI "implementation" "begin" RPAREN "label" "const" "resourcestring" 
-// EQUAL "type" "var" "procedure" "forward" "function" "of" "external" 
+// ETQUAL "type" "var" "procedure" "forward" "function" "of" "external" 
 // RBRACK "constructor" "destructor" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_26(_tokenSet_26_data_,8);
 const unsigned long PascalParser::_tokenSet_27_data_[] = { 117440514UL, 177988UL, 0UL, 192UL, 0UL, 0UL, 0UL, 0UL };
@@ -9579,22 +9579,22 @@ const unsigned long PascalParser::_tokenSet_36_data_[] = { 0UL, 16UL, 33554440UL
 // "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_36(_tokenSet_36_data_,12);
 const unsigned long PascalParser::_tokenSet_37_data_[] = { 16777216UL, 2064UL, 100663304UL, 4294836224UL, 2147483775UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI LPAREN EQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
+// SEMI LPAREN ETQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
 // "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" "shl" "shr" 
 // "not" "true" "false" AT STRING_LITERAL "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_37(_tokenSet_37_data_,12);
 const unsigned long PascalParser::_tokenSet_38_data_[] = { 184549378UL, 182304UL, 67239936UL, 4544UL, 0UL, 0UL, 0UL, 0UL };
-// EOF SEMI "end" COMMA RPAREN EQUAL COLON "procedure" "function" DOTDOT 
+// EOF SEMI "end" COMMA RPAREN ETQUAL COLON "procedure" "function" DOTDOT 
 // RBRACK "constructor" "destructor" "class" "property" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_38(_tokenSet_38_data_,8);
 const unsigned long PascalParser::_tokenSet_39_data_[] = { 150994944UL, 32UL, 0UL, 0UL, 0UL, 0UL };
 // SEMI COMMA RPAREN 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_39(_tokenSet_39_data_,6);
 const unsigned long PascalParser::_tokenSet_40_data_[] = { 150994944UL, 2080UL, 67108864UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI COMMA RPAREN EQUAL RBRACK 
+// SEMI COMMA RPAREN ETQUAL RBRACK 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_40(_tokenSet_40_data_,8);
 const unsigned long PascalParser::_tokenSet_41_data_[] = { 318767104UL, 165936UL, 67108864UL, 127424UL, 0UL, 0UL, 0UL, 0UL };
-// SEMI "end" "index" LPAREN RPAREN EQUAL "procedure" "function" RBRACK 
+// SEMI "end" "index" LPAREN RPAREN ETQUAL "procedure" "function" RBRACK 
 // "constructor" "destructor" "class" "property" "read" "write" "default" 
 // "nodefault" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_41(_tokenSet_41_data_,8);
@@ -9603,7 +9603,7 @@ const unsigned long PascalParser::_tokenSet_42_data_[] = { 0UL, 32UL, 0UL, 0UL,
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_42(_tokenSet_42_data_,6);
 const unsigned long PascalParser::_tokenSet_43_data_[] = { 792723458UL, 720868UL, 67239936UL, 4294963648UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" "exports" COMMA "name" "begin" RPAREN "initialization" 
-// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON 
 // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" 
 // "class" "property" "read" "write" "default" "nodefault" LE GE LTH GT 
 // NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" 
@@ -9611,7 +9611,7 @@ const unsigned long PascalParser::_tokenSet_43_data_[] = { 792723458UL, 720868UL
 // "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_43(_tokenSet_43_data_,12);
 const unsigned long PascalParser::_tokenSet_44_data_[] = { 0UL, 2064UL, 100794376UL, 4294836224UL, 2147483775UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// LPAREN EQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
+// LPAREN ETQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" 
 // "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" "shl" "shr" 
 // "not" "true" "false" AT STRING_LITERAL "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_44(_tokenSet_44_data_,12);
@@ -9660,23 +9660,23 @@ const unsigned long PascalParser::_tokenSet_57_data_[] = { 33554432UL, 163840UL,
 // "default" "nodefault" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_57(_tokenSet_57_data_,8);
 const unsigned long PascalParser::_tokenSet_58_data_[] = { 188743680UL, 526496UL, 67239936UL, 16646144UL, 825581568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK 
 // LE GE LTH GT NOT_EQUAL "in" "is" "then" "else" "do" "until" "to" "downto" 
 // RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_58(_tokenSet_58_data_,12);
 const unsigned long PascalParser::_tokenSet_59_data_[] = { 188743680UL, 526496UL, 67239936UL, 268304384UL, 825581568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK 
 // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" "then" "else" 
 // "do" "until" "to" "downto" RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_59(_tokenSet_59_data_,12);
 const unsigned long PascalParser::_tokenSet_60_data_[] = { 188743680UL, 526512UL, 67239936UL, 4294836224UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" EQUAL "of" DOTDOT 
+// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" ETQUAL "of" DOTDOT 
 // RBRACK LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH 
 // "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" 
 // RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_60(_tokenSet_60_data_,12);
 const unsigned long PascalParser::_tokenSet_61_data_[] = { 188743680UL, 526496UL, 67239936UL, 4294836224UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK 
+// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK 
 // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" 
 // "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" RBRACK2 
 // "except" "finally" 
@@ -9727,14 +9727,14 @@ const unsigned long PascalParser::_tokenSet_74_data_[] = { 0UL, 0UL, 8UL, 0UL, 0
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_74(_tokenSet_74_data_,12);
 const unsigned long PascalParser::_tokenSet_75_data_[] = { 1061158914UL, 720868UL, 67239936UL, 4294840768UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // EOF DOT SEMI "end" "exports" COMMA "index" "name" "begin" RPAREN "initialization" 
-// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON 
+// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON 
 // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" 
 // "class" "property" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" 
 // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" 
 // "to" "downto" RBRACK2 "except" "finally" 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_75(_tokenSet_75_data_,12);
 const unsigned long PascalParser::_tokenSet_76_data_[] = { 188743682UL, 706720UL, 67239936UL, 4294840768UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// EOF DOT SEMI "end" COMMA RPAREN "finalization" EQUAL COLON "procedure" 
+// EOF DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL COLON "procedure" 
 // "function" "of" DOTDOT RBRACK "constructor" "destructor" "class" "property" 
 // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" 
 // "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" RBRACK2 
diff --git a/languages/pascal/PascalStoreWalker.cpp b/languages/pascal/PascalStoreWalker.cpp
index 96c69fe4..0a72ccfc 100644
--- a/languages/pascal/PascalStoreWalker.cpp
+++ b/languages/pascal/PascalStoreWalker.cpp
@@ -252,7 +252,7 @@ void PascalStoreWalker::constantDefinitionPart(RefPascalAST _t) {
 		for (;;) {
 			if (_t == RefPascalAST(ANTLR_USE_NAMESPACE(antlr)nullAST) )
 				_t = ASTNULL;
-			if ((_t->getType() == EQUAL)) {
+			if ((_t->getType() == ETQUAL)) {
 				constantDefinition(_t);
 				_t = _retTree;
 			}
@@ -421,7 +421,7 @@ void PascalStoreWalker::constantDefinition(RefPascalAST _t) {
 	try {      // for error handling
 		RefPascalAST __t21 = _t;
 		RefPascalAST tmp15_AST_in = _t;
-		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL);
+		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL);
 		_t = _t->getFirstChild();
 		RefPascalAST tmp16_AST_in = _t;
 		match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),IDENT);
@@ -2129,11 +2129,11 @@ void PascalStoreWalker::expression(RefPascalAST _t) {
 		if (_t == RefPascalAST(ANTLR_USE_NAMESPACE(antlr)nullAST) )
 			_t = ASTNULL;
 		switch ( _t->getType()) {
-		case EQUAL:
+		case ETQUAL:
 		{
 			RefPascalAST __t132 = _t;
 			RefPascalAST tmp85_AST_in = _t;
-			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL);
+			match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL);
 			_t = _t->getFirstChild();
 			expression(_t);
 			_t = _retTree;
@@ -2241,7 +2241,7 @@ void PascalStoreWalker::expression(RefPascalAST _t) {
 			switch ( _t->getType()) {
 			case FUNC_CALL:
 			case DOT:
-			case EQUAL:
+			case ETQUAL:
 			case NUM_INT:
 			case LBRACK:
 			case SET:
@@ -2301,7 +2301,7 @@ void PascalStoreWalker::expression(RefPascalAST _t) {
 			switch ( _t->getType()) {
 			case FUNC_CALL:
 			case DOT:
-			case EQUAL:
+			case ETQUAL:
 			case NUM_INT:
 			case LBRACK:
 			case SET:
@@ -2691,7 +2691,7 @@ void PascalStoreWalker::element(RefPascalAST _t) {
 		}
 		case FUNC_CALL:
 		case DOT:
-		case EQUAL:
+		case ETQUAL:
 		case NUM_INT:
 		case LBRACK:
 		case SET:
@@ -3228,7 +3228,7 @@ const char* PascalStoreWalker::tokenNames[] = {
 	"\"label\"",
 	"\"const\"",
 	"\"resourcestring\"",
-	"EQUAL",
+	"ETQUAL",
 	"\"type\"",
 	"\"var\"",
 	"COLON",
@@ -3362,7 +3362,7 @@ const char* PascalStoreWalker::tokenNames[] = {
 	"\"self\"",
 	"METHOD",
 	"ADDSUBOR",
-	"ASSIGNEQUAL",
+	"ASSIGNETQUAL",
 	"SIGN",
 	"FUNC",
 	"NODE_NOT_EMIT",
@@ -3389,12 +3389,12 @@ const unsigned long PascalStoreWalker::_tokenSet_2_data_[] = { 0UL, 0UL, 8UL, 50
 // NUM_INT PLUS MINUS STRING_LITERAL "chr" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_2(_tokenSet_2_data_,12);
 const unsigned long PascalStoreWalker::_tokenSet_3_data_[] = { 4194432UL, 2048UL, 1107296264UL, 4152229889UL, 2155872329UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// FUNC_CALL DOT EQUAL NUM_INT LBRACK "set" POINTER LE GE LTH GT NOT_EQUAL 
+// FUNC_CALL DOT ETQUAL NUM_INT LBRACK "set" POINTER LE GE LTH GT NOT_EQUAL 
 // "in" PLUS MINUS "or" STAR SLASH "div" "mod" "and" "not" AT LBRACK2 STRING_LITERAL 
 // "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_3(_tokenSet_3_data_,12);
 const unsigned long PascalStoreWalker::_tokenSet_4_data_[] = { 4194432UL, 2048UL, 1107427336UL, 4152229889UL, 2155872329UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// FUNC_CALL DOT EQUAL NUM_INT DOTDOT LBRACK "set" POINTER LE GE LTH GT 
+// FUNC_CALL DOT ETQUAL NUM_INT DOTDOT LBRACK "set" POINTER LE GE LTH GT 
 // NOT_EQUAL "in" PLUS MINUS "or" STAR SLASH "div" "mod" "and" "not" AT 
 // LBRACK2 STRING_LITERAL "chr" "nil" NUM_REAL IDENT 
 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_4(_tokenSet_4_data_,12);
diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.hpp b/languages/pascal/PascalStoreWalkerTokenTypes.hpp
index e8e19eb9..f86b1d42 100644
--- a/languages/pascal/PascalStoreWalkerTokenTypes.hpp
+++ b/languages/pascal/PascalStoreWalkerTokenTypes.hpp
@@ -51,7 +51,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
 		LABEL = 40,
 		CONST = 41,
 		RESOURCESTRING = 42,
-		EQUAL = 43,
+		ETQUAL = 43,
 		TYPE = 44,
 		VAR = 45,
 		COLON = 46,
@@ -84,7 +84,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
 		BYTE = 73,
 		WORD = 74,
 		CARDINAL = 75,
-		QWORD = 76,
+		TQWORD = 76,
 		BOOLEAN = 77,
 		BYTEBOOL = 78,
 		LONGBOOL = 79,
@@ -185,7 +185,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
 		SELF = 174,
 		TQT_METHOD = 175,
 		ADDSUBOR = 176,
-		ASSIGNEQUAL = 177,
+		ASSIGNETQUAL = 177,
 		SIGN = 178,
 		FUNC = 179,
 		NODE_NOT_EMIT = 180,
diff --git a/languages/pascal/PascalTokenTypes.hpp b/languages/pascal/PascalTokenTypes.hpp
index fc8692d3..3bc8950e 100644
--- a/languages/pascal/PascalTokenTypes.hpp
+++ b/languages/pascal/PascalTokenTypes.hpp
@@ -1,6 +1,9 @@
 #ifndef INC_PascalTokenTypes_hpp_
 #define INC_PascalTokenTypes_hpp_
 
+#undef TRUE
+#undef FALSE
+
 /* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalTokenTypes.hpp"$ */
 
 #ifndef CUSTOM_API
@@ -51,7 +54,7 @@ struct CUSTOM_API PascalTokenTypes {
 		LABEL = 40,
 		CONST = 41,
 		RESOURCESTRING = 42,
-		EQUAL = 43,
+		ETQUAL = 43,
 		TYPE = 44,
 		VAR = 45,
 		COLON = 46,
@@ -84,7 +87,7 @@ struct CUSTOM_API PascalTokenTypes {
 		BYTE = 73,
 		WORD = 74,
 		CARDINAL = 75,
-		QWORD = 76,
+		TQWORD = 76,
 		BOOLEAN = 77,
 		BYTEBOOL = 78,
 		LONGBOOL = 79,
@@ -185,7 +188,7 @@ struct CUSTOM_API PascalTokenTypes {
 		SELF = 174,
 		TQT_METHOD = 175,
 		ADDSUBOR = 176,
-		ASSIGNEQUAL = 177,
+		ASSIGNETQUAL = 177,
 		SIGN = 178,
 		FUNC = 179,
 		NODE_NOT_EMIT = 180,
diff --git a/languages/pascal/README.dox b/languages/pascal/README.dox
index 52ef50b1..8360d27c 100644
--- a/languages/pascal/README.dox
+++ b/languages/pascal/README.dox
@@ -15,7 +15,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato
 \maintainer <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a>
 
 \feature Pascal language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Language parser can sometimes treat correct lines as errors. Please send sample code to maintainer if you have this problem.
 
diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp
index ff202374..be9a1909 100644
--- a/languages/pascal/backgroundparser.cpp
+++ b/languages/pascal/backgroundparser.cpp
@@ -24,7 +24,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter,
                                     const TQString& source,
                                     const TQString& filename )
     : m_reporter( reporter ),
-      m_source( source.unicode(), source.length() ),
+      m_source( source.tqunicode(), source.length() ),
       m_fileName( filename )
 {
 }
diff --git a/languages/pascal/backgroundparser.h b/languages/pascal/backgroundparser.h
index 2ad77f83..170b3073 100644
--- a/languages/pascal/backgroundparser.h
+++ b/languages/pascal/backgroundparser.h
@@ -17,7 +17,7 @@
 
 class ProblemReporter;
 
-class BackgroundParser: public QThread{
+class BackgroundParser: public TQThread{
 public:
     BackgroundParser( ProblemReporter* reporter,
                       const TQString& source,
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
index 2d267519..d1ed9aec 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
@@ -21,8 +21,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory<DccOptionsPlugin>( "kdevdccoptions" ) )
 
-DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const QStringList/* &args*/)
-    : KDevCompilerOptions(parent, name)
+DccOptionsPlugin::DccOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList/* &args*/)
+    : KDevCompilerOptions(tqparent, name)
 {
 }
 
@@ -30,9 +30,9 @@ DccOptionsPlugin::~DccOptionsPlugin()
 {
 }
 
-TQString DccOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
+TQString DccOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags)
 {
-    DccOptionsDialog *dlg = new DccOptionsDialog(parent, "dcc options dialog");
+    DccOptionsDialog *dlg = new DccOptionsDialog(tqparent, "dcc options dialog");
     TQString newFlags = flags;
     dlg->setFlags(flags);
     if(dlg->exec() == TQDialog::Accepted)
@@ -42,8 +42,8 @@ TQString DccOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
 }
 
 
-DccOptionsDialog::DccOptionsDialog( TQWidget * parent, const char * name )
-    : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, parent, name, true)
+DccOptionsDialog::DccOptionsDialog( TQWidget * tqparent, const char * name )
+    : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, tqparent, name, true)
 {
     TQVBox *vbox;
 
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
index 04a2392e..e428a73d 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
@@ -18,12 +18,13 @@
 class DccOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DccOptionsPlugin( TQObject *parent, const char *name, const QStringList/* &args */);
+    DccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList/* &args */);
     ~DccOptionsPlugin();
 
-    virtual TQString exec(TQWidget *parent, const TQString &flags);
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags);
 };
 
 class GeneralTab;
@@ -36,7 +37,7 @@ class DebugOptimTab;
 class DccOptionsDialog : public KDialogBase
 {
 public:
-    DccOptionsDialog( TQWidget *parent=0, const char *name=0 );
+    DccOptionsDialog( TQWidget *tqparent=0, const char *name=0 );
     ~DccOptionsDialog();
 
     void setFlags(const TQString &flags);
diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp
index 94c8b35c..facb96f9 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp
@@ -21,13 +21,13 @@
 
 #include "optiontabs.h"
 
-LinkerTab::LinkerTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), radioController(new FlagRadioButtonController()),
+LinkerTab::LinkerTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), radioController(new FlagRadioButtonController()),
     pathController(new FlagPathEditController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this);
     TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group);
@@ -39,19 +39,19 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     new FlagRadioButton(map_group, radioController,
                      "-GD", i18n("Detailed"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagPathEdit(this, "", pathController,
                      "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController,
                      "-$M", i18n("Reserved address space:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -77,11 +77,11 @@ void LinkerTab::writeFlags( TQStringList * str )
 
 
 
-LocationsTab::LocationsTab( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), pathController(new FlagPathEditController())
+LocationsTab::LocationsTab( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), pathController(new FlagPathEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagPathEdit(this, ":", pathController,
                      "-I", i18n("Include search path (delimited by \":\"):"));
@@ -92,7 +92,7 @@ LocationsTab::LocationsTab( TQWidget * parent, const char * name )
     new FlagPathEdit(this, ":", pathController,
                      "-O", i18n("Object search path (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 LocationsTab::~LocationsTab( )
@@ -112,11 +112,11 @@ void LocationsTab::writeFlags( TQStringList * str )
 
 
 
-Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), pathController(new FlagPathEditController())
+Locations2Tab::Locations2Tab( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), pathController(new FlagPathEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagPathEdit(this, "", pathController,
                      "-E", i18n("Executable output directory:"));
@@ -127,7 +127,7 @@ Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
     new FlagPathEdit(this, "", pathController,
                      "-LN", i18n("Package source code directory:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 Locations2Tab::~Locations2Tab( )
@@ -147,12 +147,12 @@ void Locations2Tab::writeFlags( TQStringList * str )
 
 
 
-GeneralTab::GeneralTab( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), controller(new FlagCheckBoxController()),
+GeneralTab::GeneralTab( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this);
     new FlagCheckBox(build_group, controller,
@@ -165,7 +165,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
                      "-Z", i18n("Disable implicit package compilation"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@@ -173,7 +173,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
     new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this);
     new FlagCheckBox(message_group, controller,
@@ -182,12 +182,12 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
                      "-W", i18n("Output warning messages"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
     TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this);
     new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 GeneralTab::~GeneralTab( )
@@ -210,15 +210,15 @@ void GeneralTab::writeFlags( TQStringList * str )
 
 
 
-CodegenTab::CodegenTab( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), controller(new FlagCheckBoxController()),
+CodegenTab::CodegenTab( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController()),
     radioController(new FlagRadioButtonController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    tqlayout->setAutoAdd(true);
 
-    TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint());
+    TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint());
 
     TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this);
     TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group);
@@ -234,7 +234,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(align_group, controller,
                      "'-$W+'", i18n("Generate stack frames"), "'-$W-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(align_group, 0, 0);
+    tqlayout2->addWidget(align_group, 0, 0);
 
     TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this);
     TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group);
@@ -246,7 +246,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagRadioButton(enum_group, radioController,
                      "'-$Z4'", i18n("Unsigned double word (4096M values)"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(enum_group, 0, 1);
+    tqlayout2->addWidget(enum_group, 0, 1);
 
     TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
     new FlagCheckBox(compile_group, controller,
@@ -266,7 +266,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compile_group, controller,
                      "'-$J+'", i18n("Writable typed constants"), "'-$J-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(compile_group, 1, 0);
+    tqlayout2->addWidget(compile_group, 1, 0);
 
     TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
     new FlagCheckBox(run_group, controller,
@@ -280,9 +280,9 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(run_group, controller,
                      "'-$R+'", i18n("Range checking"), "'-$R-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout2->addWidget(run_group, 1, 1);
+    tqlayout2->addWidget(run_group, 1, 1);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 CodegenTab::~CodegenTab( )
@@ -308,21 +308,21 @@ void CodegenTab::writeFlags( TQStringList * str )
 
 
 
-DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     radioController(new FlagRadioButtonController)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this);
     new FlagCheckBox(optim_group, controller,
                      "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'");
-    layout->addWidget(optim_group);
+    tqlayout->addWidget(optim_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
     TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
     new FlagCheckBox(debug_group, controller,
@@ -335,7 +335,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-VN", i18n("Namespace debug info"));
     symboldb = new FlagCheckBox(debug_group, controller,
                      "-VR", i18n("Write symbol info in an .rsm file"));
-    layout2->addWidget(debug_group);
+    tqlayout2->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this);
@@ -347,20 +347,20 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "'-$YD'", i18n("Definition information"));
     new FlagRadioButton(debug_add, radioController,
                         "'-$Y+'", i18n("Full reference information"));
-    layout2->addWidget(debug_add);
+    tqlayout2->addWidget(debug_add);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    layout3->addWidget(release);
-    layout3->addWidget(debug);
+    tqlayout3->addWidget(release);
+    tqlayout3->addWidget(debug);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
diff --git a/languages/pascal/compiler/dccoptions/optiontabs.h b/languages/pascal/compiler/dccoptions/optiontabs.h
index 69343bf0..d96ec71d 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.h
+++ b/languages/pascal/compiler/dccoptions/optiontabs.h
@@ -20,10 +20,10 @@ class TQRadioButton;
 class FlagRadioButton;
 class FlagCheckBox;
 
-class LinkerTab : public QWidget
+class LinkerTab : public TQWidget
 {
 public:
-    LinkerTab( TQWidget *parent=0, const char *name=0 );
+    LinkerTab( TQWidget *tqparent=0, const char *name=0 );
     ~LinkerTab();
 
     void readFlags(TQStringList *str);
@@ -35,10 +35,10 @@ private:
     FlagEditController *editController;
 };
 
-class LocationsTab : public QWidget
+class LocationsTab : public TQWidget
 {
 public:
-    LocationsTab( TQWidget *parent=0, const char *name=0 );
+    LocationsTab( TQWidget *tqparent=0, const char *name=0 );
     ~LocationsTab();
 
     void readFlags(TQStringList *str);
@@ -48,10 +48,10 @@ private:
     FlagPathEditController *pathController;
 };
 
-class Locations2Tab : public QWidget
+class Locations2Tab : public TQWidget
 {
 public:
-    Locations2Tab( TQWidget *parent=0, const char *name=0 );
+    Locations2Tab( TQWidget *tqparent=0, const char *name=0 );
     ~Locations2Tab();
 
     void readFlags(TQStringList *str);
@@ -61,10 +61,10 @@ private:
     FlagPathEditController *pathController;
 };
 
-class GeneralTab: public QWidget
+class GeneralTab: public TQWidget
 {
 public:
-    GeneralTab( TQWidget *parent=0, const char *name=0 );
+    GeneralTab( TQWidget *tqparent=0, const char *name=0 );
     ~GeneralTab();
 
     void readFlags(TQStringList *str);
@@ -75,10 +75,10 @@ private:
     FlagEditController *editController;
 };
 
-class CodegenTab : public QWidget
+class CodegenTab : public TQWidget
 {
 public:
-    CodegenTab( TQWidget *parent=0, const char *name=0 );
+    CodegenTab( TQWidget *tqparent=0, const char *name=0 );
     ~CodegenTab();
 
     void readFlags(TQStringList *str);
@@ -90,11 +90,12 @@ private:
     FlagRadioButtonController *radioController;
 };
 
-class DebugOptimTab : public QWidget
+class DebugOptimTab : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DebugOptimTab( TQWidget *parent=0, const char *name=0 );
+    DebugOptimTab( TQWidget *tqparent=0, const char *name=0 );
     ~DebugOptimTab();
 
     void readFlags(TQStringList *str);
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
index 567d5c86..edcadaee 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
@@ -18,8 +18,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "kdevfpcoptions" ) )
 
-FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/)
-    : KDevCompilerOptions(parent, name)
+FpcOptionsPlugin::FpcOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList& /*args*/)
+    : KDevCompilerOptions(tqparent, name)
 {
 }
 
@@ -27,9 +27,9 @@ FpcOptionsPlugin::~FpcOptionsPlugin()
 {
 }
 
-TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
+TQString FpcOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags)
 {
-    FpcOptionsDialog *dlg = new FpcOptionsDialog(parent, "fpc options dialog");
+    FpcOptionsDialog *dlg = new FpcOptionsDialog(tqparent, "fpc options dialog");
     TQString newFlags = flags;
     dlg->setFlags(flags);
     if (dlg->exec() == TQDialog::Accepted)
@@ -40,8 +40,8 @@ TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags)
 
 
 
-FpcOptionsDialog::FpcOptionsDialog( TQWidget *parent, const char *name )
-    : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, parent, name, true)
+FpcOptionsDialog::FpcOptionsDialog( TQWidget *tqparent, const char *name )
+    : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, tqparent, name, true)
 {
     TQVBox *vbox;
 
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
index 55e65321..6d450569 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
@@ -18,12 +18,13 @@
 class FpcOptionsPlugin : public KDevCompilerOptions
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FpcOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args );
+    FpcOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
     ~FpcOptionsPlugin();
 
-    virtual TQString exec(TQWidget *parent, const TQString &flags);
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags);
 };
 
 
@@ -35,7 +36,7 @@ class CodegenTab;
 class FpcOptionsDialog : public KDialogBase
 {
 public:
-    FpcOptionsDialog( TQWidget *parent=0, const char *name=0 );
+    FpcOptionsDialog( TQWidget *tqparent=0, const char *name=0 );
     ~FpcOptionsDialog();
 
     void setFlags(const TQString &flags);
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
index 445ab826..5c46ac24 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
@@ -23,17 +23,17 @@
 
 #include "optiontabs.h"
 
-FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
-    : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
+FeedbackTab::FeedbackTab(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this);
     new FlagCheckBox(output_group, controller,
                      "-vr", i18n("Format errors like GCC does"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this);
     new FlagCheckBox(verbose_group, controller,
@@ -54,7 +54,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
                      "-vd", i18n("Write other debugging info"));
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this);
     new FlagCheckBox(other_group, controller,
@@ -74,7 +74,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 FeedbackTab::~FeedbackTab()
@@ -94,12 +94,12 @@ void FeedbackTab::writeFlags(TQStringList *list)
 
 
 
-FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), controller(new FlagCheckBoxController()),
+FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     pathController(new FlagPathEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagPathEdit(this, ":", pathController,
                      "-Fu", i18n("Unit search path (delimited by \":\"):"));
@@ -110,7 +110,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
     new FlagPathEdit(this, ":", pathController,
                      "-Fl", i18n("Library search path (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 FilesAndDirectoriesTab::~FilesAndDirectoriesTab( )
@@ -131,12 +131,12 @@ void FilesAndDirectoriesTab::writeFlags( TQStringList * str )
     pathController->writeFlags(str);
 }
 
-FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char * name )
-    :TQWidget(parent, name), controller(new FlagCheckBoxController()),
+FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * tqparent, const char * name )
+    :TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     pathController(new FlagPathEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagPathEdit(this, "", pathController,
                      "-FE", i18n("Write executables and units in:"));
@@ -145,14 +145,14 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
     new FlagPathEdit(this, "", pathController,
                      "-o", i18n("Executable name:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(20);
+    tqlayout->addSpacing(20);
 
     new FlagPathEdit(this, "", pathController,
                      "-e", i18n("Location of as and ld programs:"));
     new FlagPathEdit(this, "", pathController,
                      "-FL", i18n("Dynamic linker executable:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(20);
+    tqlayout->addSpacing(20);
 
     new FlagPathEdit(this, "", pathController,
                      "-Fr", i18n("Compiler messages file:"), KFile::File);
@@ -160,7 +160,7 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
                      "-Fe", i18n("Write compiler messages to file:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( )
@@ -182,11 +182,11 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str )
 }
 
 
-LanguageTab::LanguageTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
+LanguageTab::LanguageTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this);
     new FlagCheckBox(compat_group, controller,
@@ -198,7 +198,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compat_group, controller,
                      "-Sp", i18n("GNU Pascal compatibility mode"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this);
     new FlagCheckBox(ccompat_group, controller,
@@ -208,7 +208,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     new FlagCheckBox(ccompat_group, controller,
                      "-Sm", i18n("Support C style macros"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this);
     new FlagCheckBox(lang_group, controller,
@@ -221,7 +221,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
                      "-St", i18n("Allow the static keyword in objects"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  LanguageTab::~ LanguageTab( )
@@ -239,14 +239,14 @@ void LanguageTab::writeFlags( TQStringList * str )
     controller->writeFlags(str);
 }
 
-AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+AssemblerTab::AssemblerTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     asmController(new FlagRadioButtonController)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    tqlayout->setAutoAdd(true);
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
     TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this);
     new FlagCheckBox(info_group, controller,
@@ -257,9 +257,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                      "-ar", i18n("List register allocation and release info"));
     new FlagCheckBox(info_group, controller,
                      "-at", i18n("List temporary allocations and deallocations"));
-    layout2->addWidget(info_group);
+    tqlayout2->addWidget(info_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    //layout->addSpacing(10);
+    //tqlayout->addSpacing(10);
 
     TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this);
     TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group);
@@ -270,9 +270,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                         "-Rintel", i18n("Intel style assembler"));
     new FlagRadioButton(asmkind_group, asmController,
                         "-Rdirect", i18n("Direct assembler"));
-    layout2->addWidget(asmkind_group);
+    tqlayout2->addWidget(asmkind_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
 
     TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this);
@@ -298,10 +298,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                         "-Acoff", i18n("Use coff"));
     new FlagRadioButton(asm_group, asmController,
                         "-Apecoff", i18n("Use pecoff"));
-    layout->addWidget(asm_group);
+    tqlayout->addWidget(asm_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  AssemblerTab::~ AssemblerTab( )
@@ -324,16 +324,16 @@ void AssemblerTab::writeFlags( TQStringList * str )
 
 
 
-DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     optimController(new FlagRadioButtonController)
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    tqlayout->setAutoAdd(true);
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
-    TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint());
+    TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
 
     TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
     new FlagCheckBox(debug_group, controller,
@@ -346,18 +346,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-gh", i18n("Use heaptrc unit"), "-!gh");
     new FlagCheckBox(debug_group, controller,
                      "-gc", i18n("Generate checks for pointers"), "-!gc");
-    layout3->addWidget(debug_group);
+    tqlayout3->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout3->addSpacing(10);
+    tqlayout3->addSpacing(10);
 
     TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this);
     new FlagCheckBox(profile_group, controller,
                      "-pg", i18n("Generate profiler code for gprof"), "-!pg");
-    layout3->addWidget(profile_group);
+    tqlayout3->addWidget(profile_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout3->addSpacing(10);
+    tqlayout3->addSpacing(10);
 
-    TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint());
+    TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
 
     TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this);
     m_default = new TQRadioButton(i18n("Default"), optim_group1);
@@ -366,9 +366,9 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "-Og", i18n("Generate smaller code"));
     optim1 = new FlagRadioButton(optim_group1, optimController,
                         "-OG", i18n("Generate faster code"));
-    layout4->addWidget(optim_group1);
+    tqlayout4->addWidget(optim_group1);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout4->addSpacing(10);
+    tqlayout4->addSpacing(10);
 
     TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this);
     m_default2 = new TQRadioButton(i18n("Default"), optim_group2);
@@ -379,11 +379,11 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "-O2", i18n("Level 2"));
     optim2 = new FlagRadioButton(optim_group2, optimController,
                         "-O3", i18n("Level 3"));
-    layout4->addWidget(optim_group2);
+    tqlayout4->addWidget(optim_group2);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout4->addSpacing(10);
+    tqlayout4->addSpacing(10);
 
-    TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
     TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this);
     m_default3 = new TQRadioButton(i18n("Default"), optim_group3);
@@ -394,7 +394,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-Op2", i18n("Pentium/PentiumMMX"));
     new FlagRadioButton(optim_group3, optimController,
                      "-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6"));
-    layout5->addWidget(optim_group3);
+    tqlayout5->addWidget(optim_group3);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this);
@@ -402,18 +402,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-Or", i18n("Use register variables"), "-!Or");
     new FlagCheckBox(optim_group4, controller,
                      "-Ou", i18n("Uncertain optimizations"), "-!Ou");
-    layout5->addWidget(optim_group4);
+    tqlayout5->addWidget(optim_group4);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    layout6->addWidget(release);
-    layout6->addWidget(debug);
+    tqlayout6->addWidget(release);
+    tqlayout6->addWidget(debug);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
@@ -454,12 +454,12 @@ void DebugOptimTab::setDebugOptions()
 //    m_default3->setChecked(true);
 }
 
-CodegenTab::CodegenTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+CodegenTab::CodegenTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
     new FlagCheckBox(compile_group, controller,
@@ -467,7 +467,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compile_group, controller,
                      "-Un", i18n("Do not check the unit name for being the same as the file name"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
     new FlagCheckBox(run_group, controller,
@@ -479,14 +479,14 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(run_group, controller,
                      "-Co", i18n("Integer overflow checking"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController,
                     "-Cs", i18n("Stack size:"));
@@ -494,7 +494,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
                     "-Ch", i18n("Heap size:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 CodegenTab::~ CodegenTab( )
@@ -515,13 +515,13 @@ void CodegenTab::writeFlags( TQStringList * str )
     listController->writeFlags(str);
 }
 
-LinkerTab::LinkerTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+LinkerTab::LinkerTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
     TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this);
     new FlagCheckBox(link_group, controller,
@@ -534,7 +534,7 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
                      "-Cn", i18n("Omit the linking stage"));
     new FlagCheckBox(link_group, controller,
                      "-s",  i18n("Create assembling and linking script"));
-    layout2->addWidget(link_group);
+    tqlayout2->addWidget(link_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this);
@@ -548,15 +548,15 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
                      "-XD",  i18n("Link with dynamic libraries"));
     new FlagCheckBox(exec_group, controller,
                      "-Xc",  i18n("Link with the C library"));
-    layout2->addWidget(exec_group);
+    tqlayout2->addWidget(exec_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):"));
-    layout->addWidget(led);
+    tqlayout->addWidget(led);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -577,14 +577,14 @@ void LinkerTab::writeFlags( TQStringList * str )
     listController->writeFlags(str);
 }
 
-MiscTab::MiscTab( TQWidget * parent, const char * name )
-    : TQWidget(parent, name), controller(new FlagCheckBoxController()),
+MiscTab::MiscTab( TQWidget * tqparent, const char * name )
+    : TQWidget(tqparent, name), controller(new FlagCheckBoxController()),
     radioController(new FlagRadioButtonController()),
     pathController(new FlagPathEditController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->setAutoAdd(true);
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->setAutoAdd(true);
 
     new FlagCheckBox(this, controller,
                      "-B", i18n("Recompile all used units"));
@@ -595,7 +595,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagSpinEdit(this, 1, 1000, 1, 50, editController,
                     "-Se", i18n("Stop after the error:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this);
     TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group);
@@ -605,7 +605,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagRadioButton(browser_group, radioController,
                      "-bl", i18n("Global and local browser info"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
     TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this);
     TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group);
@@ -625,9 +625,9 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagRadioButton(target_group, radioController,
                      "-TBEOS", i18n("BeOS"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    layout->addSpacing(10);
+    tqlayout->addSpacing(10);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 MiscTab::~ MiscTab( )
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h
index acb446b3..9d0e0f07 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.h
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.h
@@ -21,10 +21,10 @@ class FlagRadioButtonController;
 class FlagPathEditController;
 class FlagEditController;
 
-class FeedbackTab : public QWidget
+class FeedbackTab : public TQWidget
 {
 public:
-    FeedbackTab( TQWidget *parent=0, const char *name=0 );
+    FeedbackTab( TQWidget *tqparent=0, const char *name=0 );
     ~FeedbackTab();
 
     void readFlags(TQStringList *str);
@@ -34,10 +34,10 @@ private:
     FlagCheckBoxController *controller;
 };
 
-class FilesAndDirectoriesTab: public QWidget
+class FilesAndDirectoriesTab: public TQWidget
 {
 public:
-    FilesAndDirectoriesTab( TQWidget *parent = 0, const char *name = 0);
+    FilesAndDirectoriesTab( TQWidget *tqparent = 0, const char *name = 0);
     ~FilesAndDirectoriesTab();
 
     void readFlags(TQStringList *str);
@@ -48,10 +48,10 @@ private:
     FlagPathEditController *pathController;
 };
 
-class FilesAndDirectoriesTab2: public QWidget
+class FilesAndDirectoriesTab2: public TQWidget
 {
 public:
-    FilesAndDirectoriesTab2( TQWidget *parent = 0, const char *name = 0);
+    FilesAndDirectoriesTab2( TQWidget *tqparent = 0, const char *name = 0);
     ~FilesAndDirectoriesTab2();
 
     void readFlags(TQStringList *str);
@@ -62,10 +62,10 @@ private:
     FlagPathEditController *pathController;
 };
 
-class LanguageTab : public QWidget
+class LanguageTab : public TQWidget
 {
 public:
-    LanguageTab( TQWidget *parent=0, const char *name=0 );
+    LanguageTab( TQWidget *tqparent=0, const char *name=0 );
     ~LanguageTab();
 
     void readFlags(TQStringList *str);
@@ -75,10 +75,10 @@ private:
     FlagCheckBoxController *controller;
 };
 
-class AssemblerTab : public QWidget
+class AssemblerTab : public TQWidget
 {
 public:
-    AssemblerTab( TQWidget *parent=0, const char *name=0 );
+    AssemblerTab( TQWidget *tqparent=0, const char *name=0 );
     ~AssemblerTab();
 
     void readFlags(TQStringList *str);
@@ -89,11 +89,12 @@ private:
     FlagRadioButtonController *asmController;
 };
 
-class DebugOptimTab : public QWidget
+class DebugOptimTab : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DebugOptimTab( TQWidget *parent=0, const char *name=0 );
+    DebugOptimTab( TQWidget *tqparent=0, const char *name=0 );
     ~DebugOptimTab();
 
     void readFlags(TQStringList *str);
@@ -114,10 +115,10 @@ private slots:
     void setDebugOptions();
 };
 
-class CodegenTab : public QWidget
+class CodegenTab : public TQWidget
 {
 public:
-    CodegenTab( TQWidget *parent=0, const char *name=0 );
+    CodegenTab( TQWidget *tqparent=0, const char *name=0 );
     ~CodegenTab();
 
     void readFlags(TQStringList *str);
@@ -128,10 +129,10 @@ private:
     FlagEditController *listController;
 };
 
-class LinkerTab : public QWidget
+class LinkerTab : public TQWidget
 {
 public:
-    LinkerTab( TQWidget *parent=0, const char *name=0 );
+    LinkerTab( TQWidget *tqparent=0, const char *name=0 );
     ~LinkerTab();
 
     void readFlags(TQStringList *str);
@@ -142,10 +143,10 @@ private:
     FlagEditController *listController;
 };
 
-class MiscTab : public QWidget
+class MiscTab : public TQWidget
 {
 public:
-    MiscTab( TQWidget *parent=0, const char *name=0 );
+    MiscTab( TQWidget *tqparent=0, const char *name=0 );
     ~MiscTab();
 
     void readFlags(TQStringList *str);
diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui
index a215f7a8..7fd5275e 100644
--- a/languages/pascal/configproblemreporter.ui
+++ b/languages/pascal/configproblemreporter.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ConfigureProblemReporter</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigureProblemReporter</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>bgParserCheckbox</cstring>
             </property>
@@ -24,7 +24,7 @@
                 <string>&amp;Enable background parsing</string>
             </property>
         </widget>
-        <widget class="QSlider">
+        <widget class="TQSlider">
             <property name="name">
                 <cstring>delaySlider</cstring>
             </property>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>101</height>
@@ -77,12 +77,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>accept()</slot>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/pascal/pascal.g b/languages/pascal/pascal.g
index fde5dcb8..1c1209b5 100644
--- a/languages/pascal/pascal.g
+++ b/languages/pascal/pascal.g
@@ -59,7 +59,7 @@ options {
  *
  * One of the principles here is that any time you have a list of
  * stuff, you usually want to treat it like one thing (a list) a some
- * point in the grammar.  You want trees to have a fixed number of children
+ * point in the grammar.  You want trees to have a fixed number of tqchildren
  * as much as possible.  For example, the definition of a procedure should
  * be something like #(PROCEDURE ID #(ARGDECLS ARG1 ARG2...)) not
  * #(PROCEDURE ID ARG1 ARG2 ... ) since this is harder to parse and
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 0d8c049b..57ef642d 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -47,8 +47,8 @@ typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
 static const KDevPluginInfo data("kdevpascalsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
 
-PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
+PascalSupportPart::PascalSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevLanguageSupport(&data, tqparent, name ? name : "KDevPascalSupport" ),
     d( new PascalSupportPartData() )
 {
     setInstance(PascalSupportFactory::instance());
@@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList)
     {
         TQString fn = project()->projectDirectory() + "/" + *it;
         maybeParse( fn );
-        kapp->processEvents( 500 );
+        kapp->tqprocessEvents( 500 );
         emit addedSourceInfo(fn);
     }
 }
@@ -173,7 +173,7 @@ void PascalSupportPart::initialParse( )
         for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){
             TQString fn = project()->projectDirectory() + "/" + *it;
             maybeParse( fn );
-            kapp->processEvents( 500 );
+            kapp->tqprocessEvents( 500 );
         }
 
         emit updatedSourceInfo();
@@ -191,7 +191,7 @@ void PascalSupportPart::maybeParse( const TQString & fileName )
     if( !mime || mime->name() != "text/x-pascal" )
 	return;
 
-    mainWindow()->statusBar()->message( i18n("Parsing file: %1").arg(fileName) );
+    mainWindow()->statusBar()->message( i18n("Parsing file: %1").tqarg(fileName) );
     parse( fileName );
 }
 
@@ -256,10 +256,10 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag )
     switch( tag.kind() )
     {
         case Tag::Kind_Namespace:
-            return TQString::fromLatin1("unit ") + tag.name();
+            return TQString::tqfromLatin1("unit ") + tag.name();
 
         case Tag::Kind_Class:
-            return TQString::fromLatin1("class ") + tag.name();
+            return TQString::tqfromLatin1("class ") + tag.name();
 
         case Tag::Kind_Function:
         case Tag::Kind_FunctionDeclaration:
@@ -271,7 +271,7 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag )
         case Tag::Kind_Variable:
         case Tag::Kind_VariableDeclaration:
         {
-            return TQString::fromLatin1("var ") + tag.name();
+            return TQString::tqfromLatin1("var ") + tag.name();
         }
         break;
     }
diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h
index 4b9e2a69..3ad9ee39 100644
--- a/languages/pascal/pascalsupport_part.h
+++ b/languages/pascal/pascalsupport_part.h
@@ -22,8 +22,9 @@ class PascalSupportPartData;
 class PascalSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PascalSupportPart(TQObject *parent, const char *name, const TQStringList &);
+    PascalSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
     ~PascalSupportPart();
 
     virtual Features features();
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 30a65739..4b74164a 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -46,15 +46,15 @@
 #include <kdialogbase.h>
 
 
-class ProblemItem: public QListViewItem{
+class ProblemItem: public TQListViewItem{
 public:
-	ProblemItem( TQListView* parent, const TQString& level, const TQString& problem,
+	ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem,
 				 const TQString& file, const TQString& line, const TQString& column  )
-		: TQListViewItem( parent, level, problem, file, line, column ) {}
+		: TQListViewItem( tqparent, level, problem, file, line, column ) {}
 
-	ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem,
+	ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem,
 				 const TQString& file, const TQString& line, const TQString& column  )
-		: TQListViewItem( parent, level, problem, file, line, column ) {}
+		: TQListViewItem( tqparent, level, problem, file, line, column ) {}
 
 	int compare( TQListViewItem* item, int column, bool ascending ) const {
 		if( column == 3 || column == 4 ){
@@ -69,8 +69,8 @@ public:
 
 };
 
-ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, const char* name )
-    : TQListView( parent, name ),
+ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* tqparent, const char* name )
+    : TQListView( tqparent, name ),
       m_pascalSupport( part ),
       m_editor( 0 ),
       m_document( 0 ),
@@ -217,7 +217,7 @@ void ProblemReporter::reportError( TQString message,
 	
     new ProblemItem( this,
                        "error",
-                       message.replace( TQRegExp("\n"), "" ),
+                       message.tqreplace( TQRegExp("\n"), "" ),
                        filename,
                        TQString::number( line ),
                        TQString::number( column ) );
@@ -229,7 +229,7 @@ void ProblemReporter::reportWarning( TQString message,
 {
     new ProblemItem( this,
                        "warning",
-                       message.replace( TQRegExp("\n"), "" ),
+                       message.tqreplace( TQRegExp("\n"), "" ),
                        filename,
                        TQString::number( line ),
                        TQString::number( column ) );
@@ -241,7 +241,7 @@ void ProblemReporter::reportMessage( TQString message,
 {
     new TQListViewItem( this,
                        "message",
-                       message.replace( TQRegExp("\n"), "" ),
+                       message.tqreplace( TQRegExp("\n"), "" ),
                        filename,
                        TQString::number( line ),
                        TQString::number( column ) );
diff --git a/languages/pascal/problemreporter.h b/languages/pascal/problemreporter.h
index c00b629c..196d0b74 100644
--- a/languages/pascal/problemreporter.h
+++ b/languages/pascal/problemreporter.h
@@ -36,10 +36,11 @@ namespace KTextEditor{
     class Document;
 }
 
-class ProblemReporter: public QListView{
+class ProblemReporter: public TQListView{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProblemReporter( PascalSupportPart* part, TQWidget* parent=0, const char* name=0 );
+    ProblemReporter( PascalSupportPart* part, TQWidget* tqparent=0, const char* name=0 );
     virtual ~ProblemReporter();
 
     virtual void reportError( TQString message, TQString filename,
diff --git a/languages/perl/README.dox b/languages/perl/README.dox
index f8608a41..09d1f0f0 100644
--- a/languages/perl/README.dox
+++ b/languages/perl/README.dox
@@ -12,7 +12,7 @@ and images.
 \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
 
 \feature perl programming language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/perl/doc/perl.toc b/languages/perl/doc/perl.toc
index 84cb8145..05bab529 100644
--- a/languages/perl/doc/perl.toc
+++ b/languages/perl/doc/perl.toc
@@ -14,7 +14,7 @@
 <tocsect1 name="Modules: how to write and use" url="man:perlmodlib"/>
 <tocsect1 name="Modules: how to install from CPAN" url="man:perlmodinstall"/>
 <tocsect1 name="Formats" url="man:perlform"/>
-<tocsect1 name="Unicode Support" url="man:perlunicode"/>
+<tocsect1 name="Unicode Support" url="man:perltqunicode"/>
 <tocsect1 name="Locale Support" url="man:perllocale"/>
 <tocsect1 name="References Introduction" url="man:perlreftut"/>
 <tocsect1 name="References, the rest of the story" url="man:perlref"/>
diff --git a/languages/perl/perlconfigwidget.cpp b/languages/perl/perlconfigwidget.cpp
index e41def0c..58730d05 100644
--- a/languages/perl/perlconfigwidget.cpp
+++ b/languages/perl/perlconfigwidget.cpp
@@ -17,8 +17,8 @@
 
 
 PerlConfigWidget::PerlConfigWidget(TQDomDocument &projectDom,
-                                       TQWidget *parent, const char *name)
-    : PerlConfigWidgetBase(parent, name), dom(projectDom)
+                                       TQWidget *tqparent, const char *name)
+    : PerlConfigWidgetBase(tqparent, name), dom(projectDom)
 {
     interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevperlsupport/run/interpreter"));
     terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevperlsupport/run/terminal"));
diff --git a/languages/perl/perlconfigwidget.h b/languages/perl/perlconfigwidget.h
index 9fbcc804..11b4503d 100644
--- a/languages/perl/perlconfigwidget.h
+++ b/languages/perl/perlconfigwidget.h
@@ -19,9 +19,10 @@
 class PerlConfigWidget : public PerlConfigWidgetBase
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PerlConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 );
+    PerlConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 );
     ~PerlConfigWidget();
 
 public slots:
diff --git a/languages/perl/perlconfigwidgetbase.ui b/languages/perl/perlconfigwidgetbase.ui
index 8becd0f4..521531fd 100644
--- a/languages/perl/perlconfigwidgetbase.ui
+++ b/languages/perl/perlconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>PerlConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>perl_config_widget</cstring>
     </property>
@@ -20,7 +20,7 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>interpreter_label</cstring>
             </property>
@@ -31,7 +31,7 @@
                 <cstring>interpreter_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -43,7 +43,7 @@
                     <number>0</number>
                 </property>
 
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>interpreter_edit</cstring>
                     </property>
@@ -72,7 +72,7 @@
                 <enum>Minimum</enum>
             </property>
         </spacer>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>terminal_box</cstring>
             </property>
@@ -96,6 +96,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp
index 60cca8f5..4ab48333 100644
--- a/languages/perl/perlparser.cpp
+++ b/languages/perl/perlparser.cpp
@@ -161,11 +161,11 @@ void perlparser::parseLines(TQStringList* lines,const TQString &fileName)
 
     //base matching
     if ((basere.search(line)>=0) && (!m_inscript)) {
-         TQString parent = basere.cap(1);
-         //create child & parent classes
-         kdDebug(9016) << "basere match [" << parent << "]" << endl;
+         TQString tqparent = basere.cap(1);
+         //create child & tqparent classes
+         kdDebug(9016) << "basere match [" << tqparent << "]" << endl;
          addClass(fileName,lineNo);
-         addParentClass(parent);
+         addParentClass(tqparent);
          continue;
     } else {
       if (libre.search(line)>=0) {
@@ -186,11 +186,11 @@ void perlparser::parseLines(TQStringList* lines,const TQString &fileName)
     } //base
 
     if ((isare.search(line)>=0) && (!m_inscript)) {
-         TQString parent = isare.cap(1);
-         //create child & parent classes
-         kdDebug(9016) << "isare match [" << parent << "]" << endl;
+         TQString tqparent = isare.cap(1);
+         //create child & tqparent classes
+         kdDebug(9016) << "isare match [" << tqparent << "]" << endl;
          addClass(fileName,lineNo);
-         addParentClass(parent);
+         addParentClass(tqparent);
          continue;
     } //isa
 
@@ -424,11 +424,11 @@ void perlparser::addPackageSub(const TQString& fileName ,int lineNr ,const TQStr
  m_lastsub=name;
 }
 
-void perlparser::addParentClass(const TQString& parent)
+void perlparser::addParentClass(const TQString& tqparent)
 {
- kdDebug(9016) << "addParentClass[ " << parent << "]" << endl;
+ kdDebug(9016) << "addParentClass[ " << tqparent << "]" << endl;
  if (m_lastclass) {
-        m_lastclass->addBaseClass(parent);
+        m_lastclass->addBaseClass(tqparent);
  } else {
     kdDebug(9016) << "addParentClass[ no m_lastclass]" << endl;
  }
@@ -437,7 +437,7 @@ void perlparser::addParentClass(const TQString& parent)
 void perlparser::addUseLib(const TQString& lib)
 {
  if (!m_model->hasFile(lib)) {
-   if (m_usefiles.findIndex(lib) == -1) {
+   if (m_usefiles.tqfindIndex(lib) == -1) {
       //only add if not already parsed or in the list
       kdDebug(9016) << "add lib for later parsing [" << lib << "]" << endl;
       m_usefiles.append(lib);
@@ -478,7 +478,7 @@ TQString perlparser::findLib( const TQString& lib)
   TQString result;
 
   TQString file=lib;
-  file.replace( TQRegExp("::"), TQString("/"));
+  file.tqreplace( TQRegExp("::"), TQString("/"));
 
   //find the correct path by using the INC list
   TQStringList::Iterator inc = m_INClist.begin();
diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h
index b536596b..e2ec4d7e 100644
--- a/languages/perl/perlparser.h
+++ b/languages/perl/perlparser.h
@@ -49,7 +49,7 @@ class perlparser {
   void addScriptSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub);
   void addClassMethod(const TQString& fileName ,int lineNr , const TQString& name , bool privatesub);
   void addPackageSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub);
-  void addParentClass(const TQString& parent);
+  void addParentClass(const TQString& tqparent);
   void addScript(const TQString& fileName ,int lineNr , const TQString& name);
   void addUseLib(const TQString& lib);
   void getPerlINC();
@@ -59,7 +59,7 @@ class perlparser {
   bool    m_inclass;
 
   TQString m_lastsub;
-  TQString m_lastparentclass;
+  TQString m_lasttqparentclass;
   TQString m_lastattr;
   TQString m_lastpackagename;
   TQString m_lastscriptname;
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index d5b0868f..b131af11 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -48,8 +48,8 @@ typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
 static const KDevPluginInfo data("kdevperlsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
 
-PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
+PerlSupportPart::PerlSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport(&data, tqparent, name ? name : "PerlSupportPart")
 {
     setInstance(PerlSupportFactory::instance());
 
@@ -166,7 +166,7 @@ void PerlSupportPart::savedFile(const KURL &fileName)
 #if 0  // not needed anymore
     kdDebug(9016) << "savedFile()" << endl;
 
-    if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) {
+    if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) {
         maybeParse(fileName);
         emit updatedSourceInfo();
     }
@@ -215,7 +215,7 @@ void PerlSupportPart::slotStartInterpreter()
 void PerlSupportPart::slotExecuteString()
 {
     bool ok;
-    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0);
+    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString(), &ok, 0);
     if (ok) {
         cmd.prepend("'");
         cmd.append("'");
diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h
index 11a5f417..dd3a7bfa 100644
--- a/languages/perl/perlsupportpart.h
+++ b/languages/perl/perlsupportpart.h
@@ -19,9 +19,10 @@
 class PerlSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PerlSupportPart( TQObject *parent, const char *name, const TQStringList & );
+    PerlSupportPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~PerlSupportPart();
 
 protected:
diff --git a/languages/php/README.dox b/languages/php/README.dox
index 14e69997..57d1b1b8 100644
--- a/languages/php/README.dox
+++ b/languages/php/README.dox
@@ -14,7 +14,7 @@ all include files from your script.
 \maintainer <a href="mailto:n.escuder AT intra-links.com">Escuder Nicolas</a>
 
 \feature PHP language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=php+support&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">php support component at Bugzilla database</a>
 
diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions
index d0897bd5..d43bcb72 100644
--- a/languages/php/data/phpfunctions
+++ b/languages/php/data/phpfunctions
@@ -150,7 +150,7 @@ db:string dblist(void)
 db:int dbmopen(string filename, string mode)
 db:bool dbmclose(int dbm_identifier)
 db:int dbminsert(int dbm_identifier, string key, string value)
-db:int dbmreplace(int dbm_identifier, string key, string value)
+db:int dbmtqreplace(int dbm_identifier, string key, string value)
 db:string dbmfetch(int dbm_identifier, string key)
 db:int dbmexists(int dbm_identifier, string key)
 db:int dbmdelete(int dbm_identifier, string key)
@@ -165,7 +165,7 @@ dba:string dba_firstkey(int handle)
 dba:string dba_nextkey(int handle)
 dba:bool dba_delete(string key, int handle)
 dba:bool dba_insert(string key, string value, int handle)
-dba:bool dba_replace(string key, string value, int handle)
+dba:bool dba_tqreplace(string key, string value, int handle)
 dba:bool dba_optimize(int handle)
 dba:bool dba_sync(int handle)
 dbase:int dbase_open(string name, int mode)
@@ -184,7 +184,7 @@ domxml:string domxml_attrname([int dir_handle])
 domxml:class domxml_node(string name)
 domxml:string domxml_lastchild([int node])
 domxml:string domxml_parent([int node])
-domxml:string domxml_children([int node])
+domxml:string domxml_tqchildren([int node])
 domxml:string domxml_getattr([int node,] string attrname)
 domxml:bool domxml_setattr([int node,] string attrname, string value)
 domxml:array domxml_attributes([int node])
@@ -199,7 +199,7 @@ domxml:string domxml_add_root([int doc_handle,] string name)
 domxml:class domxml_new_xmldoc(string version)
 domxml:string node_namespace([int node])
 domxml:string node_attributes([int node])
-domxml:string node_children([int node])
+domxml:string node_tqchildren([int node])
 domxml:class xmltree(string xmldoc)
 dotnet:int dotnet_load(string module_name)
 exif:string read_exif_data(string filename)
@@ -341,11 +341,11 @@ hw:hwdoc hw_gettext(int link, int objid [, int rootid])
 hw:void hw_edittext(int link, hwdoc doc)
 hw:hwdoc hw_getcgi(int link, int objid)
 hw:int hw_getremote(int link, int objid)
-hw:[array|int] hw_getremotechildren(int link, string objrec)
+hw:[array|int] hw_getremotetqchildren(int link, string objrec)
 hw:void hw_setlinkroot(int link, int rootid)
 hw:hwdoc hw_pipedocument(int link, int objid)
 hw:hwdoc hw_pipecgi(int link, int objid)
-hw:void hw_insertdocument(int link, int parentid, hwdoc doc)
+hw:void hw_insertdocument(int link, int tqparentid, hwdoc doc)
 hw:hwdoc hw_new_document(string objrec, string data, int size)
 hw:void hw_free_document(hwdoc doc)
 hw:void hw_outputdocument(hwdoc doc)
@@ -358,10 +358,10 @@ hw:int hw_documentsize(hwdoc doc)
 hw:int hw_document_size(hwdoc doc)
 hw:string hw_documentattributes(hwdoc doc)
 hw:string hw_document_attributes(hwdoc doc)
-hw:array hw_getparentsobj(int link, int objid)
-hw:array hw_getparents(int link, int objid)
-hw:array hw_children(int link, int objid)
-hw:array hw_childrenobj(int link, int objid)
+hw:array hw_gettqparentsobj(int link, int objid)
+hw:array hw_gettqparents(int link, int objid)
+hw:array hw_tqchildren(int link, int objid)
+hw:array hw_tqchildrenobj(int link, int objid)
 hw:array hw_getchildcoll(int link, int objid)
 hw:array hw_getchildcollobj(int link, int objid)
 hw:int hw_docbyanchor(int link, int anchorid)
@@ -379,8 +379,8 @@ hw:void hw_identify(int link, string username, string password)
 hw:array hw_objrec2array(string objrec, [array format])
 hw:string hw_array2objrec(array objarr)
 hw:array hw_incollections(int link, array objids, array collids, int para)
-hw:void hw_inscoll(int link, int parentid, array objarr)
-hw:void hw_insdoc(int link, int parentid, string objrec [, string text])
+hw:void hw_inscoll(int link, int tqparentid, array objarr)
+hw:void hw_insdoc(int link, int tqparentid, string objrec [, string text])
 hw:int hw_getsrcbydestobj(int link, int destid)
 hw:int hw_mapid(int link, int serverid, int destid)
 hw:string hw_getrellink(int link, int rootid, int sourceid, int destid)
@@ -559,7 +559,7 @@ ldap:array ldap_explode_dn(string dn, int with_attrib)
 ldap:string ldap_dn2ufn(string dn)
 ldap:int ldap_add(int link, string dn, array entry)
 ldap:int ldap_modify(int link, string dn, array entry)
-ldap:int ldap_mod_replace(int link, string dn, array entry)
+ldap:int ldap_mod_tqreplace(int link, string dn, array entry)
 ldap:int ldap_mod_add(int link, string dn, array entry)
 ldap:int ldap_mod_del(int link, string dn, array entry)
 ldap:int ldap_delete(int link, string dn)
@@ -861,7 +861,7 @@ ovrimos:int ovrimos_rollback(int connection_id)
 ovrimos:int ovrimos_setoption(int conn_id|result_id, int which, int option, int value)
 pcre:int preg_match(string pattern, string subject [, array subpatterns])
 pcre:int preg_match_all(string pattern, string subject, array subpatterns [, int order])
-pcre:string preg_replace(string|array regex, string|array replace, string|array subject [, int limit])
+pcre:string preg_tqreplace(string|array regex, string|array tqreplace, string|array subject [, int limit])
 pcre:array preg_split(string pattern, string subject [, int limit [, int flags]])
 pcre:string preg_quote(string str, string delim_char)
 pcre:array preg_grep(string regex, array input)
@@ -928,7 +928,7 @@ pdf:void pdf_setgray(int pdfdoc, double value)
 pdf:void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue)
 pdf:void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue)
 pdf:void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue)
-pdf:int pdf_add_outline(int pdfdoc, string text [, int parent, int open]);
+pdf:int pdf_add_outline(int pdfdoc, string text [, int tqparent, int open]);
 pdf:void pdf_set_transition(int pdfdoc, int transition)
 pdf:void pdf_set_duration(int pdfdoc, double duration)
 pdf:int pdf_open_gif(int pdf, string giffile)
@@ -1287,7 +1287,7 @@ file:int fseek(int fp, int offset [, int whence])
 file:int mkdir(string pathname, int mode)
 file:int rmdir(string dirname)
 file:int readfile(string filename [, int use_include_path])
-file:int umask([int mask])
+file:int umask([int tqmask])
 file:int fpassthru(int fp)
 file:int rename(string old_name, string new_name)
 file:int unlink(string filename)
@@ -1403,15 +1403,15 @@ rand:int mt_getrandmax(void)
 quot_print:string quoted_printable_decode(string str)
 reg:int ereg(string pattern, string string [, array registers])
 reg:int eregi(string pattern, string string [, array registers])
-reg:string ereg_replace(string pattern, string replacement, string string)
-reg:string eregi_replace(string pattern, string replacement, string string])
+reg:string ereg_tqreplace(string pattern, string replacement, string string)
+reg:string eregi_tqreplace(string pattern, string replacement, string string])
 reg:array split(string pattern, string string [, int limit])
 reg:array spliti(string pattern, string string [, int limit])
 reg:string sql_regcase(string string)
 soundex:string soundex(string str)
 string:string bin2hex(string data)
-string:int strspn(string str, string mask)
-string:int strcspn(string str, string mask)
+string:int strspn(string str, string tqmask)
+string:int strcspn(string str, string tqmask)
 string:string rtrim(string str)
 string:string chop(string str)
 string:string trim(string str)
@@ -1434,7 +1434,7 @@ string:int strrpos(string haystack, string needle)
 string:string strrchr(string haystack, string needle)
 string:string chunk_split(string str [, int chunklen [, string ending]])
 string:string substr(string str, int start [, int length])
-string:string substr_replace(string str, string repl, int start [, int length])
+string:string substr_tqreplace(string str, string repl, int start [, int length])
 string:string quotemeta(string str)
 string:int ord(string character)
 string:string chr(int ascii)
@@ -1447,7 +1447,7 @@ string:string addcslashes(string str, string charlist)
 string:string addslashes(string str)
 string:string stripcslashes(string str)
 string:string stripslashes(string str)
-string:string str_replace(string needle, string str, string haystack)
+string:string str_tqreplace(string needle, string str, string haystack)
 string:string hebrev(string str [, int max_chars_per_line])
 string:string hebrevc(string str [, int max_chars_per_line])
 string:string nl2br(string str)
@@ -1501,18 +1501,18 @@ swf:void swf_actiongotolabel(string label)
 swf:void swf_defineline(int objid, double x1, double y1, double x2, double y2, double width)
 swf:void swf_definerect(int objid, double x1, double y1, double x2, double y2, double width)
 swf:void swf_definepoly(int obj_id, array coords, int npoints, double width)
-swf:void swf_startshape(int objid)
-swf:void swf_shapelinesolid(double r, double g, double b, double a, double width)
-swf:void swf_shapefilloff(void)
-swf:void swf_shapefillsolid(double r, double g, double b, double a)
-swf:void swf_shapefillbitmapclip(int bitmapid)
-swf:void swf_shapefillbitmaptile(int bitmapid)
-swf:void swf_shapemoveto(double x, double y)
-swf:void swf_shapelineto(double x, double y)
-swf:void swf_shapecurveto(double x1, double y1, double x2, double y2)
-swf:void swf_shapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3)
-swf:void swf_shapearc(double x, double y, double r, double ang1, double ang2)
-swf:void swf_endshape(void)
+swf:void swf_starttqshape(int objid)
+swf:void swf_tqshapelinesolid(double r, double g, double b, double a, double width)
+swf:void swf_tqshapefilloff(void)
+swf:void swf_tqshapefillsolid(double r, double g, double b, double a)
+swf:void swf_tqshapefillbitmapclip(int bitmapid)
+swf:void swf_tqshapefillbitmaptile(int bitmapid)
+swf:void swf_tqshapemoveto(double x, double y)
+swf:void swf_tqshapelineto(double x, double y)
+swf:void swf_tqshapecurveto(double x1, double y1, double x2, double y2)
+swf:void swf_tqshapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3)
+swf:void swf_tqshapearc(double x, double y, double r, double ang1, double ang2)
+swf:void swf_endtqshape(void)
 swf:void swf_definefont(int fontid, string name)
 swf:void swf_setfont(int fontid)
 swf:void swf_fontsize(double height)
diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc
index f09df62e..f3feeef8 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -557,11 +557,11 @@
     <tocsect2 name="Predefined Constants" url="recode.constants.php"/>
     <tocsect2 name="Recode Functions" url="ref.recode.php"/>
 </tocsect1>
-<tocsect1 name="Unicode" url="book.unicode.php">
-    <tocsect2 name="Introduction" url="intro.unicode.php"/>
-    <tocsect2 name="Installing/Configuring" url="unicode.setup.php"/>
-    <tocsect2 name="Predefined Constants" url="unicode.constants.php"/>
-    <tocsect2 name="Unicode Functions" url="ref.unicode.php"/>
+<tocsect1 name="Unicode" url="book.tqunicode.php">
+    <tocsect2 name="Introduction" url="intro.tqunicode.php"/>
+    <tocsect2 name="Installing/Configuring" url="tqunicode.setup.php"/>
+    <tocsect2 name="Predefined Constants" url="tqunicode.constants.php"/>
+    <tocsect2 name="Unicode Functions" url="ref.tqunicode.php"/>
 </tocsect1>
 <tocsect1 name="Exif" url="book.exif.php">
     <tocsect2 name="Introduction" url="intro.exif.php"/>
@@ -688,7 +688,7 @@
     <tocsect2 name="SWFMorph" url="class.swfmorph.php"/>
     <tocsect2 name="SWFMovie" url="class.swfmovie.php"/>
     <tocsect2 name="SWFPrebuiltClip" url="class.swfprebuiltclip.php"/>
-    <tocsect2 name="SWFShape" url="class.swfshape.php"/>
+    <tocsect2 name="SWFShape" url="class.swftqshape.php"/>
     <tocsect2 name="SWFSound" url="class.swfsound.php"/>
     <tocsect2 name="SWFSoundInstance" url="class.swfsoundinstance.php"/>
     <tocsect2 name="SWFSprite" url="class.swfsprite.php"/>
@@ -806,7 +806,7 @@
     <tocsect2 name="DirectoryIterator" url="class.directoryiterator.php"/>
     <tocsect2 name="FilterIterator" url="class.filteriterator.php"/>
     <tocsect2 name="LimitIterator" url="class.limititerator.php"/>
-    <tocsect2 name="ParentIterator" url="class.parentiterator.php"/>
+    <tocsect2 name="ParentIterator" url="class.tqparentiterator.php"/>
     <tocsect2 name="RecursiveDirectoryIterator" url="class.recursivedirectoryiterator.php"/>
     <tocsect2 name="RecursiveIteratorIterator" url="class.recursiveiteratoriterator.php"/>
     <tocsect2 name="SimpleXMLIterator" url="class.simplexmliterator.php"/>
@@ -1477,7 +1477,7 @@
 <entry name="zend_thread_id" url="function.zend-thread-id.php"/>
 <entry name="zend_version" url="function.zend-version.php"/>
 <entry name="Runkit_Sandbox" url="runkit.sandbox.php"/>
-<entry name="Runkit_Sandbox_Parent" url="runkit.sandbox-parent.php"/>
+<entry name="Runkit_Sandbox_Parent" url="runkit.sandbox-tqparent.php"/>
 <entry name="runkit_class_adopt" url="function.runkit-class-adopt.php"/>
 <entry name="runkit_class_emancipate" url="function.runkit-class-emancipate.php"/>
 <entry name="runkit_constant_add" url="function.runkit-constant-add.php"/>
@@ -1629,7 +1629,7 @@
 <entry name="newt_checkbox_set_flags" url="function.newt-checkbox-set-flags.php"/>
 <entry name="newt_checkbox_set_value" url="function.newt-checkbox-set-value.php"/>
 <entry name="newt_checkbox_tree_add_item" url="function.newt-checkbox-tree-add-item.php"/>
-<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-find-item.php"/>
+<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-tqfind-item.php"/>
 <entry name="newt_checkbox_tree_get_current" url="function.newt-checkbox-tree-get-current.php"/>
 <entry name="newt_checkbox_tree_get_entry_value" url="function.newt-checkbox-tree-get-entry-value.php"/>
 <entry name="newt_checkbox_tree_get_multi_selection" url="function.newt-checkbox-tree-get-multi-selection.php"/>
@@ -1805,7 +1805,7 @@
 <entry name="ncurses_meta" url="function.ncurses-meta.php"/>
 <entry name="ncurses_mouse_trafo" url="function.ncurses-mouse-trafo.php"/>
 <entry name="ncurses_mouseinterval" url="function.ncurses-mouseinterval.php"/>
-<entry name="ncurses_mousemask" url="function.ncurses-mousemask.php"/>
+<entry name="ncurses_mousetqmask" url="function.ncurses-mousetqmask.php"/>
 <entry name="ncurses_move_panel" url="function.ncurses-move-panel.php"/>
 <entry name="ncurses_move" url="function.ncurses-move.php"/>
 <entry name="ncurses_mvaddch" url="function.ncurses-mvaddch.php"/>
@@ -1840,7 +1840,7 @@
 <entry name="ncurses_qiflush" url="function.ncurses-qiflush.php"/>
 <entry name="ncurses_raw" url="function.ncurses-raw.php"/>
 <entry name="ncurses_refresh" url="function.ncurses-refresh.php"/>
-<entry name="ncurses_replace_panel" url="function.ncurses-replace-panel.php"/>
+<entry name="ncurses_replace_panel" url="function.ncurses-tqreplace-panel.php"/>
 <entry name="ncurses_reset_prog_mode" url="function.ncurses-reset-prog-mode.php"/>
 <entry name="ncurses_reset_shell_mode" url="function.ncurses-reset-shell-mode.php"/>
 <entry name="ncurses_resetty" url="function.ncurses-resetty.php"/>
@@ -2245,7 +2245,7 @@
 <entry name="dba_open" url="function.dba-open.php"/>
 <entry name="dba_optimize" url="function.dba-optimize.php"/>
 <entry name="dba_popen" url="function.dba-popen.php"/>
-<entry name="dba_replace" url="function.dba-replace.php"/>
+<entry name="dba_tqreplace" url="function.dba-tqreplace.php"/>
 <entry name="dba_sync" url="function.dba-sync.php"/>
 <entry name="dbx_close" url="function.dbx-close.php"/>
 <entry name="dbx_compare" url="function.dbx-compare.php"/>
@@ -2411,7 +2411,7 @@
 <entry name="dbase_numrecords" url="function.dbase-numrecords.php"/>
 <entry name="dbase_open" url="function.dbase-open.php"/>
 <entry name="dbase_pack" url="function.dbase-pack.php"/>
-<entry name="dbase_replace_record" url="function.dbase-replace-record.php"/>
+<entry name="dbase_replace_record" url="function.dbase-tqreplace-record.php"/>
 <entry name="dbplus_add" url="function.dbplus-add.php"/>
 <entry name="dbplus_aql" url="function.dbplus-aql.php"/>
 <entry name="dbplus_chdir" url="function.dbplus-chdir.php"/>
@@ -2419,7 +2419,7 @@
 <entry name="dbplus_curr" url="function.dbplus-curr.php"/>
 <entry name="dbplus_errcode" url="function.dbplus-errcode.php"/>
 <entry name="dbplus_errno" url="function.dbplus-errno.php"/>
-<entry name="dbplus_find" url="function.dbplus-find.php"/>
+<entry name="dbplus_tqfind" url="function.dbplus-find.php"/>
 <entry name="dbplus_first" url="function.dbplus-first.php"/>
 <entry name="dbplus_flush" url="function.dbplus-flush.php"/>
 <entry name="dbplus_freealllocks" url="function.dbplus-freealllocks.php"/>
@@ -3581,7 +3581,7 @@
 <entry name="mb_encode_mimeheader" url="function.mb-encode-mimeheader.php"/>
 <entry name="mb_encode_numericentity" url="function.mb-encode-numericentity.php"/>
 <entry name="mb_ereg_match" url="function.mb-ereg-match.php"/>
-<entry name="mb_ereg_replace" url="function.mb-ereg-replace.php"/>
+<entry name="mb_ereg_tqreplace" url="function.mb-ereg-tqreplace.php"/>
 <entry name="mb_ereg_search_getpos" url="function.mb-ereg-search-getpos.php"/>
 <entry name="mb_ereg_search_getregs" url="function.mb-ereg-search-getregs.php"/>
 <entry name="mb_ereg_search_init" url="function.mb-ereg-search-init.php"/>
@@ -3590,7 +3590,7 @@
 <entry name="mb_ereg_search_setpos" url="function.mb-ereg-search-setpos.php"/>
 <entry name="mb_ereg_search" url="function.mb-ereg-search.php"/>
 <entry name="mb_ereg" url="function.mb-ereg.php"/>
-<entry name="mb_eregi_replace" url="function.mb-eregi-replace.php"/>
+<entry name="mb_eregi_tqreplace" url="function.mb-eregi-tqreplace.php"/>
 <entry name="mb_eregi" url="function.mb-eregi.php"/>
 <entry name="mb_get_info" url="function.mb-get-info.php"/>
 <entry name="mb_http_input" url="function.mb-http-input.php"/>
@@ -3644,12 +3644,12 @@
 <entry name="recode_file" url="function.recode-file.php"/>
 <entry name="recode_string" url="function.recode-string.php"/>
 <entry name="recode" url="function.recode.php"/>
-<entry name="unicode_decode" url="function.unicode-decode.php"/>
-<entry name="unicode_encode" url="function.unicode-encode.php"/>
-<entry name="unicode_get_error_mode" url="function.unicode-get-error-mode.php"/>
-<entry name="unicode_get_subst_char" url="function.unicode-get-subst-char.php"/>
-<entry name="unicode_set_error_mode" url="function.unicode-set-error-mode.php"/>
-<entry name="unicode_set_subst_char" url="function.unicode-set-subst-char.php"/>
+<entry name="tqunicode_decode" url="function.tqunicode-decode.php"/>
+<entry name="tqunicode_encode" url="function.tqunicode-encode.php"/>
+<entry name="tqunicode_get_error_mode" url="function.tqunicode-get-error-mode.php"/>
+<entry name="tqunicode_get_subst_char" url="function.tqunicode-get-subst-char.php"/>
+<entry name="tqunicode_set_error_mode" url="function.tqunicode-set-error-mode.php"/>
+<entry name="tqunicode_set_subst_char" url="function.tqunicode-set-subst-char.php"/>
 <entry name="exif_imagetype" url="function.exif-imagetype.php"/>
 <entry name="exif_read_data" url="function.exif-read-data.php"/>
 <entry name="exif_tagname" url="function.exif-tagname.php"/>
@@ -3841,7 +3841,7 @@
 <entry name="Imagick::getImageFilename" url="function.imagick-getimagefilename.php"/>
 <entry name="Imagick::getImageFormat" url="function.imagick-getimageformat.php"/>
 <entry name="Imagick::getImageGamma" url="function.imagick-getimagegamma.php"/>
-<entry name="Imagick::getImageGeometry" url="function.imagick-getimagegeometry.php"/>
+<entry name="Imagick::getImageGeometry" url="function.imagick-getimagetqgeometry.php"/>
 <entry name="Imagick::getImageGreenPrimary" url="function.imagick-getimagegreenprimary.php"/>
 <entry name="Imagick::getImageHeight" url="function.imagick-getimageheight.php"/>
 <entry name="Imagick::getImageHistogram" url="function.imagick-getimagehistogram.php"/>
@@ -3853,7 +3853,7 @@
 <entry name="Imagick::getImageMagickLicense" url="function.imagick-getimagemagicklicense.php"/>
 <entry name="Imagick::getImageMatte" url="function.imagick-getimagematte.php"/>
 <entry name="Imagick::getImageMatteColor" url="function.imagick-getimagemattecolor.php"/>
-<entry name="Imagick::getImageOrientation" url="function.imagick-getimageorientation.php"/>
+<entry name="Imagick::getImageQt::Orientation" url="function.imagick-getimageorientation.php"/>
 <entry name="Imagick::getImagePage" url="function.imagick-getimagepage.php"/>
 <entry name="Imagick::getImagePixelColor" url="function.imagick-getimagepixelcolor.php"/>
 <entry name="Imagick::getImageProfile" url="function.imagick-getimageprofile.php"/>
@@ -3980,7 +3980,7 @@
 <entry name="Imagick::setImageMatte" url="function.imagick-setimagematte.php"/>
 <entry name="Imagick::setImageMatteColor" url="function.imagick-setimagemattecolor.php"/>
 <entry name="Imagick::setImageOpacity" url="function.imagick-setimageopacity.php"/>
-<entry name="Imagick::setImageOrientation" url="function.imagick-setimageorientation.php"/>
+<entry name="Imagick::setImageQt::Orientation" url="function.imagick-setimageorientation.php"/>
 <entry name="Imagick::setImagePage" url="function.imagick-setimagepage.php"/>
 <entry name="Imagick::setImageProfile" url="function.imagick-setimageprofile.php"/>
 <entry name="Imagick::setImageProperty" url="function.imagick-setimageproperty.php"/>
@@ -4026,7 +4026,7 @@
 <entry name="Imagick::transverseImage" url="function.imagick-transverseimage.php"/>
 <entry name="Imagick::trimImage" url="function.imagick-trimimage.php"/>
 <entry name="Imagick::uniqueImageColors" url="function.imagick-uniqueimagecolors.php"/>
-<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharpmaskimage.php"/>
+<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharptqmaskimage.php"/>
 <entry name="Imagick::valid" url="function.imagick-valid.php"/>
 <entry name="Imagick::vignetteImage" url="function.imagick-vignetteimage.php"/>
 <entry name="Imagick::waveImage" url="function.imagick-waveimage.php"/>
@@ -4067,7 +4067,7 @@
 <entry name="ImagickDraw::getStrokeMiterLimit" url="function.imagickdraw-getstrokemiterlimit.php"/>
 <entry name="ImagickDraw::getStrokeOpacity" url="function.imagickdraw-getstrokeopacity.php"/>
 <entry name="ImagickDraw::getStrokeWidth" url="function.imagickdraw-getstrokewidth.php"/>
-<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettextalignment.php"/>
+<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettexttqalignment.php"/>
 <entry name="ImagickDraw::getTextAntialias" url="function.imagickdraw-gettextantialias.php"/>
 <entry name="ImagickDraw::getTextDecoration" url="function.imagickdraw-gettextdecoration.php"/>
 <entry name="ImagickDraw::getTextEncoding" url="function.imagickdraw-gettextencoding.php"/>
@@ -4138,7 +4138,7 @@
 <entry name="ImagickDraw::setStrokeOpacity" url="function.imagickdraw-setstrokeopacity.php"/>
 <entry name="ImagickDraw::setStrokePatternURL" url="function.imagickdraw-setstrokepatternurl.php"/>
 <entry name="ImagickDraw::setStrokeWidth" url="function.imagickdraw-setstrokewidth.php"/>
-<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settextalignment.php"/>
+<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settexttqalignment.php"/>
 <entry name="ImagickDraw::setTextAntialias" url="function.imagickdraw-settextantialias.php"/>
 <entry name="ImagickDraw::setTextDecoration" url="function.imagickdraw-settextdecoration.php"/>
 <entry name="ImagickDraw::setTextEncoding" url="function.imagickdraw-settextencoding.php"/>
@@ -4512,7 +4512,7 @@
 <entry name="HaruDoc::getEncoder" url="function.harudoc-getencoder.php"/>
 <entry name="HaruDoc::getFont" url="function.harudoc-getfont.php"/>
 <entry name="HaruDoc::getInfoAttr" url="function.harudoc-getinfoattr.php"/>
-<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagelayout.php"/>
+<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagetqlayout.php"/>
 <entry name="HaruDoc::getPageMode" url="function.harudoc-getpagemode.php"/>
 <entry name="HaruDoc::getStreamSize" url="function.harudoc-getstreamsize.php"/>
 <entry name="HaruDoc::insertPage" url="function.harudoc-insertpage.php"/>
@@ -4534,7 +4534,7 @@
 <entry name="HaruDoc::setInfoAttr" url="function.harudoc-setinfoattr.php"/>
 <entry name="HaruDoc::setInfoDateAttr" url="function.harudoc-setinfodateattr.php"/>
 <entry name="HaruDoc::setOpenAction" url="function.harudoc-setopenaction.php"/>
-<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagelayout.php"/>
+<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagetqlayout.php"/>
 <entry name="HaruDoc::setPageMode" url="function.harudoc-setpagemode.php"/>
 <entry name="HaruDoc::setPagesConfiguration" url="function.harudoc-setpagesconfiguration.php"/>
 <entry name="HaruDoc::setPassword" url="function.harudoc-setpassword.php"/>
@@ -4639,7 +4639,7 @@
 <entry name="HaruFont::getEncodingName" url="function.harufont-getencodingname.php"/>
 <entry name="HaruFont::getFontName" url="function.harufont-getfontname.php"/>
 <entry name="HaruFont::getTextWidth" url="function.harufont-gettextwidth.php"/>
-<entry name="HaruFont::getUnicodeWidth" url="function.harufont-getunicodewidth.php"/>
+<entry name="HaruFont::getUnicodeWidth" url="function.harufont-gettqunicodewidth.php"/>
 <entry name="HaruFont::getXHeight" url="function.harufont-getxheight.php"/>
 <entry name="HaruFont::measureText" url="function.harufont-measuretext.php"/>
 <entry name="HaruImage::getBitsPerComponent" url="function.haruimage-getbitspercomponent.php"/>
@@ -4647,11 +4647,11 @@
 <entry name="HaruImage::getHeight" url="function.haruimage-getheight.php"/>
 <entry name="HaruImage::getSize" url="function.haruimage-getsize.php"/>
 <entry name="HaruImage::getWidth" url="function.haruimage-getwidth.php"/>
-<entry name="HaruImage::setColorMask" url="function.haruimage-setcolormask.php"/>
-<entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/>
+<entry name="HaruImage::setColorMask" url="function.haruimage-setcolortqmask.php"/>
+<entry name="HaruImage::setMaskImage" url="function.haruimage-settqmaskimage.php"/>
 <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/>
 <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/>
-<entry name="HaruEncoder::getUnicode" url="function.haruencoder-getunicode.php"/>
+<entry name="HaruEncoder::getUnicode" url="function.haruencoder-gettqunicode.php"/>
 <entry name="HaruEncoder::getWritingMode" url="function.haruencoder-getwritingmode.php"/>
 <entry name="HaruOutline::setDestination" url="function.haruoutline-setdestination.php"/>
 <entry name="HaruOutline::setOpened" url="function.haruoutline-setopened.php"/>
@@ -4679,7 +4679,7 @@
 <entry name="SWFBitmap->getWidth()" url="function.swfbitmap.getwidth.php"/>
 <entry name="SWFButton->addAction()" url="function.swfbutton.addaction.php"/>
 <entry name="SWFButton->addASound()" url="function.swfbutton.addasound.php"/>
-<entry name="SWFButton->addShape()" url="function.swfbutton.addshape.php"/>
+<entry name="SWFButton->addShape()" url="function.swfbutton.addtqshape.php"/>
 <entry name="SWFButton->__construct()" url="function.swfbutton.construct.php"/>
 <entry name="SWFButton->setAction()" url="function.swfbutton.setaction.php"/>
 <entry name="SWFButton->setDown()" url="function.swfbutton.setdown.php"/>
@@ -4689,7 +4689,7 @@
 <entry name="SWFButton->setUp()" url="function.swfbutton.setup.php"/>
 <entry name="SWFDisplayItem->addAction()" url="function.swfdisplayitem.addaction.php"/>
 <entry name="SWFDisplayItem->addColor()" url="function.swfdisplayitem.addcolor.php"/>
-<entry name="SWFDisplayItem->endMask()" url="function.swfdisplayitem.endmask.php"/>
+<entry name="SWFDisplayItem->endMask()" url="function.swfdisplayitem.endtqmask.php"/>
 <entry name="SWFDisplayItem->getRot()" url="function.swfdisplayitem.getrot.php"/>
 <entry name="SWFDisplayItem->getX()" url="function.swfdisplayitem.getx.php"/>
 <entry name="SWFDisplayItem->getXScale()" url="function.swfdisplayitem.getxscale.php"/>
@@ -4706,7 +4706,7 @@
 <entry name="SWFDisplayItem->scale()" url="function.swfdisplayitem.scale.php"/>
 <entry name="SWFDisplayItem->scaleTo()" url="function.swfdisplayitem.scaleto.php"/>
 <entry name="SWFDisplayItem->setDepth()" url="function.swfdisplayitem.setdepth.php"/>
-<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.setmasklevel.php"/>
+<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.settqmasklevel.php"/>
 <entry name="SWFDisplayItem->setMatrix()" url="function.swfdisplayitem.setmatrix.php"/>
 <entry name="SWFDisplayItem->setName()" url="function.swfdisplayitem.setname.php"/>
 <entry name="SWFDisplayItem->setRatio()" url="function.swfdisplayitem.setratio.php"/>
@@ -4723,7 +4723,7 @@
 <entry name="SWFFont->getAscent()" url="function.swffont.getascent.php"/>
 <entry name="SWFFont->getDescent()" url="function.swffont.getdescent.php"/>
 <entry name="SWFFont->getLeading()" url="function.swffont.getleading.php"/>
-<entry name="SWFFont->getShape()" url="function.swffont.getshape.php"/>
+<entry name="SWFFont->getShape()" url="function.swffont.gettqshape.php"/>
 <entry name="SWFFont->getUTF8Width()" url="function.swffont.getutf8width.php"/>
 <entry name="SWFFont->getWidth()" url="function.swffont.getwidth.php"/>
 <entry name="SWFFontChar->addChars()" url="function.swffontchar.addchars.php"/>
@@ -4731,8 +4731,8 @@
 <entry name="SWFGradient->addEntry()" url="function.swfgradient.addentry.php"/>
 <entry name="SWFGradient->__construct()" url="function.swfgradient.construct.php"/>
 <entry name="SWFMorph->__construct()" url="function.swfmorph.construct.php"/>
-<entry name="SWFMorph->getShape1()" url="function.swfmorph.getshape1.php"/>
-<entry name="SWFMorph->getShape2()" url="function.swfmorph.getshape2.php"/>
+<entry name="SWFMorph->getShape1()" url="function.swfmorph.gettqshape1.php"/>
+<entry name="SWFMorph->getShape2()" url="function.swfmorph.gettqshape2.php"/>
 <entry name="SWFMovie->add()" url="function.swfmovie.add.php"/>
 <entry name="SWFMovie->addExport()" url="function.swfmovie.addexport.php"/>
 <entry name="SWFMovie->addFont()" url="function.swfmovie.addfont.php"/>
@@ -4754,22 +4754,22 @@
 <entry name="SWFMovie->streamMP3()" url="function.swfmovie.streammp3.php"/>
 <entry name="SWFMovie->writeExports()" url="function.swfmovie.writeexports.php"/>
 <entry name="SWFPrebuiltClip->__construct()" url="function.swfprebuiltclip.construct.php"/>
-<entry name="SWFShape->addFill()" url="function.swfshape.addfill.php"/>
-<entry name="SWFShape->__construct()" url="function.swfshape.construct.php"/>
-<entry name="SWFShape->drawArc()" url="function.swfshape.drawarc.php"/>
-<entry name="SWFShape->drawCircle()" url="function.swfshape.drawcircle.php"/>
-<entry name="SWFShape->drawCubic()" url="function.swfshape.drawcubic.php"/>
-<entry name="SWFShape->drawCubicTo()" url="function.swfshape.drawcubicto.php"/>
-<entry name="SWFShape->drawCurve()" url="function.swfshape.drawcurve.php"/>
-<entry name="SWFShape->drawCurveTo()" url="function.swfshape.drawcurveto.php"/>
-<entry name="SWFShape->drawGlyph()" url="function.swfshape.drawglyph.php"/>
-<entry name="SWFShape->drawLine()" url="function.swfshape.drawline.php"/>
-<entry name="SWFShape->drawLineTo()" url="function.swfshape.drawlineto.php"/>
-<entry name="SWFShape->movePen()" url="function.swfshape.movepen.php"/>
-<entry name="SWFShape->movePenTo()" url="function.swfshape.movepento.php"/>
-<entry name="SWFShape->setLeftFill()" url="function.swfshape.setleftfill.php"/>
-<entry name="SWFShape->setLine()" url="function.swfshape.setline.php"/>
-<entry name="SWFShape->setRightFill()" url="function.swfshape.setrightfill.php"/>
+<entry name="SWFShape->addFill()" url="function.swftqshape.addfill.php"/>
+<entry name="SWFShape->__construct()" url="function.swftqshape.construct.php"/>
+<entry name="SWFShape->drawArc()" url="function.swftqshape.drawarc.php"/>
+<entry name="SWFShape->drawCircle()" url="function.swftqshape.drawcircle.php"/>
+<entry name="SWFShape->drawCubic()" url="function.swftqshape.drawcubic.php"/>
+<entry name="SWFShape->drawCubicTo()" url="function.swftqshape.drawcubicto.php"/>
+<entry name="SWFShape->drawCurve()" url="function.swftqshape.drawcurve.php"/>
+<entry name="SWFShape->drawCurveTo()" url="function.swftqshape.drawcurveto.php"/>
+<entry name="SWFShape->drawGlyph()" url="function.swftqshape.drawglyph.php"/>
+<entry name="SWFShape->drawLine()" url="function.swftqshape.drawline.php"/>
+<entry name="SWFShape->drawLineTo()" url="function.swftqshape.drawlineto.php"/>
+<entry name="SWFShape->movePen()" url="function.swftqshape.movepen.php"/>
+<entry name="SWFShape->movePenTo()" url="function.swftqshape.movepento.php"/>
+<entry name="SWFShape->setLeftFill()" url="function.swftqshape.setleftfill.php"/>
+<entry name="SWFShape->setLine()" url="function.swftqshape.setline.php"/>
+<entry name="SWFShape->setRightFill()" url="function.swftqshape.setrightfill.php"/>
 <entry name="SWFSound" url="function.swfsound.construct.php"/>
 <entry name="SWFSoundInstance->loopCount()" url="function.swfsoundinstance.loopcount.php"/>
 <entry name="SWFSoundInstance->loopInPoint()" url="function.swfsoundinstance.loopinpoint.php"/>
@@ -5063,7 +5063,7 @@
 <entry name="ps_show_xy" url="function.ps-show-xy.php"/>
 <entry name="ps_show2" url="function.ps-show2.php"/>
 <entry name="ps_show" url="function.ps-show.php"/>
-<entry name="ps_string_geometry" url="function.ps-string-geometry.php"/>
+<entry name="ps_string_tqgeometry" url="function.ps-string-tqgeometry.php"/>
 <entry name="ps_stringwidth" url="function.ps-stringwidth.php"/>
 <entry name="ps_stroke" url="function.ps-stroke.php"/>
 <entry name="ps_symbol_name" url="function.ps-symbol-name.php"/>
@@ -5096,7 +5096,7 @@
 <entry name="swf_definetext" url="function.swf-definetext.php"/>
 <entry name="swf_endbutton" url="function.swf-endbutton.php"/>
 <entry name="swf_enddoaction" url="function.swf-enddoaction.php"/>
-<entry name="swf_endshape" url="function.swf-endshape.php"/>
+<entry name="swf_endtqshape" url="function.swf-endtqshape.php"/>
 <entry name="swf_endsymbol" url="function.swf-endsymbol.php"/>
 <entry name="swf_fontsize" url="function.swf-fontsize.php"/>
 <entry name="swf_fontslant" url="function.swf-fontslant.php"/>
@@ -5124,20 +5124,20 @@
 <entry name="swf_scale" url="function.swf-scale.php"/>
 <entry name="swf_setfont" url="function.swf-setfont.php"/>
 <entry name="swf_setframe" url="function.swf-setframe.php"/>
-<entry name="swf_shapearc" url="function.swf-shapearc.php"/>
-<entry name="swf_shapecurveto3" url="function.swf-shapecurveto3.php"/>
-<entry name="swf_shapecurveto" url="function.swf-shapecurveto.php"/>
-<entry name="swf_shapefillbitmapclip" url="function.swf-shapefillbitmapclip.php"/>
-<entry name="swf_shapefillbitmaptile" url="function.swf-shapefillbitmaptile.php"/>
-<entry name="swf_shapefilloff" url="function.swf-shapefilloff.php"/>
-<entry name="swf_shapefillsolid" url="function.swf-shapefillsolid.php"/>
-<entry name="swf_shapelinesolid" url="function.swf-shapelinesolid.php"/>
-<entry name="swf_shapelineto" url="function.swf-shapelineto.php"/>
-<entry name="swf_shapemoveto" url="function.swf-shapemoveto.php"/>
+<entry name="swf_tqshapearc" url="function.swf-tqshapearc.php"/>
+<entry name="swf_tqshapecurveto3" url="function.swf-tqshapecurveto3.php"/>
+<entry name="swf_tqshapecurveto" url="function.swf-tqshapecurveto.php"/>
+<entry name="swf_tqshapefillbitmapclip" url="function.swf-tqshapefillbitmapclip.php"/>
+<entry name="swf_tqshapefillbitmaptile" url="function.swf-tqshapefillbitmaptile.php"/>
+<entry name="swf_tqshapefilloff" url="function.swf-tqshapefilloff.php"/>
+<entry name="swf_tqshapefillsolid" url="function.swf-tqshapefillsolid.php"/>
+<entry name="swf_tqshapelinesolid" url="function.swf-tqshapelinesolid.php"/>
+<entry name="swf_tqshapelineto" url="function.swf-tqshapelineto.php"/>
+<entry name="swf_tqshapemoveto" url="function.swf-tqshapemoveto.php"/>
 <entry name="swf_showframe" url="function.swf-showframe.php"/>
 <entry name="swf_startbutton" url="function.swf-startbutton.php"/>
 <entry name="swf_startdoaction" url="function.swf-startdoaction.php"/>
-<entry name="swf_startshape" url="function.swf-startshape.php"/>
+<entry name="swf_starttqshape" url="function.swf-starttqshape.php"/>
 <entry name="swf_startsymbol" url="function.swf-startsymbol.php"/>
 <entry name="swf_textwidth" url="function.swf-textwidth.php"/>
 <entry name="swf_translate" url="function.swf-translate.php"/>
@@ -5288,7 +5288,7 @@
 <entry name="parsekit_compile_string" url="function.parsekit-compile-string.php"/>
 <entry name="parsekit_func_arginfo" url="function.parsekit-func-arginfo.php"/>
 <entry name="class_implements" url="function.class-implements.php"/>
-<entry name="class_parents" url="function.class-parents.php"/>
+<entry name="class_parents" url="function.class-tqparents.php"/>
 <entry name="iterator_count" url="function.iterator-count.php"/>
 <entry name="iterator_to_array" url="function.iterator-to-array.php"/>
 <entry name="spl_autoload_call" url="function.spl-autoload-call.php"/>
@@ -5318,8 +5318,8 @@
 <entry name="CachingIterator::rewind" url="cachingiterator.rewind.php"/>
 <entry name="CachingIterator::__toString" url="cachingiterator.tostring.php"/>
 <entry name="CachingIterator::valid" url="cachingiterator.valid.php"/>
-<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.getchildren.php"/>
-<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.haschildren.php"/>
+<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.gettqchildren.php"/>
+<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.hastqchildren.php"/>
 <entry name="DirectoryIterator::__construct" url="directoryiterator.construct.php"/>
 <entry name="DirectoryIterator::current" url="directoryiterator.current.php"/>
 <entry name="DirectoryIterator::getATime" url="directoryiterator.getatime.php"/>
@@ -5356,12 +5356,12 @@
 <entry name="LimitIterator::rewind" url="limititerator.rewind.php"/>
 <entry name="LimitIterator::seek" url="limititerator.seek.php"/>
 <entry name="LimitIterator::valid" url="limititerator.valid.php"/>
-<entry name="ParentIterator::getChildren" url="parentiterator.getchildren.php"/>
-<entry name="ParentIterator::hasChildren" url="parentiterator.haschildren.php"/>
-<entry name="ParentIterator::next" url="parentiterator.next.php"/>
-<entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/>
-<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.getchildren.php"/>
-<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.haschildren.php"/>
+<entry name="ParentIterator::getChildren" url="tqparentiterator.gettqchildren.php"/>
+<entry name="ParentIterator::hasChildren" url="tqparentiterator.hastqchildren.php"/>
+<entry name="ParentIterator::next" url="tqparentiterator.next.php"/>
+<entry name="ParentIterator::rewind" url="tqparentiterator.rewind.php"/>
+<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.gettqchildren.php"/>
+<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.hastqchildren.php"/>
 <entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/>
 <entry name="RecursiveDirectoryIterator::next" url="recursivedirectoryiterator.next.php"/>
 <entry name="RecursiveDirectoryIterator::rewind" url="recursivedirectoryiterator.rewind.php"/>
@@ -5373,8 +5373,8 @@
 <entry name="RecursiveIteratorIterator::rewind" url="recursiveiteratoriterator.rewind.php"/>
 <entry name="RecursiveIteratorIterator::valid" url="recursiveiteratoriterator.valid.php"/>
 <entry name="SimpleXMLIterator::current" url="simplexmliterator.current.php"/>
-<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.getchildren.php"/>
-<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.haschildren.php"/>
+<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.gettqchildren.php"/>
+<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.hastqchildren.php"/>
 <entry name="SimpleXMLIterator::key" url="simplexmliterator.key.php"/>
 <entry name="SimpleXMLIterator::next" url="simplexmliterator.next.php"/>
 <entry name="SimpleXMLIterator::rewind" url="simplexmliterator.rewind.php"/>
@@ -5509,7 +5509,7 @@
 <entry name="tidy_set_encoding" url="function.tidy-set-encoding.php"/>
 <entry name="tidy_setopt" url="function.tidy-setopt.php"/>
 <entry name="tidy_warning_count" url="function.tidy-warning-count.php"/>
-<entry name="tidyNode->hasChildren" url="function.tidynode-haschildren.php"/>
+<entry name="tidyNode->hasChildren" url="function.tidynode-hastqchildren.php"/>
 <entry name="tidyNode->hasSiblings" url="function.tidynode-hassiblings.php"/>
 <entry name="tidyNode->isAsp" url="function.tidynode-isasp.php"/>
 <entry name="tidyNode->isComment" url="function.tidynode-iscomment.php"/>
@@ -5517,7 +5517,7 @@
 <entry name="tidyNode->isJste" url="function.tidynode-isjste.php"/>
 <entry name="tidyNode->isPhp" url="function.tidynode-isphp.php"/>
 <entry name="tidyNode->isText" url="function.tidynode-istext.php"/>
-<entry name="tidyNode::getParent" url="function.tidynode-getparent.php"/>
+<entry name="tidyNode::getParent" url="function.tidynode-gettqparent.php"/>
 <entry name="token_get_all" url="function.token-get-all.php"/>
 <entry name="token_name" url="function.token-name.php"/>
 <entry name="base64_decode" url="function.base64-decode.php"/>
@@ -5594,8 +5594,8 @@
 <entry name="ftp_systype" url="function.ftp-systype.php"/>
 <entry name="hw_Array2Objrec" url="function.hw-array2objrec.php"/>
 <entry name="hw_changeobject" url="function.hw-changeobject.php"/>
-<entry name="hw_Children" url="function.hw-children.php"/>
-<entry name="hw_ChildrenObj" url="function.hw-childrenobj.php"/>
+<entry name="hw_Children" url="function.hw-tqchildren.php"/>
+<entry name="hw_ChildrenObj" url="function.hw-tqchildrenobj.php"/>
 <entry name="hw_Close" url="function.hw-close.php"/>
 <entry name="hw_Connect" url="function.hw-connect.php"/>
 <entry name="hw_connection_info" url="function.hw-connection-info.php"/>
@@ -5625,11 +5625,11 @@
 <entry name="hw_GetObjectByQueryColl" url="function.hw-getobjectbyquerycoll.php"/>
 <entry name="hw_GetObjectByQueryCollObj" url="function.hw-getobjectbyquerycollobj.php"/>
 <entry name="hw_GetObjectByQueryObj" url="function.hw-getobjectbyqueryobj.php"/>
-<entry name="hw_GetParents" url="function.hw-getparents.php"/>
-<entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/>
+<entry name="hw_GetParents" url="function.hw-gettqparents.php"/>
+<entry name="hw_GetParentsObj" url="function.hw-gettqparentsobj.php"/>
 <entry name="hw_getrellink" url="function.hw-getrellink.php"/>
 <entry name="hw_GetRemote" url="function.hw-getremote.php"/>
-<entry name="hw_getremotechildren" url="function.hw-getremotechildren.php"/>
+<entry name="hw_getremotetqchildren" url="function.hw-getremotetqchildren.php"/>
 <entry name="hw_GetSrcByDestObj" url="function.hw-getsrcbydestobj.php"/>
 <entry name="hw_GetText" url="function.hw-gettext.php"/>
 <entry name="hw_getusername" url="function.hw-getusername.php"/>
@@ -5661,7 +5661,7 @@
 <entry name="hw_api_attribute" url="function.hwapi-attribute.php"/>
 <entry name="hw_api->checkin" url="function.hwapi-checkin.php"/>
 <entry name="hw_api->checkout" url="function.hwapi-checkout.php"/>
-<entry name="hw_api->children" url="function.hwapi-children.php"/>
+<entry name="hw_api->tqchildren" url="function.hwapi-tqchildren.php"/>
 <entry name="hw_api_content->mimetype" url="function.hwapi-content-mimetype.php"/>
 <entry name="hw_api_content->read" url="function.hwapi-content-read.php"/>
 <entry name="hw_api->content" url="function.hwapi-content.php"/>
@@ -5672,7 +5672,7 @@
 <entry name="hw_api->dstofsrcanchor" url="function.hwapi-dstofsrcanchor.php"/>
 <entry name="hw_api_error->count" url="function.hwapi-error-count.php"/>
 <entry name="hw_api_error->reason" url="function.hwapi-error-reason.php"/>
-<entry name="hw_api->find" url="function.hwapi-find.php"/>
+<entry name="hw_api->tqfind" url="function.hwapi-find.php"/>
 <entry name="hw_api->ftstat" url="function.hwapi-ftstat.php"/>
 <entry name="hwapi_hgcsp" url="function.hwapi-hgcsp.php"/>
 <entry name="hw_api->hwstat" url="function.hwapi-hwstat.php"/>
@@ -5696,11 +5696,11 @@
 <entry name="hw_api_object->value" url="function.hwapi-object-value.php"/>
 <entry name="hw_api->object" url="function.hwapi-object.php"/>
 <entry name="hw_api->objectbyanchor" url="function.hwapi-objectbyanchor.php"/>
-<entry name="hw_api->parents" url="function.hwapi-parents.php"/>
+<entry name="hw_api->tqparents" url="function.hwapi-tqparents.php"/>
 <entry name="hw_api_reason->description" url="function.hwapi-reason-description.php"/>
 <entry name="hw_api_reason->type" url="function.hwapi-reason-type.php"/>
 <entry name="hw_api->remove" url="function.hwapi-remove.php"/>
-<entry name="hw_api->replace" url="function.hwapi-replace.php"/>
+<entry name="hw_api->tqreplace" url="function.hwapi-tqreplace.php"/>
 <entry name="hw_api->setcommittedversion" url="function.hwapi-setcommittedversion.php"/>
 <entry name="hw_api->srcanchors" url="function.hwapi-srcanchors.php"/>
 <entry name="hw_api->srcsofdst" url="function.hwapi-srcsofdst.php"/>
@@ -5727,11 +5727,11 @@
 <entry name="HttpMessage::getHeader" url="function.httpmessage-getheader.php"/>
 <entry name="HttpMessage::getHeaders" url="function.httpmessage-getheaders.php"/>
 <entry name="HttpMessage::getHttpVersion" url="function.httpmessage-gethttpversion.php"/>
-<entry name="HttpMessage::getParentMessage" url="function.httpmessage-getparentmessage.php"/>
+<entry name="HttpMessage::getParentMessage" url="function.httpmessage-gettqparentmessage.php"/>
 <entry name="HttpMessage::getRequestMethod" url="function.httpmessage-getrequestmethod.php"/>
 <entry name="HttpMessage::getRequestUrl" url="function.httpmessage-getrequesturl.php"/>
 <entry name="HttpMessage::getResponseCode" url="function.httpmessage-getresponsecode.php"/>
-<entry name="HttpMessage::getResponseStatus" url="function.httpmessage-getresponsestatus.php"/>
+<entry name="HttpMessage::getResponsetqStatus" url="function.httpmessage-getresponsestatus.php"/>
 <entry name="HttpMessage::getType" url="function.httpmessage-gettype.php"/>
 <entry name="HttpMessage::guessContentType" url="function.httpmessage-guesscontenttype.php"/>
 <entry name="HttpMessage::prepend" url="function.httpmessage-prepend.php"/>
@@ -5743,7 +5743,7 @@
 <entry name="HttpMessage::setRequestMethod" url="function.httpmessage-setrequestmethod.php"/>
 <entry name="HttpMessage::setRequestUrl" url="function.httpmessage-setrequesturl.php"/>
 <entry name="HttpMessage::setResponseCode" url="function.httpmessage-setresponsecode.php"/>
-<entry name="HttpMessage::setResponseStatus" url="function.httpmessage-setresponsestatus.php"/>
+<entry name="HttpMessage::setResponsetqStatus" url="function.httpmessage-setresponsestatus.php"/>
 <entry name="HttpMessage::setType" url="function.httpmessage-settype.php"/>
 <entry name="HttpMessage::toMessageTypeObject" url="function.httpmessage-tomessagetypeobject.php"/>
 <entry name="HttpMessage::toString" url="function.httpmessage-tostring.php"/>
@@ -5788,7 +5788,7 @@
 <entry name="HttpRequest::getResponseHeader" url="function.httprequest-getresponseheader.php"/>
 <entry name="HttpRequest::getResponseInfo" url="function.httprequest-getresponseinfo.php"/>
 <entry name="HttpRequest::getResponseMessage" url="function.httprequest-getresponsemessage.php"/>
-<entry name="HttpRequest::getResponseStatus" url="function.httprequest-getresponsestatus.php"/>
+<entry name="HttpRequest::getResponsetqStatus" url="function.httprequest-getresponsestatus.php"/>
 <entry name="HttpRequest::getSslOptions" url="function.httprequest-getssloptions.php"/>
 <entry name="HttpRequest::getUrl" url="function.httprequest-geturl.php"/>
 <entry name="HttpRequest::resetCookies" url="function.httprequest-resetcookies.php"/>
@@ -5929,7 +5929,7 @@
 <entry name="ldap_list" url="function.ldap-list.php"/>
 <entry name="ldap_mod_add" url="function.ldap-mod-add.php"/>
 <entry name="ldap_mod_del" url="function.ldap-mod-del.php"/>
-<entry name="ldap_mod_replace" url="function.ldap-mod-replace.php"/>
+<entry name="ldap_mod_tqreplace" url="function.ldap-mod-tqreplace.php"/>
 <entry name="ldap_modify" url="function.ldap-modify.php"/>
 <entry name="ldap_next_attribute" url="function.ldap-next-attribute.php"/>
 <entry name="ldap_next_entry" url="function.ldap-next-entry.php"/>
@@ -5951,7 +5951,7 @@
 <entry name="notes_create_db" url="function.notes-create-db.php"/>
 <entry name="notes_create_note" url="function.notes-create-note.php"/>
 <entry name="notes_drop_db" url="function.notes-drop-db.php"/>
-<entry name="notes_find_note" url="function.notes-find-note.php"/>
+<entry name="notes_find_note" url="function.notes-tqfind-note.php"/>
 <entry name="notes_header_info" url="function.notes-header-info.php"/>
 <entry name="notes_list_msgs" url="function.notes-list-msgs.php"/>
 <entry name="notes_mark_read" url="function.notes-mark-read.php"/>
@@ -5970,12 +5970,12 @@
 <entry name="Memcache::flush" url="function.memcache-flush.php"/>
 <entry name="Memcache::get" url="function.memcache-get.php"/>
 <entry name="Memcache::getExtendedStats" url="function.memcache-getextendedstats.php"/>
-<entry name="Memcache::getServerStatus" url="function.memcache-getserverstatus.php"/>
+<entry name="Memcache::getServertqStatus" url="function.memcache-getserverstatus.php"/>
 <entry name="Memcache::getStats" url="function.memcache-getstats.php"/>
 <entry name="Memcache::getVersion" url="function.memcache-getversion.php"/>
 <entry name="Memcache::increment" url="function.memcache-increment.php"/>
 <entry name="Memcache::pconnect" url="function.memcache-pconnect.php"/>
-<entry name="Memcache::replace" url="function.memcache-replace.php"/>
+<entry name="Memcache::tqreplace" url="function.memcache-tqreplace.php"/>
 <entry name="Memcache::set" url="function.memcache-set.php"/>
 <entry name="Memcache::setCompressThreshold" url="function.memcache-setcompressthreshold.php"/>
 <entry name="Memcache::setServerParams" url="function.memcache-setserverparams.php"/>
@@ -5992,7 +5992,7 @@
 <entry name="udm_crc32" url="function.udm-crc32.php"/>
 <entry name="udm_errno" url="function.udm-errno.php"/>
 <entry name="udm_error" url="function.udm-error.php"/>
-<entry name="udm_find" url="function.udm-find.php"/>
+<entry name="udm_tqfind" url="function.udm-find.php"/>
 <entry name="udm_free_agent" url="function.udm-free-agent.php"/>
 <entry name="udm_free_ispell_data" url="function.udm-free-ispell-data.php"/>
 <entry name="udm_free_res" url="function.udm-free-res.php"/>
@@ -6250,7 +6250,7 @@
 <entry name="msession_create" url="function.msession-create.php"/>
 <entry name="msession_destroy" url="function.msession-destroy.php"/>
 <entry name="msession_disconnect" url="function.msession-disconnect.php"/>
-<entry name="msession_find" url="function.msession-find.php"/>
+<entry name="msession_tqfind" url="function.msession-find.php"/>
 <entry name="msession_get_array" url="function.msession-get-array.php"/>
 <entry name="msession_get_data" url="function.msession-get-data.php"/>
 <entry name="msession_get" url="function.msession-get.php"/>
@@ -6304,12 +6304,12 @@
 <entry name="preg_match_all" url="function.preg-match-all.php"/>
 <entry name="preg_match" url="function.preg-match.php"/>
 <entry name="preg_quote" url="function.preg-quote.php"/>
-<entry name="preg_replace_callback" url="function.preg-replace-callback.php"/>
-<entry name="preg_replace" url="function.preg-replace.php"/>
+<entry name="preg_replace_callback" url="function.preg-tqreplace-callback.php"/>
+<entry name="preg_tqreplace" url="function.preg-tqreplace.php"/>
 <entry name="preg_split" url="function.preg-split.php"/>
-<entry name="ereg_replace" url="function.ereg-replace.php"/>
+<entry name="ereg_tqreplace" url="function.ereg-tqreplace.php"/>
 <entry name="ereg" url="function.ereg.php"/>
-<entry name="eregi_replace" url="function.eregi-replace.php"/>
+<entry name="eregi_tqreplace" url="function.eregi-tqreplace.php"/>
 <entry name="eregi" url="function.eregi.php"/>
 <entry name="split" url="function.split.php"/>
 <entry name="spliti" url="function.spliti.php"/>
@@ -6364,10 +6364,10 @@
 <entry name="sprintf" url="function.sprintf.php"/>
 <entry name="sscanf" url="function.sscanf.php"/>
 <entry name="str_getcsv" url="function.str-getcsv.php"/>
-<entry name="str_ireplace" url="function.str-ireplace.php"/>
+<entry name="str_itqreplace" url="function.str-itqreplace.php"/>
 <entry name="str_pad" url="function.str-pad.php"/>
 <entry name="str_repeat" url="function.str-repeat.php"/>
-<entry name="str_replace" url="function.str-replace.php"/>
+<entry name="str_tqreplace" url="function.str-tqreplace.php"/>
 <entry name="str_rot13" url="function.str-rot13.php"/>
 <entry name="str_shuffle" url="function.str-shuffle.php"/>
 <entry name="str_split" url="function.str-split.php"/>
@@ -6401,7 +6401,7 @@
 <entry name="strtr" url="function.strtr.php"/>
 <entry name="substr_compare" url="function.substr-compare.php"/>
 <entry name="substr_count" url="function.substr-count.php"/>
-<entry name="substr_replace" url="function.substr-replace.php"/>
+<entry name="substr_tqreplace" url="function.substr-tqreplace.php"/>
 <entry name="substr" url="function.substr.php"/>
 <entry name="trim" url="function.trim.php"/>
 <entry name="ucfirst" url="function.ucfirst.php"/>
@@ -6494,7 +6494,7 @@
 <entry name="get_declared_classes" url="function.get-declared-classes.php"/>
 <entry name="get_declared_interfaces" url="function.get-declared-interfaces.php"/>
 <entry name="get_object_vars" url="function.get-object-vars.php"/>
-<entry name="get_parent_class" url="function.get-parent-class.php"/>
+<entry name="get_parent_class" url="function.get-tqparent-class.php"/>
 <entry name="interface_exists" url="function.interface-exists.php"/>
 <entry name="is_a" url="function.is-a.php"/>
 <entry name="is_subclass_of" url="function.is-subclass-of.php"/>
@@ -6571,7 +6571,7 @@
 <entry name="is_resource" url="function.is-resource.php"/>
 <entry name="is_scalar" url="function.is-scalar.php"/>
 <entry name="is_string" url="function.is-string.php"/>
-<entry name="is_unicode" url="function.is-unicode.php"/>
+<entry name="is_tqunicode" url="function.is-tqunicode.php"/>
 <entry name="isset" url="function.isset.php"/>
 <entry name="print_r" url="function.print-r.php"/>
 <entry name="serialize" url="function.serialize.php"/>
@@ -6856,12 +6856,12 @@
 <entry name="DomNode->node_type" url="function.domnode-node-type.php"/>
 <entry name="DomNode->node_value" url="function.domnode-node-value.php"/>
 <entry name="DomNode->owner_document" url="function.domnode-owner-document.php"/>
-<entry name="DomNode->parent_node" url="function.domnode-parent-node.php"/>
+<entry name="DomNode->tqparent_node" url="function.domnode-tqparent-node.php"/>
 <entry name="DomNode->prefix" url="function.domnode-prefix.php"/>
 <entry name="DomNode->previous_sibling" url="function.domnode-previous-sibling.php"/>
 <entry name="DomNode->remove_child" url="function.domnode-remove-child.php"/>
-<entry name="DomNode->replace_child" url="function.domnode-replace-child.php"/>
-<entry name="DomNode->replace_node" url="function.domnode-replace-node.php"/>
+<entry name="DomNode->replace_child" url="function.domnode-tqreplace-child.php"/>
+<entry name="DomNode->replace_node" url="function.domnode-tqreplace-node.php"/>
 <entry name="DomNode->set_content" url="function.domnode-set-content.php"/>
 <entry name="DomNode->set_name" url="function.domnode-set-name.php"/>
 <entry name="DomNode->set_namespace" url="function.domnode-set-namespace.php"/>
@@ -6916,7 +6916,7 @@
 <entry name="SimpleXMLElement->addChild()" url="function.simplexml-element-addChild.php"/>
 <entry name="SimpleXMLElement->asXML()" url="function.simplexml-element-asXML.php"/>
 <entry name="SimpleXMLElement->attributes()" url="function.simplexml-element-attributes.php"/>
-<entry name="SimpleXMLElement->children()" url="function.simplexml-element-children.php"/>
+<entry name="SimpleXMLElement->tqchildren()" url="function.simplexml-element-tqchildren.php"/>
 <entry name="SimpleXMLElement->__construct()" url="function.simplexml-element-construct.php"/>
 <entry name="SimpleXMLElement->getDocNamespaces()" url="function.simplexml-element-getDocNamespaces.php"/>
 <entry name="SimpleXMLElement->getName()" url="function.simplexml-element-getName.php"/>
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index b2b1eb33..8f0a9298 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -146,9 +146,9 @@ void PHPCodeCompletion::cursorPositionChanged(){
    }
 
    if (m_config->getCodeHinting()) {
-      int pos1 = lineStr.findRev("(", col - 1);
-      int pos2 = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1);
-      int pos3 = lineStr.findRev(")", col);
+      int pos1 = lineStr.tqfindRev("(", col - 1);
+      int pos2 = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1);
+      int pos3 = lineStr.tqfindRev(")", col);
 
       if (pos1 > pos2 && pos1 != -1 && pos3 < pos1) {
          TQString line = lineStr.mid(pos2 + 1, pos1 - pos2 - 1).stripWhiteSpace();
@@ -163,7 +163,7 @@ void PHPCodeCompletion::cursorPositionChanged(){
          return;
       }
 
-      int pos = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
+      int pos = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
       TQString line = lineStr.mid(pos + 1, col - pos).stripWhiteSpace();
 
       if (checkForVariable(line, col)) {
@@ -180,7 +180,7 @@ kdDebug(9018) << "end checkForGlobalFunction" << endl;
          return;
       }
 
-      pos = lineStr.stripWhiteSpace().findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
+      pos = lineStr.stripWhiteSpace().tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
       line = lineStr.mid(pos + 1, col - pos);
 
       if (checkForNew(line, col)) {
@@ -214,7 +214,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) {
    kdDebug(9018)   << "checkForStaticFunction" << endl;
    TQValueList<KTextEditor::CompletionEntry> list;
 
-   if (line.find("::") == -1)
+   if (line.tqfind("::") == -1)
       return false;
 
    TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
@@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) {
 
          for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) {
             FunctionDom nFunc = *funcIt;
-            if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) {
+            if ((function.isEmpty() || nFunc->name().tqstartsWith(function, FALSE)) && nFunc->isStatic()) {
                KTextEditor::CompletionEntry e;
                e.prefix = nClass->name() + " ::";
                e.text = nFunc->name();
@@ -267,7 +267,7 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){
    kdDebug(9018)   << "checkForNew" << endl;
    TQValueList<KTextEditor::CompletionEntry> list;
 
-   if (line.find("new ", 0, FALSE) == -1)
+   if (line.tqfind("new ", 0, FALSE) == -1)
       return false;
 
    TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
@@ -297,7 +297,7 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){
    kdDebug(9018)   << "checkForExtends" << endl;
    TQValueList<KTextEditor::CompletionEntry> list;
 
-   if (line.find("extends", 0, FALSE) == -1)
+   if (line.tqfind("extends", 0, FALSE) == -1)
       return false;
 
    TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
@@ -316,12 +316,12 @@ bool PHPCodeCompletion::checkForVariable(TQString line, int col){
    TQValueList<KTextEditor::CompletionEntry> list;
    TQString args;
 
-   if (line.find("->") == -1) {
+   if (line.tqfind("->") == -1) {
          return false;
    }
 
    if (line.left(2) != "->") {
-      int pos = line.findRev("->");
+      int pos = line.tqfindRev("->");
       args = line.mid(pos + 2, line.length() - pos);
       line = line.mid(0, pos);
    }
@@ -362,10 +362,10 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString
    ClassList::Iterator classIt;
    for (classIt = classList.begin(); classIt != classList.end(); ++classIt) {
       ClassDom nClass = *classIt;
-      if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) {
+      if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) {
          KTextEditor::CompletionEntry e;
 
-         TQStringList::Iterator it = added.find(nClass->name());
+         TQStringList::Iterator it = added.tqfind(nClass->name());
          if (it == added.end()) {
             e.text = nClass->name();
             list.append(e);
@@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
    if (classname.isEmpty()) {
       TQValueList<FunctionCompletionEntry>::Iterator it;
       for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) {
-         if((*it).text.startsWith(function, FALSE)){
+         if((*it).text.tqstartsWith(function, FALSE)){
             KTextEditor::CompletionEntry e;
             e = (*it);
             list.append(e);
@@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
       FunctionList methodList = m_model->globalNamespace()->functionList();
       FunctionList::Iterator methodIt;
       for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) {
-         if ((*methodIt)->name().startsWith(function, FALSE)){
+         if ((*methodIt)->name().tqstartsWith(function, FALSE)){
             KTextEditor::CompletionEntry e;
             e.text = (*methodIt)->name();
             ArgumentDom pArg = (*methodIt)->argumentList().first();
@@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
       FunctionList::Iterator methodIt;
       for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) {
          FunctionDom pMethod = *methodIt;
-         if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) {
+         if (function.isEmpty() || pMethod->name().tqstartsWith(function, FALSE)) {
             KTextEditor::CompletionEntry e;
             ArgumentDom arg = pMethod->argumentList().first();
 
@@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
       VariableList::Iterator attrIt;
       for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) {
          VariableDom pVar = *attrIt;
-         if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) {
+         if (function.isEmpty() || pVar->name().tqstartsWith(function, FALSE)) {
             KTextEditor::CompletionEntry e;
             e.prefix = nClass->name() + " ::";
             e.text = pVar->name();
@@ -526,13 +526,13 @@ TQString PHPCodeCompletion::getCurrentClassName() {
             return Class.cap(2);
       }
    }
-   return TQString::null;
+   return TQString();
 }
 
 TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) {
    kdDebug(9018) << "getClassName " << varName << "::" << classname << endl;
 
-   if (varName.find("$") == 0)
+   if (varName.tqfind("$") == 0)
        varName = varName.mid(1);
 
    if (varName.lower() == "this")
@@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) {
 
    for(int i = m_currentLine; i >= 0; i--){
       TQString line = m_editInterface->textLine(i);
-      if (!line.isNull() && line.find(varName,0 , FALSE) != -1) {
+      if (!line.isNull() && line.tqfind(varName,0 , FALSE) != -1) {
 
          if (createmember.search(line) != -1) {
             TQString right = createmember.cap(1).stripWhiteSpace();
@@ -640,7 +640,7 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) {
    if (m_argWidgetShow == true)
       return false;
 
-   if (line.find("::") != -1) {
+   if (line.tqfind("::") != -1) {
       TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
       Static.setCaseSensitive(FALSE);
 
@@ -658,8 +658,8 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) {
       }
    }
 
-   if (line.findRev("->") != -1) {
-      int pos1 = line.findRev("->");
+   if (line.tqfindRev("->") != -1) {
+      int pos1 = line.tqfindRev("->");
 
       TQString classname;
       TQString function = line.mid(pos1 + 2);
@@ -706,7 +706,7 @@ kdDebug(9018) << "checkForArgHint 0 " << line <<  endl;
 }
 
 void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) {
-   m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").arg(expr).arg(type), 1000 );
+   m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").tqarg(expr).tqarg(type), 1000 );
 }
 
 #include "phpcodecompletion.moc"
diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h
index 505bdcbd..b036beb7 100644
--- a/languages/php/phpcodecompletion.h
+++ b/languages/php/phpcodecompletion.h
@@ -47,6 +47,7 @@ public:
 
 class PHPCodeCompletion : public TQObject {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
    PHPCodeCompletion(PHPSupportPart *phpSupport, PHPConfigData *config);
diff --git a/languages/php/phpconfigdata.h b/languages/php/phpconfigdata.h
index 49c49da8..d43661e1 100644
--- a/languages/php/phpconfigdata.h
+++ b/languages/php/phpconfigdata.h
@@ -30,6 +30,7 @@
 
 class PHPConfigData : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 signals:
    void  configStored(); 
diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp
index 5b5dfda7..41f3c2fe 100644
--- a/languages/php/phpconfigwidget.cpp
+++ b/languages/php/phpconfigwidget.cpp
@@ -16,8 +16,8 @@
 
 using namespace std;
 
-PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent,  const char* name, WFlags fl )
-  : PHPConfigWidgetBase( parent, name, fl )
+PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* tqparent,  const char* name, WFlags fl )
+  : PHPConfigWidgetBase( tqparent, name, fl )
 {
    configData = data;
    m_phpInfo = "";
@@ -77,7 +77,7 @@ PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent,  const ch
  */
 PHPConfigWidget::~PHPConfigWidget()
 {
-  // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, TQt does it all for us
 }
 
 void PHPConfigWidget::accept()
diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h
index c404643c..84425de9 100644
--- a/languages/php/phpconfigwidget.h
+++ b/languages/php/phpconfigwidget.h
@@ -9,9 +9,10 @@ class PHPConfigData;
 class PHPConfigWidget : public PHPConfigWidgetBase
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PHPConfigWidget( PHPConfigData* data,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    PHPConfigWidget( PHPConfigData* data,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~PHPConfigWidget();
 
 public slots:
diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui
index 8cfae9dc..0c926873 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>PHPConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PHPConfigWidgetBase</cstring>
     </property>
@@ -19,11 +19,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>TabWidget1</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -34,7 +34,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>ButtonGroup1_2</cstring>
                         </property>
@@ -45,7 +45,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>useCurrentFile_radio</cstring>
                                 </property>
@@ -59,7 +59,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>useDefaultFile_radio</cstring>
                                 </property>
@@ -77,7 +77,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox13</cstring>
                         </property>
@@ -88,7 +88,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>codeCompletion_checkbox</cstring>
                                 </property>
@@ -96,7 +96,7 @@
                                     <string>&amp;Enable code completion</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>codeHinting_checkbox</cstring>
                                 </property>
@@ -106,7 +106,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox14</cstring>
                         </property>
@@ -117,7 +117,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel1_3_3_2_2</cstring>
                                 </property>
@@ -133,7 +133,7 @@
                                     <cstring>include_path_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>realtimeParsing_checkbox</cstring>
                                 </property>
@@ -153,14 +153,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>170</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>PixmapLabel1</cstring>
                         </property>
@@ -181,7 +181,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -192,7 +192,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>select_label</cstring>
                         </property>
@@ -200,7 +200,7 @@
                             <string>Please select how KDevelop should execute your scripts.</string>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>ButtonGroup3</cstring>
                         </property>
@@ -211,7 +211,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>callPHPDirectly_radio</cstring>
                                 </property>
@@ -222,7 +222,7 @@
                                     <string>Ca&amp;lling the PHP interpreter directly</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel1</cstring>
                                 </property>
@@ -230,7 +230,7 @@
                                     <string>&lt;font size="+1"&gt;The php executable is called directly. Ideal for developers who want to develop terminal or graphical applications in PHP. 
 You need a correctly installed php cgi version.&lt;/font&gt;</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter|AlignLeft</set>
                                 </property>
                                 <property name="hAlign" stdset="0">
@@ -238,7 +238,7 @@ You need a correctly installed php cgi version.&lt;/font&gt;</string>
                                 <property name="vAlign" stdset="0">
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>callWebserver_radio</cstring>
                                 </property>
@@ -246,7 +246,7 @@ You need a correctly installed php cgi version.&lt;/font&gt;</string>
                                     <string>Using an &amp;existing webserver (local or remote)</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel1_4</cstring>
                                 </property>
@@ -254,7 +254,7 @@ You need a correctly installed php cgi version.&lt;/font&gt;</string>
                                     <string>&lt;font size="+1"&gt;Uses an existing webserver. The pages are previewed in 
 the internal web browser. Please make sure that the webserver was compiled with PHP support.&lt;/font&gt;</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter|AlignLeft</set>
                                 </property>
                                 <property name="hAlign" stdset="0">
@@ -272,7 +272,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>171</height>
@@ -281,7 +281,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -292,7 +292,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -318,7 +318,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -327,7 +327,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -338,7 +338,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>TextLabel1_3_2</cstring>
                         </property>
@@ -349,9 +349,9 @@ the internal web browser. Please make sure that the webserver was compiled with
                             <cstring>exe_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout7</cstring>
+                            <cstring>tqlayout7</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -362,11 +362,11 @@ the internal web browser. Please make sure that the webserver was compiled with
                                     <cstring>exe_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QToolButton">
+                            <widget class="TQToolButton">
                                 <property name="name">
                                     <cstring>exe_button</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>22</width>
                                         <height>0</height>
@@ -379,7 +379,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                                     <string>...</string>
                                 </property>
                             </widget>
-                            <widget class="QToolButton">
+                            <widget class="TQToolButton">
                                 <property name="name">
                                     <cstring>about_button</cstring>
                                 </property>
@@ -389,7 +389,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>textLabel2</cstring>
                         </property>
@@ -403,9 +403,9 @@ the internal web browser. Please make sure that the webserver was compiled with
                             <cstring>ini_edit</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -419,14 +419,14 @@ the internal web browser. Please make sure that the webserver was compiled with
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QToolButton">
+                            <widget class="TQToolButton">
                                 <property name="name">
                                     <cstring>phpini_button</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>true</bool>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -441,7 +441,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>zend_checkbox</cstring>
                         </property>
@@ -449,9 +449,9 @@ the internal web browser. Please make sure that the webserver was compiled with
                             <string>Load &amp;Zend extension:</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout9</cstring>
+                            <cstring>tqlayout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -465,14 +465,14 @@ the internal web browser. Please make sure that the webserver was compiled with
                                     <bool>false</bool>
                                 </property>
                             </widget>
-                            <widget class="QToolButton">
+                            <widget class="TQToolButton">
                                 <property name="name">
                                     <cstring>zend_button</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -497,7 +497,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>343</height>
@@ -550,12 +550,12 @@ the internal web browser. Please make sure that the webserver was compiled with
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotAboutClicked()</slot>
     <slot>slotPHPExeButtonClicked()</slot>
     <slot>slotPHPIniButtonClicked()</slot>
     <slot>slotZendButtonClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index e5d479ec..241adb44 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -56,13 +56,13 @@
 class ProblemItem: public KListViewItem
 {
 public:
-    ProblemItem( TQListView* parent, const TQString& problem,
+    ProblemItem( TQListView* tqparent, const TQString& problem,
        const TQString& file, const TQString& line, const TQString& column  )
-   : KListViewItem( parent, problem, file, line, column ) {}
+   : KListViewItem( tqparent, problem, file, line, column ) {}
 
-    ProblemItem( TQListViewItem* parent, const TQString& problem,
+    ProblemItem( TQListViewItem* tqparent, const TQString& problem,
        const TQString& file, const TQString& line, const TQString& column  )
-   : KListViewItem( parent,  problem, file, line, column ) {}
+   : KListViewItem( tqparent,  problem, file, line, column ) {}
 
     int compare( TQListViewItem* item, int column, bool ascending ) const {
    if( column == 2 || column == 3 ){
@@ -77,8 +77,8 @@ public:
 
 };
 
-PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* name )
-    : TQWidget( parent, name ? name : "problemreporter" ),
+PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* tqparent, const char* name )
+    : TQWidget( tqparent, name ? name : "problemreporter" ),
       m_phpSupport( part ),
       m_document( 0 ),
       m_markIface( 0 )
@@ -133,8 +133,8 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char*
 
     m_gridLayout->addWidget(m_tabBar,0,0);
     m_gridLayout->addMultiCellWidget(m_widgetStack,1,1,0,2);
-    m_gridLayout->addWidget(m_filterLabel,0,1,Qt::AlignRight);
-    m_gridLayout->addWidget(m_filterEdit,0,2,Qt::AlignLeft);
+    m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight);
+    m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft);
 
     connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) );
     connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotFilter()) );
@@ -151,7 +151,7 @@ void PHPErrorView::slotFilter()
     if(!m_tabBar->isTabEnabled(4))
       m_tabBar->setTabEnabled(4,true);
 
-    m_tabBar->tab(4)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() ));
+    m_tabBar->tab(4)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() ));
     m_tabBar->setCurrentTab(4);
 
     m_filteredList->clear();
@@ -166,7 +166,7 @@ void PHPErrorView::filterList(KListView* listview, const TQString& level)
 {
     TQListViewItemIterator it( listview );
     while ( it.current() ) {
-        if ( it.current()->text(3).contains(m_filterEdit->text(),false))
+        if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false))
        new KListViewItem(m_filteredList,level,
        it.current()->text(0),it.current()->text(1),it.current()->text(2),it.current()->text(3));
         ++it;
@@ -308,7 +308,7 @@ void PHPErrorView::reportProblem( int level, const TQString& fileName, int line,
    }
 
    TQString msg = text;
-   msg = msg.replace( TQRegExp("\n"), "" );
+   msg = msg.tqreplace( TQRegExp("\n"), "" );
 
    TQString relFileName = fileName;
    relFileName.remove(m_phpSupport->project()->projectDirectory());
@@ -390,7 +390,7 @@ TQString PHPErrorView::levelToString( int level ) const
       return TQString( i18n("Fixme") );
 
       default:
-      return TQString::null;
+      return TQString();
     }
 
 }
diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h
index 48dbd846..ec41eb51 100644
--- a/languages/php/phperrorview.h
+++ b/languages/php/phperrorview.h
@@ -56,8 +56,9 @@ enum Errors
 
 class PHPErrorView: public TQWidget {
 Q_OBJECT
+  TQ_OBJECT
 public:
-   PHPErrorView( PHPSupportPart* part, TQWidget* parent=0, const char* name=0 );
+   PHPErrorView( PHPSupportPart* part, TQWidget* tqparent=0, const char* name=0 );
    virtual ~PHPErrorView();
 
    void removeAllProblems( const TQString& filename );
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index d54028da..6e258569 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -138,7 +138,7 @@ void PHPFile::Analyse() {
 }
 
 bool PHPFile::ParseClass(TQString line, int lineNo) {
-   if (line.find("class ", 0, FALSE) == -1)
+   if (line.tqfind("class ", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$");
@@ -159,7 +159,7 @@ bool PHPFile::ParseClass(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseFunction(TQString line, int lineNo) {
-   if (line.find("function", 0, FALSE) == -1)
+   if (line.tqfind("function", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$");
@@ -198,7 +198,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseVariable(TQString line, int lineNo) {
-   if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1)
+   if (line.tqfind("var") == -1 && line.tqfind("public") == -1 && line.tqfind("private") == -1 && line.tqfind("protected") == -1)
       return FALSE;
 
    TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$");
@@ -227,7 +227,7 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseThisMember(TQString line, int lineNo) {
-   if (line.find("$this->", 0, FALSE) == -1)
+   if (line.tqfind("$this->", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp createthis;
@@ -240,7 +240,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
       return TRUE;
    }
 
-   if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) {
+   if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) {
       createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;");
       if (createthis.search(line) != -1) {
          if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE)
@@ -249,7 +249,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.find("new", 0, FALSE) != -1) {
+   if (line.tqfind("new", 0, FALSE) != -1) {
       createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
       if (createthis.search(line) != -1) {
          if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE)
@@ -258,7 +258,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.find("array", 0, FALSE) != -1) {
+   if (line.tqfind("array", 0, FALSE) != -1) {
       createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+");
       if (createthis.search(line) != -1) {
          if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE)
@@ -271,7 +271,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseMember(TQString line, int lineNo) {
-   if (line.find("$", 0, FALSE) == -1)
+   if (line.tqfind("$", 0, FALSE) == -1)
       return FALSE;
 
    /// @todo Ajouter plus de test ....
@@ -293,7 +293,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
       return TRUE;
    }
 
-   if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) {
+   if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) {
       createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;");
       if (createmember.search(line) != -1) {
          if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE)
@@ -302,7 +302,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.find("new", 0, FALSE) != -1) {
+   if (line.tqfind("new", 0, FALSE) != -1) {
       createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
       if (createmember.search(line) != -1) {
          if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE)
@@ -311,7 +311,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.find("array", 0, FALSE) != -1) {
+   if (line.tqfind("array", 0, FALSE) != -1) {
       createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+");
       if (createmember.search(line) != -1) {
          if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE)
@@ -326,7 +326,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
 bool PHPFile::ParseReturn(TQString line, int lineNo) {
    TQString rettype;
 
-   if (line.find("return", 0, FALSE) == -1)
+   if (line.tqfind("return", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp typeex;
@@ -337,7 +337,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
       TQString varname = typeex.cap(2).ascii();
       rettype = varname;
 
-      if (varname.find("$") == 0) {
+      if (varname.tqfind("$") == 0) {
          /// @todo search in variable
          /*
          varname = varname.mid(1);
@@ -346,7 +346,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
          while ( it != m_vars.end() ) {
             Action *p = *it++;
 
-            if (p->parent() == current && p->name() == varname) {
+            if (p->tqparent() == current && p->name() == varname) {
                rettype = p->args();
             }
          }
@@ -357,7 +357,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
          rettype = "null";
       }
 
-      if (rettype.find("$") == 0)
+      if (rettype.tqfind("$") == 0)
          kdDebug(9018) << "ParseReturn value" << " " << rettype.latin1() << endl;
    }
 
@@ -366,7 +366,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseTodo(TQString line, int lineNo) {
-   if (line.find("todo", 0, FALSE) == -1)
+   if (line.tqfind("todo", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$");
@@ -381,7 +381,7 @@ bool PHPFile::ParseTodo(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseFixme(TQString line, int lineNo) {
-   if (line.find("fixme", 0, FALSE) == -1)
+   if (line.tqfind("fixme", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$");
@@ -411,14 +411,14 @@ void PHPFile::ParseSource() {
       line = (*it).local8Bit();
 
       if (!line.isNull()) {
-         if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1)  {
+         if (line.tqfind("include", 0, FALSE) != -1 || line.tqfind("require", 0, FALSE) != -1)  {
             if (includere.search(line) != -1) {
                TQStringList include_path;
                include_path = include_path.split(":", m_part->getIncludePath());
                include_path.append(URLUtil::directory(fileName()) + "/");
                include_path.append("");
 
-               TQStringList list = includere.capturedTexts();
+               TQStringList list = includere.tqcapturedTexts();
 
                for ( TQStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) {
                   TQString abso = URLUtil::canonicalPath(*it + "/" + list[3]);
@@ -432,16 +432,16 @@ void PHPFile::ParseSource() {
 
 
          if ( inMethod == TRUE ) {
-            bracketFuncOpen += line.contains("{");
-            bracketFuncClose += line.contains("}");
+            bracketFuncOpen += line.tqcontains("{");
+            bracketFuncClose += line.tqcontains("}");
             if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) {
                CloseFunction( lineNo );
             }
          }
 
          if ( inMethod == FALSE ) {
-            bracketOpen += line.contains("{");
-            bracketClose += line.contains("}");
+            bracketOpen += line.tqcontains("{");
+            bracketClose += line.tqcontains("}");
             if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) {
                CloseClass( lineNo );
             }
@@ -449,8 +449,8 @@ void PHPFile::ParseSource() {
 
          if ( inClass == FALSE ) {
             if (ParseClass(line, lineNo) == TRUE) {
-               bracketOpen = line.contains("{");
-               bracketClose = line.contains("}");
+               bracketOpen = line.tqcontains("{");
+               bracketClose = line.tqcontains("}");
             }
          }
 
@@ -459,8 +459,8 @@ void PHPFile::ParseSource() {
          }
 
          if (ParseFunction(line, lineNo) == TRUE) {
-            bracketFuncOpen = line.contains("{");
-            bracketFuncClose = line.contains("}");
+            bracketFuncOpen = line.tqcontains("{");
+            bracketFuncClose = line.tqcontains("}");
          }
 
          if ( inMethod == TRUE )
diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h
index b8aad71b..d790ca66 100644
--- a/languages/php/phpfile.h
+++ b/languages/php/phpfile.h
@@ -47,6 +47,7 @@
 */
 class PHPFile : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
    PHPFile(PHPSupportPart *phpSupport, const TQString& fileName);
diff --git a/languages/php/phphtmlview.h b/languages/php/phphtmlview.h
index e135cfa7..91d4a195 100644
--- a/languages/php/phphtmlview.h
+++ b/languages/php/phphtmlview.h
@@ -27,6 +27,7 @@ class PHPSupportPart;
 
 class PHPHTMLView : public KDevHTMLPart  {
 Q_OBJECT
+  TQ_OBJECT
 public:
    PHPHTMLView(PHPSupportPart *part);
    ~PHPHTMLView();
diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui
index 77de8304..5d048211 100644
--- a/languages/php/phpinfodlg.ui
+++ b/languages/php/phpinfodlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>PHPInfoDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PHPInfoDlg</cstring>
     </property>
@@ -19,12 +19,12 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QMultiLineEdit" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQMultiLineEdit" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>php_edit</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>ok_button</cstring>
             </property>
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -62,7 +62,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -82,6 +82,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 282e6c01..9227e8ff 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -30,7 +30,7 @@
 
 using namespace std;
 
-PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) {
+PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *tqparent, const char *name) : PHPNewClassDlgBase(tqparent,name,true) {
   m_filenameModified = false;
   KCompletion *comp = new KCompletion();
   comp->setItems(baseClassNames);
@@ -104,14 +104,14 @@ void PHPNewClassDlg::accept(){
 
   // generate the sourcecode for the class
   if(m_baseClassEdit->text().isEmpty()){
-    text = text.replace(TQRegExp("extends BASECLASS"),"");
-    text = text.replace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),"");
+    text = text.tqreplace(TQRegExp("extends BASECLASS"),"");
+    text = text.tqreplace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),"");
   }else{
-    text = text.replace(TQRegExp("BASECLASS"),m_baseClassEdit->text());
+    text = text.tqreplace(TQRegExp("BASECLASS"),m_baseClassEdit->text());
   }
-  text = text.replace(TQRegExp("CLASSNAME"),m_classNameEdit->text());
-  text = text.replace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper());
-  text = text.replace(TQRegExp("AUTHOR"),"not implemented");
+  text = text.tqreplace(TQRegExp("CLASSNAME"),m_classNameEdit->text());
+  text = text.tqreplace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper());
+  text = text.tqreplace(TQRegExp("AUTHOR"),"not implemented");
  
   file.setName(absFileName);
   if(file.open(IO_WriteOnly)){
diff --git a/languages/php/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h
index 14db74b2..a5bbcb55 100644
--- a/languages/php/phpnewclassdlg.h
+++ b/languages/php/phpnewclassdlg.h
@@ -27,8 +27,9 @@
 
 class PHPNewClassDlg : public PHPNewClassDlgBase  {
    Q_OBJECT
+  TQ_OBJECT
 public: 
-   PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent=0, const char *name=0);
+   PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *tqparent=0, const char *name=0);
    ~PHPNewClassDlg();
    protected slots:
      void classNameTextChanged(const TQString&);
diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui
index 5b4df7c1..5084fb51 100644
--- a/languages/php/phpnewclassdlgbase.ui
+++ b/languages/php/phpnewclassdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>PHPNewClassDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>m_ClassDLG</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -40,14 +40,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="5" column="3" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="5" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_okButton</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="5" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="5" column="5" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_cancelButton</cstring>
             </property>
@@ -76,7 +76,7 @@
                 <cstring>m_classNameEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -87,7 +87,7 @@
                 <cstring>m_baseClassEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -98,7 +98,7 @@
                 <cstring>m_classTemplate</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -109,7 +109,7 @@
                 <cstring>m_dirEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -120,7 +120,7 @@
                 <cstring>m_fileNameEdit</cstring>
             </property>
         </widget>
-        <widget class="QToolButton" row="2" column="6">
+        <widget class="TQToolButton" row="2" column="6">
             <property name="name">
                 <cstring>m_dirButton</cstring>
             </property>
@@ -141,7 +141,7 @@
                 <cstring>m_dirEdit</cstring>
             </property>
         </widget>
-        <widget class="QTextEdit" row="4" column="0" rowspan="1" colspan="7">
+        <widget class="TQTextEdit" row="4" column="0" rowspan="1" colspan="7">
             <property name="name">
                 <cstring>m_classTemplate</cstring>
             </property>
@@ -193,8 +193,8 @@ class CLASSNAME extends BASECLASS {
     <include location="global" impldecl="in declaration">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp
index a0f1179e..a4b5185e 100644
--- a/languages/php/phpparser.cpp
+++ b/languages/php/phpparser.cpp
@@ -50,7 +50,7 @@ bool PHPParser::hasFile( const TQString& fileName )
 {
 //   kdDebug(9018) << "hasFile " << fileName.latin1() << endl;
    TQString abso = URLUtil::canonicalPath(fileName);
-   TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso);
+   TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso);
 
    if ( it == m_files.end() )
        return false;
@@ -67,7 +67,7 @@ void PHPParser::addFile( const TQString& fileName )
    kdDebug(9018) << "addFile " << fileName.latin1() << endl;
 
    TQFileInfo fi( abso );
-   if ((fi.extension().contains("inc") || fi.extension().contains("php") || fi.extension().contains("html") || fi.extension().contains("php3") || !fi.extension()) && !fi.extension().contains("~")) {
+   if ((fi.extension().tqcontains("inc") || fi.extension().tqcontains("php") || fi.extension().tqcontains("html") || fi.extension().tqcontains("php3") || !fi.extension()) && !fi.extension().tqcontains("~")) {
       m_files.insert(abso, new PHPFile(m_part, abso));
    }
 }
@@ -76,7 +76,7 @@ void PHPParser::removeFile( const TQString& fileName )
 {
 //   kdDebug(9018) << "removeFile " << fileName.latin1() << endl;
    TQString abso = URLUtil::canonicalPath(fileName);
-   TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso);
+   TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso);
 
    if ( it != m_files.end()) {
       PHPFile *file = it.data();
@@ -104,7 +104,7 @@ void PHPParser::reparseFile( const TQString& fileName )
 {
    kdDebug(9018) << "reparseFile" << endl;
    TQString abso = URLUtil::canonicalPath(fileName);
-   TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso);
+   TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso);
 
    if ( it != m_files.end()) {
       PHPFile *file = it.data();
diff --git a/languages/php/phpparser.h b/languages/php/phpparser.h
index 24687ea3..87093b06 100644
--- a/languages/php/phpparser.h
+++ b/languages/php/phpparser.h
@@ -21,11 +21,7 @@
 
 #include <tqthread.h>
 
-#if QT_VERSION < 0x030100
-#include <kdevmutex.h>
-#else
 #include <tqmutex.h>
-#endif
 
 #include <codemodel.h>
 
diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h
index 09c5f49e..28713efb 100644
--- a/languages/php/phpsupport_event.h
+++ b/languages/php/phpsupport_event.h
@@ -23,11 +23,7 @@
 #include <tqevent.h>
 #include <tqvaluelist.h>
 
-#if QT_VERSION < 0x030100
-#include <kdevmutex.h>
-#else
 #include <tqmutex.h>
-#endif
 
 enum
 {
@@ -46,7 +42,7 @@ enum
    Event_AddFixme
 };
 
-class FileParseEvent: public QCustomEvent
+class FileParseEvent: public TQCustomEvent
 {
 public:
    FileParseEvent(long event, const TQString& fileName )
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index d31bc933..3dbf4211 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -69,8 +69,8 @@ using namespace std;
 static const KDevPluginInfo data("kdevphpsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
 
-PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
+PHPSupportPart::PHPSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport(&data, tqparent, name ? name : "PHPSupportPart")
 {
    m_htmlView = 0;
    m_parser = 0;
@@ -354,7 +354,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer,
 
    TQString buf = buffer;
    if (configData->getInvocationMode() == PHPConfigData::Shell)
-     buf.replace("\n", "<br>");
+     buf.tqreplace("\n", "<br>");
     m_htmlView->write(buf);
 }
 
@@ -364,7 +364,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer,
 
    TQString buf = buffer;
    if (configData->getInvocationMode() == PHPConfigData::Shell)
-      buf.replace("\n", "<br>");
+      buf.tqreplace("\n", "<br>");
    m_htmlView->write(buf);
 }
 
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index 9d294642..f2b0d79c 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -44,9 +44,10 @@ class PHPFile;
 class PHPSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-   PHPSupportPart( TQObject *parent, const char *name, const TQStringList & );
+   PHPSupportPart( TQObject *tqparent, const char *name, const TQStringList & );
    ~PHPSupportPart();
 
    PHPErrorView *ErrorView();
@@ -111,7 +112,7 @@ private:
       TQGuardedPtr<TQProgressBar> progressBar;
       TQStringList::Iterator it;
       TQStringList files;
-      TQMap< TQString, QPair<uint, uint> > pcs;
+      TQMap< TQString, TQPair<uint, uint> > pcs;
       TQDataStream stream;
       TQFile file;
 
diff --git a/languages/python/README.dox b/languages/python/README.dox
index 77d0f44c..e581f9e1 100644
--- a/languages/python/README.dox
+++ b/languages/python/README.dox
@@ -14,7 +14,7 @@ and images.
 \maintainer <a href="mailto:nth maintainer AT provider.com">nth maintainer full name</a>
 
 \feature Python support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/python/app_templates/pyqt/documentdetails.ui b/languages/python/app_templates/pyqt/documentdetails.ui
index 130d30ef..f1298465 100644
--- a/languages/python/app_templates/pyqt/documentdetails.ui
+++ b/languages/python/app_templates/pyqt/documentdetails.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>documentDetails</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>documentDetails</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <enum>PlainText</enum>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -57,14 +57,14 @@
                         <string>Name:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>lineEdit1</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -76,5 +76,5 @@
 </widget>
 <includes>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/python/app_templates/pyqt/templates-ui-dialog b/languages/python/app_templates/pyqt/templates-ui-dialog
index fc2aefce..4b0c8bb2 100644
--- a/languages/python/app_templates/pyqt/templates-ui-dialog
+++ b/languages/python/app_templates/pyqt/templates-ui-dialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QDialog">
+<widget class=TQDIALOG_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin
index 854da009..4e0a093b 100644
--- a/languages/python/app_templates/pyqt/templates-ui-mainwin
+++ b/languages/python/app_templates/pyqt/templates-ui-mainwin
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QMainWindow">
+<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -415,7 +415,7 @@
         <slot>helpAbout()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>fileNew()</slot>
     <slot>fileOpen()</slot>
     <slot>fileSave()</slot>
@@ -431,6 +431,6 @@
     <slot>helpIndex()</slot>
     <slot>helpContents()</slot>
     <slot>helpAbout()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc
index e5c67dda..a4604a97 100644
--- a/languages/python/doc/python.toc
+++ b/languages/python/doc/python.toc
@@ -162,7 +162,7 @@
 <tocsect3 name="5.2 Atoms" url="ref/atoms.html">
 <tocsect4 name="5.2.1 Identifiers (Names)" url="ref/atom-identifiers.html"/>
 <tocsect4 name="5.2.2 Literals" url="ref/atom-literals.html"/>
-<tocsect4 name="5.2.3 Parenthesized forms" url="ref/parenthesized.html"/>
+<tocsect4 name="5.2.3 Parenthesized forms" url="ref/tqparenthesized.html"/>
 <tocsect4 name="5.2.4 List displays" url="ref/lists.html"/>
 <tocsect4 name="5.2.5 Dictionary displays" url="ref/dict.html"/>
 <tocsect4 name="5.2.6 String conversions" url="ref/string-conversions.html"/>
@@ -293,7 +293,7 @@
 </tocsect3>
 <tocsect3 name="7.2 Sequence Objects " url="api/sequenceObjects.html">
 <tocsect4 name="7.2.1 String Objects " url="api/stringObjects.html"/>
-<tocsect4 name="7.2.2 Unicode Objects " url="api/unicodeObjects.html"/>
+<tocsect4 name="7.2.2 Unicode Objects " url="api/tqunicodeObjects.html"/>
 <tocsect4 name="7.2.3 Buffer Objects " url="api/bufferObjects.html"/>
 <tocsect4 name="7.2.4 Tuple Objects " url="api/tupleObjects.html"/>
 <tocsect4 name="7.2.5 List Objects " url="api/listObjects.html"/>
@@ -410,7 +410,7 @@
 <tocsect3 name="4.7 codecs -- Codec registry and base classes" url="lib/module-codecs.html">
 <tocsect4 name="4.7.1 Codec Base Classes" url="lib/node80.html"/>
 </tocsect3>
-<tocsect3 name="4.8 unicodedata -- Unicode Database" url="lib/module-unicodedata.html"/>
+<tocsect3 name="4.8 tqunicodedata -- Unicode Database" url="lib/module-tqunicodedata.html"/>
 </tocsect2>
 <tocsect2 name="5. Miscellaneous Services" url="lib/misc.html">
 <tocsect3 name="5.1 math -- Mathematical functions" url="lib/module-math.html"/>
@@ -1031,7 +1031,7 @@
 <entry name="code, block" url="ref/execframes.html#l2h-238"/>
 <entry name="code block" url="ref/execframes.html#l2h-232"/>
 <entry name="code object" url="ref/types.html#l2h-124"/>
-<entry name="comma" url="ref/parenthesized.html#l2h-270"/>
+<entry name="comma" url="ref/tqparenthesized.html#l2h-270"/>
 <entry name="trailing" url="ref/exprlists.html#l2h-331"/>
 <entry name="command line" url="ref/programs.html#l2h-439"/>
 <entry name="comment" url="ref/comments.html#l2h-6"/>
@@ -1077,7 +1077,7 @@
 <entry name="dictionary object" url="ref/types.html#l2h-96"/>
 <entry name="display, dictionary" url="ref/dict.html#l2h-274"/>
 <entry name="display, list" url="ref/lists.html#l2h-271"/>
-<entry name="display, tuple" url="ref/parenthesized.html#l2h-270"/>
+<entry name="display, tuple" url="ref/tqparenthesized.html#l2h-270"/>
 <entry name="division" url="ref/binary.html#l2h-309"/>
 <entry name="divmod() (built-in function)" url="ref/numeric-types.html#l2h-218"/>
 <entry name="documentation string" url="ref/types.html#l2h-125"/>
@@ -1362,7 +1362,7 @@
 <entry name="string" url="ref/types.html#l2h-85"/>
 <entry name="object (continued), traceback" url="ref/types.html#l2h-127"/>
 <entry name="object (continued), tuple" url="ref/types.html#l2h-91"/>
-<entry name="object (continued), unicode" url="ref/types.html#l2h-90"/>
+<entry name="object (continued), tqunicode" url="ref/types.html#l2h-90"/>
 <entry name="object (continued), user-defined function" url="ref/types.html#l2h-103"/>
 <entry name="object (continued), user-defined method" url="ref/types.html#l2h-105"/>
 <entry name="oct() (built-in function)" url="ref/numeric-types.html#l2h-229"/>
@@ -1394,7 +1394,7 @@
 <entry name="OverflowError (built-in exception)" url="ref/types.html#l2h-33"/>
 <entry name="packages" url="ref/import.html#l2h-392"/>
 <entry name="parameter, value, default" url="ref/function.html#l2h-430"/>
-<entry name="parenthesized form" url="ref/parenthesized.html#l2h-268"/>
+<entry name="tqparenthesized form" url="ref/tqparenthesized.html#l2h-268"/>
 <entry name="parser" url="ref/lexical.html#l2h-3"/>
 <entry name="Pascal, language" url="ref/for.html#l2h-416"/>
 <entry name="pass statement" url="ref/pass.html#l2h-355"/>
@@ -1527,7 +1527,7 @@
 <entry name="trailing, comma" url="ref/exprlists.html#l2h-331"/>
 <entry name="triple-quoted string" url="ref/strings.html#l2h-16"/>
 <entry name="try statement" url="ref/types.html#l2h-129"/>
-<entry name="tuple, display" url="ref/parenthesized.html#l2h-270"/>
+<entry name="tuple, display" url="ref/tqparenthesized.html#l2h-270"/>
 <entry name="tuple, empty" url="ref/types.html#l2h-91"/>
 <entry name="tuple, singleton" url="ref/types.html#l2h-91"/>
 <entry name="tuple object" url="ref/types.html#l2h-91"/>
@@ -1544,8 +1544,8 @@
 <entry name="unbinding, name" url="ref/execframes.html#l2h-243"/>
 <entry name="unichr() (built-in function)" url="ref/types.html#l2h-87"/>
 <entry name="Unicode" url="ref/types.html#l2h-90"/>
-<entry name="unicode() (built-in function)" url="ref/types.html#l2h-89"/>
-<entry name="unicode object" url="ref/types.html#l2h-90"/>
+<entry name="tqunicode() (built-in function)" url="ref/types.html#l2h-89"/>
+<entry name="tqunicode object" url="ref/types.html#l2h-90"/>
 <entry name="UNIX" url="ref/programs.html#l2h-439"/>
 <entry name="unreachable object" url="ref/objects.html#l2h-28"/>
 <entry name="unrecognized escape sequence" url="ref/strings.html#l2h-19"/>
diff --git a/languages/python/kde_pydoc.py b/languages/python/kde_pydoc.py
index 0516f172..eb7c6b44 100755
--- a/languages/python/kde_pydoc.py
+++ b/languages/python/kde_pydoc.py
@@ -7,7 +7,7 @@ __version__ = "6 April 2006"
 
 import sys, imp, os, stat, re, types, cgi
 from repr import Repr
-from string import expandtabs, find, join, lower, split, strip, rstrip
+from string import expandtabs, tqfind, join, lower, split, strip, rstrip
 import pydoc
 
 
@@ -16,19 +16,19 @@ import pydoc
 def cleanlinks(string):
     """Changes the links to work with the pydoc:-notation"""
     finalstring = ""
-    string = str(string).replace(".html","")
+    string = str(string).tqreplace(".html","")
     pos = 0
     mark = "<a href=\""
     l = len(mark)
     while(pos != -1):
         opos = pos
-        pos = string.find(mark, pos)
+        pos = string.tqfind(mark, pos)
         if(pos == -1):
             finalstring += string[opos:]
             break
         finalstring += string[opos:pos+l]
         pos+=l
-        if(string[pos] == '#' or string.find(":/",pos, pos+10) != -1):  #leave local jumps or external references untouched
+        if(string[pos] == '#' or string.tqfind(":/",pos, pos+10) != -1):  #leave local jumps or external references untouched
             continue
         finalstring += "pydoc:"
         if(string[pos] == "." and string[pos+1] == "\""):
diff --git a/languages/python/pythonconfigwidget.cpp b/languages/python/pythonconfigwidget.cpp
index 29103705..6cd54700 100644
--- a/languages/python/pythonconfigwidget.cpp
+++ b/languages/python/pythonconfigwidget.cpp
@@ -17,8 +17,8 @@
 
 
 PythonConfigWidget::PythonConfigWidget(TQDomDocument &projectDom,
-                                       TQWidget *parent, const char *name)
-    : PythonConfigWidgetBase(parent, name), dom(projectDom)
+                                       TQWidget *tqparent, const char *name)
+    : PythonConfigWidgetBase(tqparent, name), dom(projectDom)
 {
     interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevpythonsupport/run/interpreter"));
     terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevpythonsupport/run/terminal"));
diff --git a/languages/python/pythonconfigwidget.h b/languages/python/pythonconfigwidget.h
index 674b8e3c..16ed799d 100644
--- a/languages/python/pythonconfigwidget.h
+++ b/languages/python/pythonconfigwidget.h
@@ -19,9 +19,10 @@
 class PythonConfigWidget : public PythonConfigWidgetBase
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PythonConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 );
+    PythonConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 );
     ~PythonConfigWidget();
 
 public slots:
diff --git a/languages/python/pythonconfigwidgetbase.ui b/languages/python/pythonconfigwidgetbase.ui
index d3228822..0aa9a5bd 100644
--- a/languages/python/pythonconfigwidgetbase.ui
+++ b/languages/python/pythonconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>PythonConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>python_config_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>interpreter_label</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <cstring>interpreter_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -57,7 +57,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -76,14 +76,14 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>terminal_box</cstring>
             </property>
@@ -101,7 +101,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -113,8 +113,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp
index 9aba5441..9e979f13 100644
--- a/languages/python/pythonimplementationwidget.cpp
+++ b/languages/python/pythonimplementationwidget.cpp
@@ -34,8 +34,8 @@
 #include <kdevproject.h>
 
 PythonImplementationWidget::PythonImplementationWidget(KDevLanguageSupport* part, 
-    TQWidget* parent, const char* name, bool modal)
-    : ImplementationWidget(part, parent, name, modal)
+    TQWidget* tqparent, const char* name, bool modal)
+    : ImplementationWidget(part, tqparent, name, modal)
 {
 }
 
@@ -48,12 +48,12 @@ PythonImplementationWidget::~PythonImplementationWidget()
 TQStringList PythonImplementationWidget::createClassFiles()
 {
 //     TQString template_py = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n    def initialize(*k)\n        super(*k)\n    end\n\nend\n";
-    TQString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n    def __init__(self,parent,name):\n        $BASECLASSNAME$.__init__(self,parent,name)\n    \n\n\n";
+    TQString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n    def __init__(self,tqparent,name):\n        $BASECLASSNAME$.__init__(self,tqparent,name)\n    \n\n\n";
 
     TQFileInfo formInfo(m_formName);
-    template_py.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py");
-    template_py.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text());
-    template_py.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName);
+    template_py.tqreplace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py");
+    template_py.tqreplace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text());
+    template_py.tqreplace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName);
     
     template_py = FileTemplate::read(m_part, "py") + template_py;
 
diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h
index e8838bab..c2ca5cc3 100644
--- a/languages/python/pythonimplementationwidget.h
+++ b/languages/python/pythonimplementationwidget.h
@@ -25,8 +25,9 @@
 class PythonImplementationWidget : public ImplementationWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true);
+    PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = true);
 
     ~PythonImplementationWidget();
 
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index dc7df754..d1f2e503 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -42,8 +42,8 @@ typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory;
 static const KDevPluginInfo data("kdevpythonsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) )
 
-PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
+PythonSupportPart::PythonSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport(&data, tqparent, name ? name : "PythonSupportPart")
 {
     setInstance(PythonSupportFactory::instance());
 
@@ -100,7 +100,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context)
         {
             m_contextFileName = url.fileName();
             int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass()));
-            popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
+            popup->tqsetWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
         }
     }
 }
@@ -210,7 +210,7 @@ void PythonSupportPart::savedFile(const KURL &fileName)
 {
     kdDebug(9014) << "savedFile()" << endl;
 
-    if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) {
+    if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) {
         maybeParse(fileName.path());
 	emit addedSourceInfo( fileName.path() );
     }
@@ -264,11 +264,11 @@ void PythonSupportPart::parse(const TQString &fileName)
 	    lastClass->setFileName( fileName );
 	    lastClass->setStartPosition( lineNo, 0 );
 
-            TQStringList parentList = TQStringList::split(",", classre.cap(3));
+            TQStringList tqparentList = TQStringList::split(",", classre.cap(3));
             TQStringList::ConstIterator it;
-            for (it = parentList.begin(); it != parentList.end(); ++it) {
+            for (it = tqparentList.begin(); it != tqparentList.end(); ++it) {
                 TQString baseName = (*it).stripWhiteSpace();
-                kdDebug(9014) << "Add parent" << baseName << endl;
+                kdDebug(9014) << "Add tqparent" << baseName << endl;
                 lastClass->addBaseClass( baseName );
             }
 
@@ -349,7 +349,7 @@ void PythonSupportPart::slotStartInterpreter()
 void PythonSupportPart::slotExecuteString()
 {
     bool ok;
-    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0);
+    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString(), &ok, 0);
     if (ok) {
         cmd.prepend("'");
         cmd.append("'");
@@ -374,12 +374,12 @@ KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::Designe
     KDevDesignerIntegration *des = 0;
     switch (type)
     {
-        case KInterfaceDesigner::QtDesigner:
+        case KInterfaceDesigner::TQtDesigner:
             des = m_designers[type];
             if (des == 0)
             {
                 PythonImplementationWidget *impl = new PythonImplementationWidget(this);
-                des = new QtDesignerPythonIntegration(this, impl);
+                des = new TQtDesignerPythonIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
                     "kdevpythonsupport/designerintegration");
                 m_designers[type] = des;
@@ -398,7 +398,7 @@ void PythonSupportPart::slotCreateSubclass()
     kdDebug(9014) << k_funcinfo << " file: " << m_contextFileName << " ext: " << fi.extension(false) << endl;
     if (fi.extension(false) != "ui")
         return;
-    QtDesignerPythonIntegration *des = dynamic_cast<QtDesignerPythonIntegration*>(designer(KInterfaceDesigner::QtDesigner));
+    TQtDesignerPythonIntegration *des = dynamic_cast<TQtDesignerPythonIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
     if (des)
     {
         kdDebug(9014) << "ok: " << des << endl;
diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h
index 0ea9f1b5..01fde048 100644
--- a/languages/python/pythonsupportpart.h
+++ b/languages/python/pythonsupportpart.h
@@ -23,9 +23,10 @@ class Context;
 class PythonSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PythonSupportPart( TQObject *parent, const char *name, const TQStringList & );
+    PythonSupportPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~PythonSupportPart();
   
     virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index 53950f65..c0e6dba1 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -38,18 +38,18 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerPythonIntegration::QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
-    :QtDesignerIntegration(part, impl, false, 0)
+TQtDesignerPythonIntegration::TQtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
+    :TQtDesignerIntegration(part, impl, false, 0)
 {
 }
 
 
-QtDesignerPythonIntegration::~QtDesignerPythonIntegration()
+TQtDesignerPythonIntegration::~TQtDesignerPythonIntegration()
 {
 }
 
 
-void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
+void TQtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
 {
     m_part->partController()->editDocument( KURL( klass->fileName() ) );
     KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() );
@@ -65,7 +65,7 @@ void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Functio
     klass->getStartPosition( &line, &column );
 
     // compute the insertion point
-    QPair<int,int> point;
+    TQPair<int,int> point;
     point.first = line + 1;
     point.second = column;
 
@@ -78,7 +78,7 @@ void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Functio
     } 
 
     TQString func = function.function;
-    func.replace("()", "");
+    func.tqreplace("()", "");
     TQString str = "    def " + func + "(self):\n\n";
 
     kdDebug(9014) << "insert " << str << " into " << point.first << endl;
diff --git a/languages/python/qtdesignerpythonintegration.h b/languages/python/qtdesignerpythonintegration.h
index e4b3bcae..8af2f271 100644
--- a/languages/python/qtdesignerpythonintegration.h
+++ b/languages/python/qtdesignerpythonintegration.h
@@ -17,18 +17,19 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QTDESIGNERPYTHONINTEGRATION_H
-#define QTDESIGNERPYTHONINTEGRATION_H
+#ifndef TQTDESIGNERPYTHONINTEGRATION_H
+#define TQTDESIGNERPYTHONINTEGRATION_H
 
 #include <qtdesignerintegration.h>
 
-class QtDesignerPythonIntegration : public QtDesignerIntegration
+class TQtDesignerPythonIntegration : public TQtDesignerIntegration
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
+    TQtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
 
-    ~QtDesignerPythonIntegration();
+    ~TQtDesignerPythonIntegration();
 
     virtual void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
 
diff --git a/languages/ruby/README.dox b/languages/ruby/README.dox
index aaa8823b..89dd9058 100644
--- a/languages/ruby/README.dox
+++ b/languages/ruby/README.dox
@@ -9,7 +9,7 @@ This is a Ruby support plugin
 \feature .rb template for New File
 \feature Ruby project template for Application Wizard
 \feature "Run" option in menu
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp
index 46086a9e..5458ae8b 100644
--- a/languages/ruby/app_templates/dcopservice/app.cpp
+++ b/languages/ruby/app_templates/dcopservice/app.cpp
@@ -10,15 +10,15 @@ int main(int argc, char **argv) {
     TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
     delete instance;
     if (appdir.isNull()) {
-        qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n");
+        qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n");
     }
     TQFileInfo program(appdir);
      
     char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
     rubyargs[0] = strdup(argv[0]);
     rubyargs[1] = strdup("-KU");
-    rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
-    rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
+    rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
+    rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
     rubyargs[4] = strdup(program.fileName().latin1());
     for (int i = 1; i < argc; i++) {
         rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp
index 46086a9e..5458ae8b 100644
--- a/languages/ruby/app_templates/kapp/app.cpp
+++ b/languages/ruby/app_templates/kapp/app.cpp
@@ -10,15 +10,15 @@ int main(int argc, char **argv) {
     TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
     delete instance;
     if (appdir.isNull()) {
-        qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n");
+        qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n");
     }
     TQFileInfo program(appdir);
      
     char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
     rubyargs[0] = strdup(argv[0]);
     rubyargs[1] = strdup("-KU");
-    rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
-    rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
+    rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
+    rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
     rubyargs[4] = strdup(program.fileName().latin1());
     for (int i = 1; i < argc; i++) {
         rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb
index 470b0136..9bc2ba03 100644
--- a/languages/ruby/app_templates/kapp/app.rb
+++ b/languages/ruby/app_templates/kapp/app.rb
@@ -9,7 +9,7 @@
 
 class %{APPNAMESC} < KDE::MainWindow
 
-    slots 'fileNew()',
+    Q_SLOTS 'fileNew()',
           'fileOpen()',
           'fileSave()',
           'fileSaveAs()',
diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb
index bc5b5140..4c914786 100644
--- a/languages/ruby/app_templates/kapp/appview.rb
+++ b/languages/ruby/app_templates/kapp/appview.rb
@@ -15,23 +15,23 @@ class %{APPNAMESC}View < Qt::Widget
     #
     # Use this signal to change the content of the statusbar
     #
-    signals 'signalChangeStatusbar(const QString&)'
+    Q_SIGNALS 'signalChangeStatusbar(const QString&)'
 
     #
     # Use this signal to change the content of the caption
     #
-    signals 'signalChangeCaption(const QString&)'
+    Q_SIGNALS 'signalChangeCaption(const QString&)'
 
-    slots 'slotOnURL(const QString&)',
+    Q_SLOTS 'slotOnURL(const QString&)',
           'slotSetTitle(const QString&)'
    
-    def initialize(parent)
-        super(parent)
+    def initialize(tqparent)
+        super(tqparent)
         
         # keep a reference to the DCOP Interface so it doesn't get gc'd
         @dcop = %{APPNAMESC}Iface.new(self)
         
-        # setup our layout manager to automatically add our widgets
+        # setup our tqlayout manager to automatically add our widgets
         top_layout = Qt::HBoxLayout.new(self)
         top_layout.setAutoAdd(true)
     
diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb
index 98669ad2..fbdec495 100644
--- a/languages/ruby/app_templates/kapp/pref.rb
+++ b/languages/ruby/app_templates/kapp/pref.rb
@@ -17,10 +17,10 @@ end
 
 class %{APPNAMESC}PrefPageOne < Qt::Frame
 
-    def initialize(parent)
-        super(parent)
-        layout = Qt::HBoxLayout.new(self)
-        layout.setAutoAdd(true)
+    def initialize(tqparent)
+        super(tqparent)
+        tqlayout = Qt::HBoxLayout.new(self)
+        tqlayout.setAutoAdd(true)
     
         Qt::Label.new(i18n("Add something here"), self)
     end
@@ -28,10 +28,10 @@ end
 
 class %{APPNAMESC}PrefPageTwo < Qt::Frame
 
-    def initialize(parent)
-        super(parent)
-        layout = Qt::HBoxLayout.new(self)
-        layout.setAutoAdd(true)
+    def initialize(tqparent)
+        super(tqparent)
+        tqlayout = Qt::HBoxLayout.new(self)
+        tqlayout.setAutoAdd(true)
     
         Qt::Label.new(i18n("Add something here"), self)
     end
diff --git a/languages/ruby/app_templates/kapp/src-Makefile.am b/languages/ruby/app_templates/kapp/src-Makefile.am
index d27aa6b3..ad999e1c 100644
--- a/languages/ruby/app_templates/kapp/src-Makefile.am
+++ b/languages/ruby/app_templates/kapp/src-Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 KDE_ICON = AUTO
diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp
index 46086a9e..5458ae8b 100644
--- a/languages/ruby/app_templates/kxt/app.cpp
+++ b/languages/ruby/app_templates/kxt/app.cpp
@@ -10,15 +10,15 @@ int main(int argc, char **argv) {
     TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
     delete instance;
     if (appdir.isNull()) {
-        qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n");
+        qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n");
     }
     TQFileInfo program(appdir);
      
     char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
     rubyargs[0] = strdup(argv[0]);
     rubyargs[1] = strdup("-KU");
-    rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
-    rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
+    rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
+    rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
     rubyargs[4] = strdup(program.fileName().latin1());
     for (int i = 1; i < argc; i++) {
         rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb
index 39da5345..9ab56921 100644
--- a/languages/ruby/app_templates/kxt/app.rb
+++ b/languages/ruby/app_templates/kxt/app.rb
@@ -9,7 +9,7 @@
 
 class %{APPNAMESC} < KDE::MainWindow
 
-    slots 'fileNew()',
+    Q_SLOTS 'fileNew()',
           'optionsPreferences()',
           'newToolbarConfig()',
           'changeStatusbar(const QString&)',
diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb
index 391f4c37..0b95fdf1 100644
--- a/languages/ruby/app_templates/kxt/appview.rb
+++ b/languages/ruby/app_templates/kxt/appview.rb
@@ -15,18 +15,18 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base
     #
     # Use this signal to change the content of the statusbar
     #
-    signals 'signalChangeStatusbar(const QString&)'
+    Q_SIGNALS 'signalChangeStatusbar(const QString&)'
 
     #
     # Use this signal to change the content of the caption
     #
-    signals 'signalChangeCaption(const QString&)'
+    Q_SIGNALS 'signalChangeCaption(const QString&)'
 
-    slots 'switchColors()',
+    Q_SLOTS 'switchColors()',
           'settingsChanged()'
    
-    def initialize(parent)
-        super(parent)
+    def initialize(tqparent)
+        super(tqparent)
         
         settingsChanged()
     end
diff --git a/languages/ruby/app_templates/kxt/appview_base.ui b/languages/ruby/app_templates/kxt/appview_base.ui
index 78009d08..db29d6eb 100644
--- a/languages/ruby/app_templates/kxt/appview_base.ui
+++ b/languages/ruby/app_templates/kxt/appview_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAME}view_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAMESC}view_base</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>sillyLabel</cstring>
             </property>
@@ -29,5 +29,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/ruby/app_templates/kxt/prefs-base.ui b/languages/ruby/app_templates/kxt/prefs-base.ui
index 5c0fc860..8c8b9012 100644
--- a/languages/ruby/app_templates/kxt/prefs-base.ui
+++ b/languages/ruby/app_templates/kxt/prefs-base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Prefs_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Prefs_base</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Project age:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -83,14 +83,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="TQSpinBox" row="2" column="1">
             <property name="name">
                 <cstring>kcfg_val_time</cstring>
             </property>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/ruby/app_templates/kxt/src-Makefile.am b/languages/ruby/app_templates/kxt/src-Makefile.am
index a8170abc..e121d0bc 100644
--- a/languages/ruby/app_templates/kxt/src-Makefile.am
+++ b/languages/ruby/app_templates/kxt/src-Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 KDE_ICON = AUTO
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.rb b/languages/ruby/app_templates/qtruby4app/qtruby4app.rb
index 58dfa10a..c44e984a 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.rb
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.rb
@@ -1,7 +1,7 @@
 
 class %{APPNAME} < Qt::MainWindow
 
-    slots :newFile,
+    Q_SLOTS :newFile,
           :open,
           :save,
           :saveAs,
@@ -128,7 +128,7 @@ class %{APPNAME} < Qt::MainWindow
 
         @aboutQtAct = Qt::Action.new(tr("About &Qt"), self)
         @aboutQtAct.statusTip = tr("Show the Qt library's About box")
-        connect(@aboutQtAct, SIGNAL(:triggered), $qApp, SLOT(:aboutQt))
+        connect(@aboutQtAct, SIGNAL(:triggered), $tqApp, SLOT(:aboutQt))
 
         @cutAct.setEnabled(false)
         @copyAct.setEnabled(false)
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
index 18ecdc3f..7d5f9ad3 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
@@ -1,6 +1,6 @@
 class %{APPNAMESC} < Qt::MainWindow
 
-    slots 'newDoc()',
+    Q_SLOTS 'newDoc()',
           'choose()',
           'load( const QString& )',
           'save()',
@@ -81,7 +81,7 @@ class %{APPNAMESC} < Qt::MainWindow
     
         file.insertItem( tr("&Close"), self, SLOT('close()'), Qt::KeySequence.new(CTRL+Key_W) )
     
-        file.insertItem( tr("&Quit"), $qApp, SLOT( 'closeAllWindows()' ), Qt::KeySequence.new(CTRL+Key_Q) )
+        file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), Qt::KeySequence.new(CTRL+Key_Q) )
     
         menuBar().insertSeparator()
     
diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp
index c9a91ec4..972a13a4 100644
--- a/languages/ruby/debugger/breakpoint.cpp
+++ b/languages/ruby/debugger/breakpoint.cpp
@@ -70,7 +70,7 @@ Breakpoint::~Breakpoint()
 TQString Breakpoint::dbgRemoveCommand() const
 {
 //    if (dbgId_>0)
-//        return TQString("delete %1").arg(dbgId_); // gdb command - not translatable
+//        return TQString("delete %1").tqarg(dbgId_); // gdb command - not translatable
 
     return TQString();
 }
@@ -161,9 +161,9 @@ TQString FilePosBreakpoint::dbgSetCommand() const
 {
     TQString cmdStr;
     if (fileName_.isEmpty())
-        cmdStr = TQString("break %1").arg(lineNo_);  // gdb command - not translatable
+        cmdStr = TQString("break %1").tqarg(lineNo_);  // gdb command - not translatable
     else {
-        cmdStr = TQString("break %1:%2").arg(fileName_).arg(lineNo_);
+        cmdStr = TQString("break %1:%2").tqarg(fileName_).tqarg(lineNo_);
     }
 
     if (isTemporary())
diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h
index 56aaee11..6fe2e0db 100644
--- a/languages/ruby/debugger/dbgcontroller.h
+++ b/languages/ruby/debugger/dbgcontroller.h
@@ -77,9 +77,10 @@ enum RttiValues {
 /***************************************************************************/
 /***************************************************************************/
 /***************************************************************************/
-class DbgController : public QObject
+class DbgController : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -126,7 +127,7 @@ public slots:
     virtual void slotBPState(const Breakpoint&)                             = 0;
 
 
-    virtual void slotExpandItem(VarItem *parent,
+    virtual void slotExpandItem(VarItem *tqparent,
                                     const TQCString &userRequest)            = 0;
     virtual void slotSelectFrame(int frame, int thread, 
 	                                const TQString& frameName)               = 0;
@@ -150,7 +151,7 @@ signals:
     void rdbStdout            (const char *output);
     void rdbStderr            (const char *output);
     void showStepInSource     (const TQString &fileName, int lineNum, const TQString &address);
-    void dbgStatus            (const TQString &status, int statusFlag);
+    void dbgtqStatus            (const TQString &status, int statusFlag);
 
 protected:
     KProcess *dbgProcess_;
diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp
index d5458c28..336a48b6 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -51,8 +51,8 @@ namespace RDBDebugger
 // For use with the internal debugger, but this dialog doesn't know anything
 // about why it's doing it.
 
-Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
-    : KDialog(parent, name, true),      // modal
+Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name)
+    : KDialog(tqparent, name, true),      // modal
       psProc_(0),
       pids_(new TQListBox(this)),
       heading_(new TQLabel(" ", this)),
@@ -64,8 +64,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
 
     heading_->setFont(KGlobalSettings::fixedFont());
     heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-    heading_->setMaximumHeight(heading_->sizeHint().height());
-//    heading_->setMinimumSize(heading_->sizeHint());
+    heading_->setMaximumHeight(heading_->tqsizeHint().height());
+//    heading_->setMinimumSize(heading_->tqsizeHint());
     topLayout->addWidget(heading_, 5);
 
     topLayout->addWidget(pids_, 5);
@@ -75,7 +75,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     buttonbox->addStretch();
     TQPushButton *cancel   = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->layout();
+    buttonbox->tqlayout();
     topLayout->addWidget(buttonbox);
 
     connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
@@ -149,14 +149,14 @@ void Dbg_PS_Dialog::slotProcessExited()
 
     pidLines_ += '\n';
 
-    int start = pidLines_.find('\n', 0);  // Skip the first line (header line)
+    int start = pidLines_.tqfind('\n', 0);  // Skip the first line (header line)
     int pos;
     if (start != -1)
         heading_->setText(pidLines_.left(start));
-    while ( (pos = pidLines_.find('\n', start)) != -1) {
+    while ( (pos = pidLines_.tqfind('\n', start)) != -1) {
         TQString item = pidLines_.mid(start, pos-start);
         if (!item.isEmpty()) {
-            if (item.find(pidCmd_) == -1)
+            if (item.tqfind(pidCmd_) == -1)
                 pids_->insertItem(item);
         }
 
diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h
index 928e4c54..1f30d6a7 100644
--- a/languages/ruby/debugger/dbgpsdlg.h
+++ b/languages/ruby/debugger/dbgpsdlg.h
@@ -36,9 +36,10 @@ namespace RDBDebugger
 class Dbg_PS_Dialog : public KDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 );
+    Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 );
     ~Dbg_PS_Dialog();
 
     int pidSelected();
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 36b42f07..706b6284 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -71,10 +71,10 @@ namespace RDBDebugger
 // the iconify, close, etc buttons from the window title but again I kept running
 // into problems. Instead, I used no decoration and this class. Also this looks
 // similar to the KToolBar floating style.
-class DbgMoveHandle : public QFrame
+class DbgMoveHandle : public TQFrame
 {
 public:
-    DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0);
+    DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0);
     virtual ~DbgMoveHandle();
 
     virtual void mousePressEvent(TQMouseEvent *e);
@@ -89,9 +89,9 @@ private:
 
 // **************************************************************************
 
-DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f)
-    : TQFrame(parent, name, f),
-      toolBar_(parent),
+DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f)
+    : TQFrame(tqparent, name, f),
+      toolBar_(tqparent),
       offset_(TQPoint(0,0)),
       moving_(false)
 {
@@ -113,21 +113,21 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
     if (moving_)
         return;
 
-    if (e->button() == RightButton) {
+    if (e->button() == Qt::RightButton) {
         KPopupMenu *menu = new KPopupMenu(this);
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
-                         parent(), TQT_SLOT(slotDock()));
+                         tqparent(), TQT_SLOT(slotDock()));
         menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"),
-                         parent(), TQT_SLOT(slotIconifyAndDock()));
+                         tqparent(), TQT_SLOT(slotIconifyAndDock()));
         menu->popup(e->globalPos());
     } else {
         moving_ = true;
-        offset_ = parentWidget()->pos() - e->globalPos();
+        offset_ = tqparentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
-        setPalette(TQPalette(colorGroup().background()));
-        repaint();
+        setPalette(TQPalette(tqcolorGroup().background()));
+        tqrepaint();
     }
 }
 
@@ -140,8 +140,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
     offset_ = TQPoint(0,0);
     setFrameStyle(TQFrame::Panel|TQFrame::Raised);
     TQApplication::restoreOverrideCursor();
-    setPalette(TQPalette(colorGroup().background()));
-    repaint();
+    setPalette(TQPalette(tqcolorGroup().background()));
+    tqrepaint();
 }
 
 // **************************************************************************
@@ -159,16 +159,16 @@ void DbgMoveHandle::mouseMoveEvent(TQMouseEvent *e)
 // **************************************************************************
 // **************************************************************************
 
-// This class adds text _and_ a pixmap to a button. Why doesn't QPushButton
+// This class adds text _and_ a pixmap to a button. Why doesn't TQPushButton
 // support that? It only allowed text _or_ pixmap.
-class DbgButton : public QPushButton
+class DbgButton : public TQPushButton
 {
 public:
     DbgButton(const TQPixmap &pixmap, const TQString &text,
-              DbgToolBar *parent, const char *name=0);
+              DbgToolBar *tqparent, const char *name=0);
     virtual ~DbgButton() {};
     void drawButtonLabel(TQPainter *painter);
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 private:
     TQPixmap pixmap_;
@@ -177,8 +177,8 @@ private:
 // **************************************************************************
 
 DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text,
-                     DbgToolBar* parent, const char* name)
-    : TQPushButton(parent, name),
+                     DbgToolBar* tqparent, const char* name)
+    : TQPushButton(tqparent, name),
       pixmap_(pixmap)
 {
     setText(text);
@@ -197,27 +197,27 @@ void DbgButton::drawButtonLabel(TQPainter *painter)
     painter->drawPixmap(x, y, pixmap_);
 
     if (hasText) {
-        painter->setPen(colorGroup().text());
+        painter->setPen(tqcolorGroup().text());
         painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text());
     }
 }
 
 // **************************************************************************
 
-TQSize DbgButton::sizeHint() const
+TQSize DbgButton::tqsizeHint() const
 {
     if (text().isEmpty())
         return pixmap_.size();
     else
-        return TQPushButton::sizeHint();
+        return TQPushButton::tqsizeHint();
 }
 
 // **************************************************************************
 // **************************************************************************
 // **************************************************************************
 
-DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) :
-    KSystemTray(parent, "DbgDocker"),
+DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) :
+    KSystemTray(tqparent, "DbgDocker"),
     toolBar_(toolBar)
 {
     setPixmap(pixmap);
@@ -228,17 +228,17 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm
 
 void DbgDocker::mousePressEvent(TQMouseEvent *e)
 {
-    if (!rect().contains( e->pos()))
+    if (!TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos()))
         return;
 
     switch (e->button()) {
-    case LeftButton:
+    case Qt::LeftButton:
         {
             // Not really a click, but it'll hold for the time being !!!
             emit clicked();
             break;
         }
-    case RightButton:
+    case Qt::RightButton:
         {
             KPopupMenu* menu = new KPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
@@ -257,7 +257,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
 // **************************************************************************
 
 DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
-                       TQWidget* parent, const char* name)
+                       TQWidget* tqparent, const char* name)
     : TQFrame(0, name),
       part_(part),
       activeWindow_(0),
@@ -267,10 +267,10 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
       appIsActive_(false),
       docked_(false),
       docker_(0),
-      dockWindow_(new KSystemTray(parent))
+      dockWindow_(new KSystemTray(tqparent))
 {
-    winModule_  = new KWinModule(this);
-    docker_ = new DbgDocker(parent, this, BarIcon("dbgnext"));
+    winModule_  = new KWinModule(TQT_TQOBJECT(this));
+    docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext"));
     connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver()));
 
     // Must have noFocus set so that we can see what window was active.
@@ -284,7 +284,7 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
 //    KWin::setType(winId(), NET::Override);    // So it has no decoration
     KWin::setType(winId(), NET::Dock);
 
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setFrameStyle( TQFrame::Box | TQFrame::Plain );
     setLineWidth(4);
     setMidLineWidth(0);
@@ -303,8 +303,8 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
     TQPushButton*  bStep       = new DbgButton(BarIcon("dbgstep"),       i18n("Step Into"),    this);
     TQPushButton*  bFinish     = new DbgButton(BarIcon("dbgstepout"),    i18n("Step Out"),   this);
     TQPushButton*  bRunTo      = new DbgButton(BarIcon("dbgrunto"),      i18n("Run to Cursor"),   this);
-    bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString::null,      this);
-    bKDevFocus_ = new DbgButton(BarIcon("kdevelop"),      TQString::null,      this);
+    bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"),    TQString(),      this);
+    bKDevFocus_ = new DbgButton(BarIcon("kdevelop"),      TQString(),      this);
 
   connect(bRun,        TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotRun()));
   connect(bInterrupt,  TQT_SIGNAL(clicked()), part_,  TQT_SLOT(slotPause()));
@@ -351,12 +351,12 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
 
     nextLayout->addWidget(bNext);
 
-//     int w = QMAX(bRun->sizeHint().width(), bFinish->sizeHint().width());
-//     w = QMAX(w, bInterrupt->sizeHint().width());
-//     w = QMAX(w, bView->sizeHint().width());
+//     int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width());
+//     w = TQMAX(w, bInterrupt->tqsizeHint().width());
+//     w = TQMAX(w, bView->tqsizeHint().width());
 
     // they should have the same height, so don't be too fussy
-//     int h = bFinish->sizeHint().height();
+//     int h = bFinish->tqsizeHint().height();
 //
 //     bNext->setMinimumHeight(h);
 //     bNexti->setMinimumHeight(h);
@@ -390,10 +390,10 @@ void DbgToolBar::slotKdevFocus()
     // If anyone has a way of determining what window the app is _actually_ running on
     // then please fix and send a patch.
 
-    if (winModule_->activeWindow() != topLevelWidget()->winId())
+    if (winModule_->activeWindow() != tqtopLevelWidget()->winId())
         activeWindow_ = winModule_->activeWindow();
 
-    KWin::activateWindow(topLevelWidget()->winId());
+    KWin::activateWindow(tqtopLevelWidget()->winId());
 }
 
 // **************************************************************************
@@ -407,7 +407,7 @@ void DbgToolBar::slotPrevFocus()
 
 // If the app is active then the app button is highlighted, otherwise
 // kdev button is highlighted.
-void DbgToolBar::slotDbgStatus(const TQString&, int state)
+void DbgToolBar::slotDbgtqStatus(const TQString&, int state)
 {
     bool appIndicator = state & s_appBusy;
     if (appIndicator != appIsActive_) {
@@ -421,11 +421,11 @@ void DbgToolBar::slotDbgStatus(const TQString&, int state)
 void DbgToolBar::setAppIndicator(bool appIndicator)
 {
     if (appIndicator) {
-        bPrevFocus_->setPalette(TQPalette(colorGroup().mid()));
-        bKDevFocus_->setPalette(TQPalette(colorGroup().background()));
+        bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
+        bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
     } else {
-        bPrevFocus_->setPalette(TQPalette(colorGroup().background()));
-        bKDevFocus_->setPalette(TQPalette(colorGroup().mid()));
+        bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background()));
+        bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid()));
     }
 }
 
@@ -473,7 +473,7 @@ void DbgToolBar::slotActivateAndUndock()
     if (!docked_)
         return;
 
-    KWin::activateWindow(topLevelWidget()->winId());
+    KWin::activateWindow(tqtopLevelWidget()->winId());
     slotUndock();
 }
 
diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h
index a83c120a..2d059cec 100644
--- a/languages/ruby/debugger/dbgtoolbar.h
+++ b/languages/ruby/debugger/dbgtoolbar.h
@@ -39,9 +39,10 @@ class RubyDebuggerPart;
 class DbgDocker : public KSystemTray
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap);
+    DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap);
     virtual ~DbgDocker()  {};
     virtual void mousePressEvent(TQMouseEvent *e);
 
@@ -53,16 +54,17 @@ private:
 };
 
 
-class DbgToolBar : public QFrame
+class DbgToolBar : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DbgToolBar(RubyDebuggerPart *part, TQWidget* parent, const char* name=0);
+    DbgToolBar(RubyDebuggerPart *part, TQWidget* tqparent, const char* name=0);
     virtual ~DbgToolBar();
 
 private slots:
-    void slotDbgStatus(const TQString&, int);
+    void slotDbgtqStatus(const TQString&, int);
     void slotDock();
     void slotUndock();
     void slotIconifyAndDock();
diff --git a/languages/ruby/debugger/debuggee.rb b/languages/ruby/debugger/debuggee.rb
index 38e2dea7..51df5867 100644
--- a/languages/ruby/debugger/debuggee.rb
+++ b/languages/ruby/debugger/debuggee.rb
@@ -441,7 +441,7 @@ class Context
 	  stdout.printf "Set watchpoint %d\n", break_points.size, exp
 
 	when /^\s*b(?:reak)?$/
-	  if break_points.find{|b| b[1] == 0}
+	  if break_points.tqfind{|b| b[1] == 0}
 	    n = 1
 	    stdout.print "Breakpoints:\n"
 	    for b in break_points
@@ -451,7 +451,7 @@ class Context
 	      n += 1
 	    end
 	  end
-	  if break_points.find{|b| b[1] == 1}
+	  if break_points.tqfind{|b| b[1] == 1}
 	    n = 1
 	    stdout.print "\n"
 	    stdout.print "Watchpoints:\n"
@@ -827,7 +827,7 @@ EOHELP
       exit
     end
 
-    if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch })
+    if @catch and ($!.class.ancestors.tqfind { |e| e.to_s == @catch })
       stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class
       fs = @frames.size
       tb = caller(0)[-fs..-1]
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 3e46a3d4..7a953fe4 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -72,8 +72,8 @@ static const KDevPluginInfo data("kdevrbdebugger");
 typedef KDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevrbdebugger, RubyDebuggerFactory( data ) )
 
-RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ) :
-    KDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ),
+RubyDebuggerPart::RubyDebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) :
+    KDevPlugin( &data, tqparent, name ? name : "RubyDebuggerPart" ),
     controller(0)
 {
 //    setObjId("RubyDebuggerInterface");
@@ -312,16 +312,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
     if (econtext->url().isLocalFile())
     {
         int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) );
-        popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
+        popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line."));
     }
     if (!m_contextIdent.isEmpty())
     {
         TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
-        int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) );
-        popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list."));
+        int id = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), this, TQT_SLOT(contextWatch()) );
+        popup->tqsetWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list."));
         
-		id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
-        popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
+		id = popup->insertItem( i18n("Inspect: %1").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
+        popup->tqsetWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
     }
 }
 
@@ -412,8 +412,8 @@ void RubyDebuggerPart::setupController()
 
 
     // controller -> this
-    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             this,                  TQT_SLOT(slotStatus(const TQString&, int)));
+    connect( controller,            TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
+             this,                  TQT_SLOT(slottqStatus(const TQString&, int)));
     connect( controller,            TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)),
              this,                  TQT_SLOT(slotShowStep(const TQString&, int)));
 
@@ -428,8 +428,8 @@ void RubyDebuggerPart::setupController()
              rdbOutputWidget,       TQT_SLOT(slotReceivedStdout(const char*)) );
     connect( controller,            TQT_SIGNAL(rdbStderr(const char*)),
              rdbOutputWidget,       TQT_SLOT(slotReceivedStderr(const char*)) );
-    connect( controller,            TQT_SIGNAL(dbgStatus(const TQString&, int)),
-             rdbOutputWidget,       TQT_SLOT(slotDbgStatus(const TQString&, int)));
+    connect( controller,            TQT_SIGNAL(dbgtqStatus(const TQString&, int)),
+             rdbOutputWidget,       TQT_SLOT(slotDbgtqStatus(const TQString&, int)));
 
 }
 
@@ -478,7 +478,7 @@ bool RubyDebuggerPart::startDebugger()
         {
             KMessageBox::error(
                 mainWindow()->main(),
-                i18n("Could not locate the debugging shell '%1'.").arg( shell ),
+                i18n("Could not locate the debugging shell '%1'.").tqarg( shell ),
                 i18n("Debugging Shell Not Found") );
             return false;
         }
@@ -683,7 +683,7 @@ void RubyDebuggerPart::slotRefreshBPState( const Breakpoint& BP)
 }
 
 
-void RubyDebuggerPart::slotStatus(const TQString &msg, int state)
+void RubyDebuggerPart::slottqStatus(const TQString &msg, int state)
 {
     TQString stateIndicator;
 
diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h
index c78a53ee..5f3a06a6 100644
--- a/languages/ruby/debugger/debuggerpart.h
+++ b/languages/ruby/debugger/debuggerpart.h
@@ -48,9 +48,10 @@ class RDBOutputWidget;
 class RubyDebuggerPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & );
+    RubyDebuggerPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~RubyDebuggerPart();
     virtual void restorePartialProjectSession(const TQDomElement* el);
     virtual void savePartialProjectSession(TQDomElement* el);
@@ -75,7 +76,7 @@ private slots:
     void slotStepOut();
 
     void slotRefreshBPState(const Breakpoint&);
-    void slotStatus(const TQString &msg, int state);
+    void slottqStatus(const TQString &msg, int state);
     void slotShowStep(const TQString &fileName, int lineNum);
     void slotGotoSource(const TQString &fileName, int lineNum);
 
diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp
index c8083dc8..d98582c5 100644
--- a/languages/ruby/debugger/framestackwidget.cpp
+++ b/languages/ruby/debugger/framestackwidget.cpp
@@ -41,8 +41,8 @@
 namespace RDBDebugger
 {
 
-FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f)
-        : TQListView(parent, name, f),
+FramestackWidget::FramestackWidget(TQWidget *tqparent, const char *name, WFlags f)
+        : TQListView(tqparent, name, f),
         viewedThread_(0)
 {
     setRootIsDecorated(true);
@@ -119,7 +119,7 @@ void FramestackWidget::parseRDBThreadList(char *str)
 		ThreadStackItem* thread;
         thread = new ThreadStackItem(	this,
 										thread_re.cap(2).toInt(),
-										TQString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) );
+										TQString("%1 %2").tqarg(thread_re.cap(2)).tqarg(thread_re.cap(3)) );
 		// The thread with a '+' is always the viewedthread
         if (thread_re.cap(1) == "+") {
             viewedThread_ = thread;
@@ -136,11 +136,11 @@ void FramestackWidget::parseRDBThreadList(char *str)
 
 void FramestackWidget::parseRDBBacktraceList(char *str)
 {
-	QRegExp	frame_re("#(\\d+) ([^:]+):(\\d+)(:in `([^\\n]+)')?");
+	TQRegExp	frame_re("#(\\d+) ([^:]+):(\\d+)(:in `([^\\n]+)')?");
 	int	pos = frame_re.search(str);
 	
     while (pos != -1) {
-		QString	method(frame_re.cap(5));
+		TQString	method(frame_re.cap(5));
 		if (method == "") {
 			method = "toplevel";
 		} else {
@@ -148,7 +148,7 @@ void FramestackWidget::parseRDBBacktraceList(char *str)
 		}
 		
 		int frameNo = frame_re.cap(1).toInt();
-		TQString frameName = TQString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method);
+		TQString frameName = TQString("T%1#%2 %3").tqarg(viewedThread_->threadNo()).tqarg(frame_re.cap(1)).tqarg(method);
 		new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName);
 		
 		// Tell the Variable Tree that this frame is active
@@ -211,10 +211,10 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo)
 
 // **************************************************************************
 
-FrameStackItem::FrameStackItem(ThreadStackItem *parent, int frameNo, const TQString &frameDesc, const TQString& frameName)
-        : TQListViewItem(parent),
+FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, int frameNo, const TQString &frameDesc, const TQString& frameName)
+        : TQListViewItem(tqparent),
         frameNo_(frameNo),
-        threadNo_(parent->threadNo()),
+        threadNo_(tqparent->threadNo()),
 		frameName_(frameName)		
 {
 	setText(0, frameDesc);
@@ -239,8 +239,8 @@ TQString FrameStackItem::key(int /*column*/, bool /*ascending*/) const
 // **************************************************************************
 // **************************************************************************
 
-ThreadStackItem::ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc)
-        : TQListViewItem(parent),
+ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, int threadNo, const TQString &threadDesc)
+        : TQListViewItem(tqparent),
         threadNo_(threadNo)
 {
     setText(0, threadDesc);
diff --git a/languages/ruby/debugger/framestackwidget.h b/languages/ruby/debugger/framestackwidget.h
index b000f042..59280f3b 100644
--- a/languages/ruby/debugger/framestackwidget.h
+++ b/languages/ruby/debugger/framestackwidget.h
@@ -33,10 +33,10 @@ namespace RDBDebugger
 class FramestackWidget;
 
 
-class ThreadStackItem : public QListViewItem
+class ThreadStackItem : public TQListViewItem
 {
 public:
-    ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc);
+    ThreadStackItem(FramestackWidget *tqparent, int threadNo, const TQString &threadDesc);
     virtual ~ThreadStackItem();
 
 	virtual int rtti() const { return RTTI_THREAD_STACK_ITEM; }
@@ -52,10 +52,10 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class FrameStackItem : public QListViewItem
+class FrameStackItem : public TQListViewItem
 {
 public:
-    FrameStackItem(ThreadStackItem * parent, int frameNo, const TQString & frameDesc, const TQString & frameName);
+    FrameStackItem(ThreadStackItem * tqparent, int frameNo, const TQString & frameDesc, const TQString & frameName);
     virtual ~FrameStackItem();
 
 	virtual int rtti() const { return RTTI_FRAME_STACK_ITEM; }
@@ -79,12 +79,13 @@ private:
 /**
  * @author John Birch
  */
-class FramestackWidget : public QListView
+class FramestackWidget : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FramestackWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 );
+    FramestackWidget( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
     virtual ~FramestackWidget();
 
     void clear();
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index b9ead060..7c987289 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -56,7 +56,7 @@ enum Column {
     Control     = 0,
     Enable      = 1,
     Type        = 2,
-    Status      = 3,
+    tqStatus      = 3,
     Location    = 4
 };
 
@@ -69,7 +69,7 @@ static int m_activeFlag = 0;
 /***************************************************************************/
 /***************************************************************************/
 
-class BreakpointTableRow : public QTableItem
+class BreakpointTableRow : public TQTableItem
 {
 public:
 
@@ -93,9 +93,9 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType,
+BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType,
                                        Breakpoint* bp) :
-        TQTableItem(parent, editType, ""),
+        TQTableItem(tqparent, editType, ""),
         m_breakpoint(bp)
 {
     appendEmptyRow();
@@ -149,7 +149,7 @@ void BreakpointTableRow::setRow()
 
         TQString status=m_breakpoint->statusDisplay(m_activeFlag);
 
-        table()->setText(row(), Status, status);
+        table()->setText(row(), tqStatus, status);
 
         TQString displayType = m_breakpoint->displayType();
         table()->setText(row(), Location, m_breakpoint->location());
@@ -159,7 +159,7 @@ void BreakpointTableRow::setRow()
 
         table()->setText(row(), Type, displayType);
         table()->adjustColumn(Type);
-        table()->adjustColumn(Status);
+        table()->adjustColumn(tqStatus);
         table()->adjustColumn(Location);
     }
 }
@@ -168,8 +168,8 @@ void BreakpointTableRow::setRow()
 /***************************************************************************/
 /***************************************************************************/
 
-RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) :
-    TQHBox(parent, name)
+RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *tqparent, const char *name) :
+    TQHBox(tqparent, name)
 {
     TQFrame* toolbar = new TQFrame( this );
     TQVBoxLayout *l = new TQVBoxLayout(toolbar, 0, 0);
@@ -221,14 +221,14 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) :
 
     m_table->hideColumn(Control);
     m_table->setColumnReadOnly(Type, true);
-    m_table->setColumnReadOnly(Status, true);
+    m_table->setColumnReadOnly(tqStatus, true);
     m_table->setColumnWidth( Enable, 20);
 
     TQHeader *header = m_table->horizontalHeader();
 
     header->setLabel( Enable,       "" );
     header->setLabel( Type,         i18n("Type") );
-    header->setLabel( Status,       i18n("Status") );
+    header->setLabel( tqStatus,       i18n("tqStatus") );
     header->setLabel( Location,     i18n("Location") );
 
     m_table->show();
@@ -311,7 +311,7 @@ void RDBBreakpointWidget::slotRefreshBP(const KURL &filename)
 
 /***************************************************************************/
 
-BreakpointTableRow* RDBBreakpointWidget::find(Breakpoint *breakpoint)
+BreakpointTableRow* RDBBreakpointWidget::tqfind(Breakpoint *breakpoint)
 {
     // NOTE:- The match doesn't have to be equal. Each type of bp
     // must decide on the match criteria.
@@ -398,7 +398,7 @@ void RDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin
 {
     FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1);
 
-    BreakpointTableRow* btr = find(fpBP);
+    BreakpointTableRow* btr = tqfind(fpBP);
     if (btr)
     {
         delete fpBP;
@@ -414,7 +414,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName,
 {
     FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1);
 
-    BreakpointTableRow* btr = find(fpBP);
+    BreakpointTableRow* btr = tqfind(fpBP);
     delete fpBP;
     if (btr)
     {
@@ -429,7 +429,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName,
 void RDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName)
 {
     Watchpoint *watchpoint = new Watchpoint(varName, false, true);
-    BreakpointTableRow* btr = find(watchpoint);
+    BreakpointTableRow* btr = tqfind(watchpoint);
     if (btr)
     {
         removeBreakpoint(btr);
@@ -460,7 +460,7 @@ void RDBBreakpointWidget::slotSetPendingBPs()
 /***************************************************************************/
 
 // The debugger is having trouble with this bp - probably because a library
-// was unloaded and invalidated a bp that was previously set in the library
+// was unloaded and tqinvalidated a bp that was previously set in the library
 // code. Reset the bp so that we can try again later.
 void RDBBreakpointWidget::slotUnableToSetBPNow(int BPid)
 {
@@ -773,7 +773,7 @@ void RDBBreakpointWidget::slotNewValue(int row, int col)
         }
 
         case Type:
-        case Status:
+        case tqStatus:
         default:
             break;
         }
@@ -792,7 +792,7 @@ void RDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineN
 {
     FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1);
 
-    BreakpointTableRow* btr = find(fpBP);
+    BreakpointTableRow* btr = tqfind(fpBP);
     delete fpBP;
 
     if (btr)
@@ -889,7 +889,7 @@ void RDBBreakpointWidget::restorePartialProjectSession(const TQDomElement* el)
                 bp->setEnabled(breakpointEl.attribute( "enabled", "1").toInt());
 
                 // Add the bp if we don't already have it.
-                if (!find(bp))
+                if (!tqfind(bp))
                     addBreakpoint(bp);
                 else
                     delete bp;
@@ -904,7 +904,7 @@ void RDBBreakpointWidget::slotAddBreakpoint( )
 {
     if (m_add->popup())
     {
-        m_add->popup()->popup(mapToGlobal(this->geometry().topLeft()));
+        m_add->popup()->popup(mapToGlobal(this->tqgeometry().topLeft()));
     }
 }
 
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h
index 75c0dfbb..58275842 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.h
+++ b/languages/ruby/debugger/rdbbreakpointwidget.h
@@ -39,12 +39,13 @@ class Breakpoint;
 class BreakpointTableRow;
 class RDBTable;
 
-class RDBBreakpointWidget : public QHBox
+class RDBBreakpointWidget : public TQHBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    RDBBreakpointWidget( TQWidget* parent=0, const char* name=0 );
+    RDBBreakpointWidget( TQWidget* tqparent=0, const char* name=0 );
     virtual ~RDBBreakpointWidget();
 
     void reset();
@@ -93,7 +94,7 @@ signals:
     void clearAllBreakpoints();
 
 private:
-    BreakpointTableRow* find(Breakpoint *bp);
+    BreakpointTableRow* tqfind(Breakpoint *bp);
     BreakpointTableRow* findId(int id);
     BreakpointTableRow* findKey(int BPKey);
 
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index f0b6ea40..5dd15586 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -115,7 +115,7 @@ RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack
 {
     struct sockaddr_un	sockaddr;
 	unixSocketPath_.sprintf("/tmp/.rubydebugger%d", getpid());
-	QFileInfo			unixSocket(unixSocketPath_);
+	TQFileInfo			unixSocket(unixSocketPath_);
 	
     stdoutSizeofBuf_ = sizeof(stdoutOutput_);
     rdbSizeofBuf_ = sizeof(rdbOutput_);
@@ -236,7 +236,7 @@ void RDBController::executeCmd()
     emit rdbStdout( prettyCmd.latin1() );
 	
     if (!stateIsOn(s_silent))
-        emit dbgStatus("", state_);
+        emit dbgtqStatus("", state_);
 }
 
 // **************************************************************************
@@ -301,7 +301,7 @@ void RDBController::actOnProgramPause(const TQString &msg)
         if (stateIsOn(s_silent))
             return;
 
-        emit dbgStatus (msg, state_);
+        emit dbgtqStatus (msg, state_);
 
         // We're always at frame one when the program stops
         // and we must reset the active flag
@@ -341,14 +341,14 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox)
     varTree_->viewport()->setUpdatesEnabled(false);
     varTree_->prune();
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->repaint();
+    varTree_->tqrepaint();
 
     frameStack_->clear();
 
     if (msgBox)
         KMessageBox::error(0, i18n("rdb message:\n")+msg);
 
-    emit dbgStatus (msg, state_);
+    emit dbgtqStatus (msg, state_);
 }
 
 // **************************************************************************
@@ -394,9 +394,9 @@ void RDBController::parseProgramLocation(char *buf)
 	}
 	
     if (stateIsOn(s_appBusy))
-        actOnProgramPause(i18n("No source: %1").arg(sourceFile));
+        actOnProgramPause(i18n("No source: %1").tqarg(sourceFile));
     else
-        emit dbgStatus (i18n("No source: %1").arg(sourceFile), state_);
+        emit dbgtqStatus (i18n("No source: %1").tqarg(sourceFile), state_);
 }
 
 // **************************************************************************
@@ -458,7 +458,7 @@ void RDBController::parseFrameMove(char *buf)
 		}
 	}
 	
-	emit dbgStatus(i18n("No source: %1").arg(sourceFile), state_);
+	emit dbgtqStatus(i18n("No source: %1").tqarg(sourceFile), state_);
 }
 
 // **************************************************************************
@@ -492,7 +492,7 @@ void RDBController::parseRequestedData(char *buf)
         varTree_->viewport()->setUpdatesEnabled(false);
         item->expandValue(buf);
         varTree_->viewport()->setUpdatesEnabled(true);
-        varTree_->repaint();
+        varTree_->tqrepaint();
     }
 }
 
@@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf)
 {
     if (!stateIsOn(s_silent)) {
         emit showStepInSource("", -1, "");
-        emit dbgStatus (i18n("No source: %1").arg(TQString(buf)), state_);
+        emit dbgtqStatus (i18n("No source: %1").tqarg(TQString(buf)), state_);
     }
 }
 
@@ -517,7 +517,7 @@ void RDBController::parseDisplay(char *buf, char * expr)
     varTree_->viewport()->setUpdatesEnabled(false);
     varTree_->watchRoot()->setWatchExpression(buf, expr);
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->repaint();
+    varTree_->tqrepaint();
 }
 
 // **************************************************************************
@@ -538,7 +538,7 @@ void RDBController::parseUpdateDisplay(char *buf)
 	}
 
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->repaint();
+    varTree_->tqrepaint();
 }
 
 // **************************************************************************
@@ -549,7 +549,7 @@ void RDBController::parseGlobals(char *buf)
     varTree_->viewport()->setUpdatesEnabled(false);
     varTree_->globalRoot()->setGlobals(buf);
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->repaint();
+    varTree_->tqrepaint();
 }
 
 // **************************************************************************
@@ -584,7 +584,7 @@ void RDBController::parseLocals(char type, char *buf)
 	}
 
     varTree_->viewport()->setUpdatesEnabled(true);
-    varTree_->repaint();
+    varTree_->tqrepaint();
 }
 
 
@@ -601,27 +601,27 @@ void RDBController::parse(char *buf)
         parseProgramLocation(buf);
 	} else if (currentCmd_->rawDbgCommand() == "break") {
         emit rawRDBBreakpointList(buf);
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "break ", strlen("break ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "break ", strlen("break ")) == 0) {
 		parseBreakpointSet(buf); 
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "watch ", strlen("watch ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "watch ", strlen("watch ")) == 0) {
 		parseBreakpointSet(buf); 
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "display ", strlen("display ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "display ", strlen("display ")) == 0) {
 		parseDisplay(buf, currentCmd_->rawDbgCommand().data() + strlen("display "));
 	} else if (currentCmd_->rawDbgCommand() == "display") {
 		parseUpdateDisplay(buf);
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "undisplay ", strlen("undisplay ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "undisplay ", strlen("undisplay ")) == 0) {
 		;
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "method instance ", strlen("method instance ")) == 0) { 
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "method ", strlen("method ")) == 0) {
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "pp ", strlen("pp ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "method instance ", strlen("method instance ")) == 0) { 
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "method ", strlen("method ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "pp ", strlen("pp ")) == 0) {
 		parseRequestedData(buf);
 	} else if (currentCmd_->rawDbgCommand() == "thread list") {
 		parseThreadList(buf);
-	} else if (	qstrncmp(currentCmd_->rawDbgCommand(), "up ", strlen("up ")) == 0
-				|| qstrncmp(currentCmd_->rawDbgCommand(), "down ", strlen("down ")) == 0 ) 
+	} else if (	tqstrncmp(currentCmd_->rawDbgCommand(), "up ", strlen("up ")) == 0
+				|| tqstrncmp(currentCmd_->rawDbgCommand(), "down ", strlen("down ")) == 0 ) 
 	{
 		parseFrameMove(buf);
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "thread switch ", strlen("thread switch ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "thread switch ", strlen("thread switch ")) == 0) {
 		parseSwitchThread(buf);
 	} else if (currentCmd_->rawDbgCommand() == "thread current") {
 		parseThreadList(buf);
@@ -631,11 +631,11 @@ void RDBController::parse(char *buf)
 		parseGlobals(buf);
 	} else if (currentCmd_->rawDbgCommand() == "var local") {
 		parseLocals(LOCALS, buf);
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "var instance ", strlen("var instance ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "var instance ", strlen("var instance ")) == 0) {
 		parseLocals(IVARS, buf);
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "var class ", strlen("var class ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "var class ", strlen("var class ")) == 0) {
 		parseLocals(CVARS, buf);
-	} else if (qstrncmp(currentCmd_->rawDbgCommand(), "var const ", strlen("var const ")) == 0) {
+	} else if (tqstrncmp(currentCmd_->rawDbgCommand(), "var const ", strlen("var const ")) == 0) {
 		parseLocals(CONSTANTS, buf);
 	}
 
@@ -766,9 +766,9 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString&
     // BUT the app hasn't been started yet! A run command is about to be issued
     // by whoever is controlling us.
 	
-    if (!dbgProcess_->writeStdin(TQString("%1\n").arg(unixSocketPath_).latin1(), strlen(unixSocketPath_) + 1)) {
+    if (!dbgProcess_->writeStdin(TQString("%1\n").tqarg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) {
         kdDebug(9012) << "failed to write Unix domain socket path to rdb " 
-		<< TQString("%1\n").arg(unixSocketPath_).latin1() << endl;
+		<< TQString("%1\n").tqarg(unixSocketPath_.data()).latin1() << endl;
 	}
 	
 	setStateOff(s_programExited);
@@ -797,7 +797,7 @@ void RDBController::slotStopDebugger()
         start = TQTime::currentTime();
         while (-1)
         {
-            kapp->processEvents(20);
+            kapp->tqprocessEvents(20);
             now = TQTime::currentTime();
             if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000)
                 break;
@@ -816,7 +816,7 @@ void RDBController::slotStopDebugger()
     start = TQTime::currentTime();
     while (-1)
     {
-         kapp->processEvents(20);
+         kapp->tqprocessEvents(20);
          now = TQTime::currentTime();
          if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000)
              break;
@@ -833,7 +833,7 @@ void RDBController::slotStopDebugger()
     delete tty_;           tty_ = 0;
 
     state_ = s_dbgNotStarted | s_appNotStarted | s_silent;
-    emit dbgStatus (i18n("Debugger stopped"), state_);
+    emit dbgtqStatus (i18n("Debugger stopped"), state_);
 }
 
 
@@ -1175,7 +1175,7 @@ void RDBController::slotDbgWroteStdin(KProcess *)
 {
 //    setStateOff(s_waitForWrite);
     //  if (!stateIsOn(s_silent))
-    //    emit dbgStatus ("", state_);
+    //    emit dbgtqStatus ("", state_);
 //    executeCmd();
 }
 
@@ -1203,7 +1203,7 @@ void RDBController::slotAcceptConnection(int masterSocket)
                           this, TQT_SLOT(slotReadFromSocket(int)) );	
     
 	setStateOff(s_dbgNotStarted);
-    emit dbgStatus ("", state_);
+    emit dbgtqStatus ("", state_);
     
 	cmdList_.clear();
 	rdbOutputLen_ = 0;	
@@ -1283,7 +1283,7 @@ void RDBController::slotDbgProcessExited(KProcess*)
 {
     destroyCmds();
     state_ = s_appNotStarted|s_programExited|(state_&(s_shuttingDown));
-    emit dbgStatus (i18n("Process exited"), state_);
+    emit dbgtqStatus (i18n("Process exited"), state_);
     emit rdbStdout("(rdb:1) Process exited\n");
 	frameStack_->clear();
 	varTree_->clear();	
diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h
index e2ed0746..af72ddbc 100644
--- a/languages/ruby/debugger/rdbcontroller.h
+++ b/languages/ruby/debugger/rdbcontroller.h
@@ -56,6 +56,7 @@ class STTY;
 class RDBController : public DbgController
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     RDBController(VariableTree *varTree, FramestackWidget *frameStack, TQDomDocument &projectDom);
@@ -116,7 +117,7 @@ public slots:
     void slotBPState( const Breakpoint& );
     void slotClearAllBreakpoints();
 
-    void slotExpandItem(VarItem *parent, const TQCString &userRequest);
+    void slotExpandItem(VarItem *tqparent, const TQCString &userRequest);
     void slotRubyInspect(const TQString &inspectText);
     void slotSelectFrame(int frameNo, int threadNo, const TQString& frameName);
     void slotFetchGlobals(bool fetch);
diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp
index 6eef01c7..b1b9deda 100644
--- a/languages/ruby/debugger/rdboutputwidget.cpp
+++ b/languages/ruby/debugger/rdboutputwidget.cpp
@@ -44,8 +44,8 @@ namespace RDBDebugger
 
 /***************************************************************************/
 
-RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) :
-    TQWidget(parent, name),
+RDBOutputWidget::RDBOutputWidget( TQWidget *tqparent, const char *name) :
+    TQWidget(tqparent, name),
     m_userRDBCmdEditor(0),
     m_Interrupt(0),
     m_rdbView(0)
@@ -65,7 +65,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) :
     userRDBCmdEntry->setStretchFactor(m_userRDBCmdEditor, 1);
 
     m_Interrupt = new TQToolButton( this, "add breakpoint" );
-    m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
+    m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0,
                                          ( TQSizePolicy::SizeType)0,
                                          0,
                                          0,
@@ -79,7 +79,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) :
     topLayout->addWidget(m_rdbView, 10);
     topLayout->addLayout(userRDBCmdEntry);
 
-    slotDbgStatus( "", s_dbgNotStarted);
+    slotDbgtqStatus( "", s_dbgNotStarted);
 
     connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) );
     connect( m_Interrupt,        TQT_SIGNAL(clicked()),       TQT_SIGNAL(breakInto()));
@@ -133,7 +133,7 @@ void RDBOutputWidget::slotRDBCmd()
 
 /***************************************************************************/
 
-void RDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag)
+void RDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag)
 {
     if (statusFlag & s_dbgNotStarted)
     {
diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h
index 41d25e5d..32d53110 100644
--- a/languages/ruby/debugger/rdboutputwidget.h
+++ b/languages/ruby/debugger/rdboutputwidget.h
@@ -34,12 +34,13 @@ class TQToolButton;
 namespace RDBDebugger
 {
 
-class RDBOutputWidget : public QWidget
+class RDBOutputWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    RDBOutputWidget( TQWidget *parent=0, const char *name=0 );
+    RDBOutputWidget( TQWidget *tqparent=0, const char *name=0 );
     ~RDBOutputWidget();
 
     void clear();
@@ -47,7 +48,7 @@ public:
 public slots:
     void slotReceivedStdout(const char* line);
     void slotReceivedStderr(const char* line);
-    void slotDbgStatus     (const TQString &status, int statusFlag);
+    void slotDbgtqStatus     (const TQString &status, int statusFlag);
 
     void slotRDBCmd();
 
diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp
index c1cd7717..dc7e0226 100644
--- a/languages/ruby/debugger/rdbparser.cpp
+++ b/languages/ruby/debugger/rdbparser.cpp
@@ -34,15 +34,15 @@ namespace RDBDebugger
 
 // **************************************************************************
 
-void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
+void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf)
 {
     static const char *unknown = "?";
 	
-	QString		varName;
-	QCString	value;
+	TQString		varName;
+	TQCString	value;
 	int			pos;
 
-    Q_ASSERT(parent);
+    Q_ASSERT(tqparent);
     if (buf == 0 || strlen(buf) == 0) {
         return;
 	}
@@ -64,10 +64,10 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
 		while (pos != -1) {
 			varName = var_re.cap(1);
 			if (ref_re.search(var_re.cap(2)) != -1) {
-				if (var_re.cap(2).contains("=") > 0) {
+				if (var_re.cap(2).tqcontains("=") > 0) {
 					value = (ref_re.cap(1) + ">").latin1();
 				} else {
-					// There are no 'name=value' pairs, as in #<Qt::Color:0x0 #ff0000>
+					// There are no 'name=value' pairs, as in #<TQt::Color:0x0 #ff0000>
 					value = var_re.cap(2).latin1();
 				}
 			} else if (struct_re.search(var_re.cap(2)) != -1) {
@@ -84,7 +84,7 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
 				dataType = VALUE_TYPE;
 			}
 			
-			setItem(parent, varName, dataType, value);
+			setItem(tqparent, varName, dataType, value);
 			
 			pos  += var_re.matchedLength();
 			pos = var_re.search(buf, pos);
@@ -94,15 +94,15 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
 	}
 }
 
-void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
+void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf)
 {
 	DataType	dataType;
 	int			pos;
-	QString		varName;
-	QCString	value;
+	TQString		varName;
+	TQCString	value;
 	TQRegExp 	ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)");
     
-	switch (parent->dataType()) {
+	switch (tqparent->dataType()) {
     case REFERENCE_TYPE:
 	{
 		// Look for a reference type which has been printed via a 'pp' command, to
@@ -128,10 +128,10 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 				varName = ppvalue_re.cap(1);
 				
 				if (ppref_re.search(ppvalue_re.cap(2)) != -1) {
-					if (ppvalue_re.cap(2).contains("=") > 0) {
+					if (ppvalue_re.cap(2).tqcontains("=") > 0) {
 						value = (ppref_re.cap(1) + ">").latin1();
 					} else {
-						// There are no 'name=value' pairs, as in #<Qt::Color:0x0 #ff0000>
+						// There are no 'name=value' pairs, as in #<TQt::Color:0x0 #ff0000>
 						value = ppvalue_re.cap(2).latin1();
 					}
 				} else {
@@ -139,7 +139,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 				}
 				
 				dataType = determineType((char *) ppvalue_re.cap(2).latin1());
-				setItem(parent, varName, dataType, value);
+				setItem(tqparent, varName, dataType, value);
 				
 				pos += ppvalue_re.matchedLength();
 				pos = ppvalue_re.search(buf, pos);
@@ -170,7 +170,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 			}
 				
 			DataType dataType = determineType((char *) pparray_re.cap(2).latin1());
-			setItem(parent, varName, dataType, value);
+			setItem(tqparent, varName, dataType, value);
 				
 			pos += pparray_re.matchedLength();
 			pos = pparray_re.search(buf, pos);
@@ -193,7 +193,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 			varName = pphash_re.cap(1);
 			value = pphash_re.cap(2).latin1();
 	        DataType dataType = determineType(value.data());
-			setItem(parent, varName, dataType, value);
+			setItem(tqparent, varName, dataType, value);
 			
 			pos += pphash_re.matchedLength();
 			pos = pphash_re.search(buf, pos);
@@ -235,7 +235,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 				varName = ppvalue_re.cap(1);
 				value = ppvalue_re.cap(2).latin1();
 				dataType = determineType(value.data());
-				setItem(parent, varName, dataType, value);
+				setItem(tqparent, varName, dataType, value);
 				
 				pos += ppvalue_re.matchedLength();
 				pos = ppvalue_re.search(buf, pos);
@@ -259,7 +259,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 			varName = ppstring_re.cap(1);
 			value = ppstring_re.cap(2).latin1();
 	        DataType dataType = determineType(value.data());
-			setItem(parent, varName, dataType, value);
+			setItem(tqparent, varName, dataType, value);
 			
 			pos += ppstring_re.matchedLength();
 			pos = ppstring_re.search(buf, pos);
@@ -278,12 +278,12 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 
 // **************************************************************************
 
-void RDBParser::setItem(LazyFetchItem *parent, const TQString &varName,
+void RDBParser::setItem(LazyFetchItem *tqparent, const TQString &varName,
                         DataType dataType, const TQCString &value)
 {
-	VarItem *item = parent->findItem(varName);
+	VarItem *item = tqparent->findItem(varName);
     if (item == 0) {
-        item = new VarItem(parent, varName, dataType);
+        item = new VarItem(tqparent, varName, dataType);
     } else {
 		// The dataType of an item can change, so update it
 		item->setDataType(dataType);
@@ -319,11 +319,11 @@ DataType RDBParser::determineType(char *buf)
 	TQRegExp hash_re("(Hash \\(\\d+ element\\(s\\)\\))");
 	TQRegExp string_re("(String \\(length \\d+\\))");
 	
-	if (qstrncmp(buf, "#<struct", strlen("#<struct")) == 0) {
+	if (tqstrncmp(buf, "#<struct", strlen("#<struct")) == 0) {
 		return STRUCT_TYPE;
-	} else if (qstrncmp(buf, "#<Qt::Color:0x", strlen("#<Qt::Color:0x")) == 0) {
+	} else if (tqstrncmp(buf, "#<TQt::Color:0x", strlen("#<TQt::Color:0x")) == 0) {
 		return COLOR_TYPE;
-	} else if (qstrncmp(buf, "#<", strlen("#<")) == 0 && strstr(buf, "=") != 0) {
+	} else if (tqstrncmp(buf, "#<", strlen("#<")) == 0 && strstr(buf, "=") != 0) {
 		// An object instance reference is only expandable and a 'REFERENCE_TYPE'
 		// if it contains an '=' (ie it has at least one '@instance_variable=value').
 		// Otherwise, treat it as a 'VALUE_TYPE'.
@@ -334,7 +334,7 @@ DataType RDBParser::determineType(char *buf)
 		return HASH_TYPE;
 	} else if (string_re.search(buf) != -1) {
 		return STRING_TYPE;
-	} else if (qstrncmp(buf, "nil", strlen("nil")) == 0) {
+	} else if (tqstrncmp(buf, "nil", strlen("nil")) == 0) {
 //		return UNKNOWN_TYPE;
 		return VALUE_TYPE;
 	} else {
diff --git a/languages/ruby/debugger/rdbparser.h b/languages/ruby/debugger/rdbparser.h
index d57e25d7..2ee59b0a 100644
--- a/languages/ruby/debugger/rdbparser.h
+++ b/languages/ruby/debugger/rdbparser.h
@@ -29,10 +29,10 @@ namespace RDBDebugger
 
 namespace RDBParser
 {
-    void parseVariables(LazyFetchItem *parent, char *buf);
-    void parseExpandedVariable(VarItem *parent, char *buf);
+    void parseVariables(LazyFetchItem *tqparent, char *buf);
+    void parseExpandedVariable(VarItem *tqparent, char *buf);
     DataType determineType(char *buf);
-    void setItem(	LazyFetchItem *parent, const TQString &varName, 
+    void setItem(	LazyFetchItem *tqparent, const TQString &varName, 
 					DataType dataType, const TQCString &value );
 }
 
diff --git a/languages/ruby/debugger/rdbtable.cpp b/languages/ruby/debugger/rdbtable.cpp
index 31b7b6d2..429654d5 100644
--- a/languages/ruby/debugger/rdbtable.cpp
+++ b/languages/ruby/debugger/rdbtable.cpp
@@ -18,13 +18,13 @@
 
 namespace RDBDebugger {
 
-RDBTable::RDBTable(TQWidget *parent, const char *name)
- : TQTable(parent, name)
+RDBTable::RDBTable(TQWidget *tqparent, const char *name)
+ : TQTable(tqparent, name)
 {
 }
 
-RDBTable::RDBTable(int nr, int nc, TQWidget * parent, const char * name)
- : TQTable(nr, nc, parent, name)
+RDBTable::RDBTable(int nr, int nc, TQWidget * tqparent, const char * name)
+ : TQTable(nr, nc, tqparent, name)
 {
 }
 
diff --git a/languages/ruby/debugger/rdbtable.h b/languages/ruby/debugger/rdbtable.h
index 714605d0..5cb72e93 100644
--- a/languages/ruby/debugger/rdbtable.h
+++ b/languages/ruby/debugger/rdbtable.h
@@ -20,12 +20,13 @@
 
 namespace RDBDebugger {
 
-class RDBTable : public QTable
+class RDBTable : public TQTable
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    RDBTable(TQWidget *parent = 0, const char *name = 0);
-    RDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 );
+    RDBTable(TQWidget *tqparent = 0, const char *name = 0);
+    RDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 );
     ~RDBTable();
 
     virtual void keyPressEvent ( TQKeyEvent * e );
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index bfdb5bd3..7381ae2a 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -104,7 +104,7 @@ static int chownpty(int fd, int grant)
 
         //    { // signal from other child, behave like catchChild.
         //      // guess this gives quite some control chaos...
-        //      Shell* sh = shells.find(rc);
+        //      Shell* sh = shells.tqfind(rc);
         //      if (sh) { shells.remove(rc); sh->doneShell(w); }
         //      goto retry;
         //    }
@@ -305,7 +305,7 @@ bool STTY::findExternalTTY(const TQString &termApp)
         const char* prog      = appName.latin1();
         TQString script = TQString("tty>") + TQString(fifo) +
             TQString(";"                  // fifo name
-                    "trap \"\" INT QUIT TSTP;"	  // ignore various signals
+                    "trap \"\" INT TQUIT TSTP;"	  // ignore various signals
                     "exec<&-;exec>&-;"		        // close stdin and stdout
                     "while :;do sleep 3600;done");
         const char* scriptStr = script.latin1();
@@ -330,11 +330,11 @@ bool STTY::findExternalTTY(const TQString &termApp)
         ::exit(1);
     }
 
-    // parent process
+    // tqparent process
     if (pid <= 0)
         ::exit(1);
 
-    // Open the communication between us (the parent) and the
+    // Open the communication between us (the tqparent) and the
     // child (the process running on a tty console)
     fifo_fd = ::open(fifo, O_RDONLY);
     if (fifo_fd < 0)
diff --git a/languages/ruby/debugger/stty.h b/languages/ruby/debugger/stty.h
index 20aece2c..d49e79f8 100644
--- a/languages/ruby/debugger/stty.h
+++ b/languages/ruby/debugger/stty.h
@@ -33,9 +33,10 @@ class TQSocketNotifier;
 namespace RDBDebugger
 {
 
-class STTY : public QObject
+class STTY : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     STTY(bool ext=false, const TQString &termAppName=TQString());
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index fd323fd5..32b5d1ef 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -49,8 +49,8 @@
 namespace RDBDebugger
 {
 
-VariableWidget::VariableWidget(TQWidget *parent, const char *name)
-    : TQWidget(parent, name)
+VariableWidget::VariableWidget(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name)
 {
     varTree_ = new VariableTree(this);
     TQLabel *label = new TQLabel(i18n("E&xpression to watch:"), this);
@@ -81,8 +81,8 @@ VariableWidget::VariableWidget(TQWidget *parent, const char *name)
 void VariableWidget::setEnabled(bool bEnabled)
 {
     TQWidget::setEnabled(bEnabled);
-    if (bEnabled && parentWidget() != 0) {
-        varTree_->setColumnWidth(0, parentWidget()->width()/2);
+    if (bEnabled && tqparentWidget() != 0) {
+        varTree_->setColumnWidth(0, tqparentWidget()->width()/2);
 	}
 }
 // **************************************************************************
@@ -127,8 +127,8 @@ void VariableWidget::savePartialProjectSession(TQDomElement* el)
 // **************************************************************************
 // **************************************************************************
 
-VariableTree::VariableTree(VariableWidget *parent, const char *name)
-    : KListView(parent, name),
+VariableTree::VariableTree(VariableWidget *tqparent, const char *name)
+    : KListView(tqparent, name),
       TQToolTip( viewport() ),
       activationId_(0),
       currentThread_(-1),
@@ -187,7 +187,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 
     setSelected(item, true);    // Need to select this item.
 
-    if (item->parent() != 0) {
+    if (item->tqparent() != 0) {
         KPopupMenu popup(this);
         popup.insertTitle(item->text(VAR_NAME_COLUMN));
         int idRemoveWatch = -2;
@@ -202,11 +202,11 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 			emit removeWatchExpression(((WatchVarItem*)item)->displayId());
             delete item;
         } else if (res == idCopyToClipboard) {
-            QClipboard *qb = KApplication::clipboard();
+            TQClipboard *qb = KApplication::tqclipboard();
             TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " +
                             "\"" + item->text( VALUE_COLUMN ) + "\" }";
 
-            qb->setText( text, QClipboard::Clipboard );
+            qb->setText( text, TQClipboard::Clipboard );
         }
     }
 }
@@ -233,7 +233,7 @@ void VariableTree::slotPressed(TQListViewItem * item)
 	}
 	
 	while (item->rtti() == RTTI_VAR_ITEM) {
-		item = item->parent();
+		item = item->tqparent();
 	}
 	
 	if (	item->rtti() == RTTI_GLOBAL_ROOT
@@ -280,7 +280,7 @@ void VariableTree::prune()
 
 // **************************************************************************
 
-// The debugger has moved onto the next program pause, so invalidate 
+// The debugger has moved onto the next program pause, so tqinvalidate 
 // everything in the Variable Tree
 void VariableTree::nextActivationId() 
 { 
@@ -329,7 +329,7 @@ bool VariableTree::schedule()
 			
 			if (frame->needsVariables()) {
 				if (TQApplication::overrideCursor() == 0) {
-					TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor));
+					TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
 				}
 				
 				// Tell the controller to fetch the variable values
@@ -428,7 +428,7 @@ void VariableTree::maybeTip(const TQPoint &p)
 {
     VarItem * item = dynamic_cast<VarItem*>( itemAt(p) );
     if (item != 0) {
-        TQRect r = itemRect(item);
+        TQRect r = tqitemRect(item);
         if (r.isValid()) {
             tip(r, item->tipText());
 		}
@@ -440,8 +440,8 @@ void VariableTree::maybeTip(const TQPoint &p)
 // **************************************************************************
 // **************************************************************************
 
-LazyFetchItem::LazyFetchItem(VariableTree *parent)
-    : KListViewItem(parent),
+LazyFetchItem::LazyFetchItem(VariableTree *tqparent)
+    : KListViewItem(tqparent),
       activationId_(0),
 	  waitingForData_(false)
 {
@@ -450,8 +450,8 @@ LazyFetchItem::LazyFetchItem(VariableTree *parent)
 
 // **************************************************************************
 
-LazyFetchItem::LazyFetchItem(LazyFetchItem *parent)
-    : KListViewItem(parent),
+LazyFetchItem::LazyFetchItem(LazyFetchItem *tqparent)
+    : KListViewItem(tqparent),
       activationId_(0),
       waitingForData_(false)
 {
@@ -474,7 +474,7 @@ void LazyFetchItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 	}
 	
     // make toplevel item (watch and frame items) names bold
-    if (column == VAR_NAME_COLUMN && parent() == 0) {
+    if (column == VAR_NAME_COLUMN && tqparent() == 0) {
         TQFont f = p->font();
         f.setBold(true);
         p->setFont(f);
@@ -526,8 +526,8 @@ void LazyFetchItem::prune()
 // **************************************************************************
 // **************************************************************************
 
-VarItem::VarItem(LazyFetchItem *parent, const TQString &varName, DataType dataType)
-    : LazyFetchItem (parent),
+VarItem::VarItem(LazyFetchItem *tqparent, const TQString &varName, DataType dataType)
+    : LazyFetchItem (tqparent),
       cache_(TQCString()),
       dataType_(dataType),
       highlight_(false)
@@ -586,7 +586,7 @@ TQString VarItem::fullName() const
     TQString vPath("");
     const VarItem *item = this;
 
-	if (item->parent()->rtti() != RTTI_VAR_ITEM) {
+	if (item->tqparent()->rtti() != RTTI_VAR_ITEM) {
 		return itemName;
 	}
 
@@ -605,17 +605,17 @@ TQString VarItem::fullName() const
  				vPath.prepend(itemName + ".");
 			}
         }
-		item = (VarItem*) item->parent();
+		item = (VarItem*) item->tqparent();
     }
 
 	// Change 'self.@foobar' to '@foobar'
-	vPath.replace(TQRegExp("^self\\.@"), "@");
+	vPath.tqreplace(TQRegExp("^self\\.@"), "@");
 	
 	// Use instance_variable_get() to access any '@var's in the middle of a path	
 	TQRegExp re_instance_var("\\.(@[^\\[.]+)");
 	int pos = re_instance_var.search(vPath);	
 	while (pos != -1) {	
-		vPath.replace(	pos, 
+		vPath.tqreplace(	pos, 
 						re_instance_var.matchedLength(), 
 						TQString(".instance_variable_get(:") + re_instance_var.cap(1) + ")" );
 		pos = re_instance_var.search(vPath, pos);	
@@ -635,7 +635,7 @@ void VarItem::setText(int column, const TQString &data)
     }
 
     TQListViewItem::setText(column, data);
-    repaint();
+    tqrepaint();
 }
 
 // **************************************************************************
@@ -746,8 +746,8 @@ TQString VarItem::tipText() const
 // **************************************************************************
 // **************************************************************************
 
-VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo)
-    : LazyFetchItem(parent),
+VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo)
+    : LazyFetchItem(tqparent),
       needsVariables_(true),
       frameNo_(frameNo),
       threadNo_(threadNo),
@@ -816,7 +816,7 @@ void VarFrameRoot::setActivationId()
 	
 bool VarFrameRoot::needsVariables() const 
 { 
-	return (	text(VAR_NAME_COLUMN).contains("try_initialize") == 0 
+	return (	text(VAR_NAME_COLUMN).tqcontains("try_initialize") == 0 
 				&& isOpen() 
 				&& !isWaitingForData() 
 				&& needsVariables_ ); 
@@ -828,8 +828,8 @@ bool VarFrameRoot::needsVariables() const
 // **************************************************************************
 
 
-GlobalRoot::GlobalRoot(VariableTree *parent)
-    : LazyFetchItem(parent)
+GlobalRoot::GlobalRoot(VariableTree *tqparent)
+    : LazyFetchItem(tqparent)
 {
     setText(0, i18n("Global"));
     setExpandable(true);
@@ -872,8 +872,8 @@ void GlobalRoot::setOpen(bool open)
 // **************************************************************************
 // **************************************************************************
 
-WatchVarItem::WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId )
-    : VarItem(parent, varName, dataType),
+WatchVarItem::WatchVarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType, int displayId )
+    : VarItem(tqparent, varName, dataType),
 	displayId_(displayId)
 {
 }
@@ -903,8 +903,8 @@ int WatchVarItem::displayId()
 // **************************************************************************
 // **************************************************************************
 
-WatchRoot::WatchRoot(VariableTree *parent)
-    : LazyFetchItem(parent)
+WatchRoot::WatchRoot(VariableTree *tqparent)
+    : LazyFetchItem(tqparent)
 {
     setText(VAR_NAME_COLUMN, i18n("Watch"));
     setOpen(true);
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index 4104ae93..830acf64 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -60,12 +60,13 @@ enum DataType {
 	STRING_TYPE
 };		   
 
-class VariableWidget : public QWidget
+class VariableWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    VariableWidget( TQWidget *parent=0, const char *name=0 );
+    VariableWidget( TQWidget *tqparent=0, const char *name=0 );
 
     VariableTree *varTree() const
     { return varTree_; }
@@ -91,14 +92,15 @@ private:
 /***************************************************************************/
 /***************************************************************************/
 
-class VariableTree : public KListView, public QToolTip
+class VariableTree : public KListView, public TQToolTip
 {
     Q_OBJECT
+  TQ_OBJECT
 //we need this to be able to emit expandItem() from within LazyFetchItem
 friend class LazyFetchItem;
 
 public:
-	VariableTree( VariableWidget *parent, const char *name=0 );
+	VariableTree( VariableWidget *tqparent, const char *name=0 );
     virtual ~VariableTree();
 	
 	// Clear everything but the Watch frame
@@ -170,8 +172,8 @@ private:
 class LazyFetchItem : public KListViewItem
 {
 public:
-    LazyFetchItem(VariableTree *parent);
-    LazyFetchItem(LazyFetchItem *parent);
+    LazyFetchItem(VariableTree *tqparent);
+    LazyFetchItem(LazyFetchItem *tqparent);
 
     virtual ~LazyFetchItem();
 
@@ -204,7 +206,7 @@ private:
 class VarItem : public LazyFetchItem
 {
 public:
-    VarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType );
+    VarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType );
 
     virtual ~VarItem();
 	
@@ -247,7 +249,7 @@ private:
 class WatchVarItem : public VarItem
 {
 public:
-    WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId = -1);
+    WatchVarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType, int displayId = -1);
 
     virtual ~WatchVarItem();
 	
@@ -268,13 +270,13 @@ private:
 class VarFrameRoot : public LazyFetchItem
 {
 public:
-    VarFrameRoot(VariableTree *parent, int frame, int thread);
+    VarFrameRoot(VariableTree *tqparent, int frame, int thread);
     virtual ~VarFrameRoot();
 	
 	virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; }
 	
 	virtual TQString key(int column, bool /*ascending*/) const {
-		return TQString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column));
+		return TQString("%1%2").tqarg(RTTI_VAR_FRAME_ROOT).tqarg(text(column));
 	}
 
     void addLocals(char *variables);
@@ -303,13 +305,13 @@ private:
 class WatchRoot : public LazyFetchItem
 {
 public:
-    WatchRoot(VariableTree * parent);
+    WatchRoot(VariableTree * tqparent);
     virtual ~WatchRoot();
 	
 	virtual int rtti() const { return RTTI_WATCH_ROOT; }
 	
 	virtual TQString key(int column, bool /*ascending*/) const {
-		return TQString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column));
+		return TQString("%1%2").tqarg(RTTI_WATCH_ROOT).tqarg(text(column));
 	}
 
 	void setWatchExpression(char * buf, char * expr);
@@ -326,13 +328,13 @@ public:
 class GlobalRoot : public LazyFetchItem
 {
 public:
-    GlobalRoot(VariableTree * parent);
+    GlobalRoot(VariableTree * tqparent);
     virtual ~GlobalRoot();
 	
 	virtual int rtti() const { return RTTI_GLOBAL_ROOT; }
 	
 	virtual TQString key(int column, bool /*ascending*/) const {
-		return TQString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column));
+		return TQString("%1%2").tqarg(RTTI_GLOBAL_ROOT).tqarg(text(column));
 	}
 	
     void setOpen(bool open);
diff --git a/languages/ruby/doc/ruby.toc b/languages/ruby/doc/ruby.toc
index bce60158..e732ae4d 100644
--- a/languages/ruby/doc/ruby.toc
+++ b/languages/ruby/doc/ruby.toc
@@ -448,8 +448,8 @@
 <entry name="fileno (IO)" url="html/ref_c_io.html#IO.fileno"/>
 <entry name="FileTest" url="html/ref_m_filetest.html"/>
 <entry name="fill (Array)" url="html/ref_c_array.html#Array.fill"/>
-<entry name="find" url="html/lib_standard.html#Find.find"/>
-<entry name="find (Enumerable)" url="html/ref_m_enumerable.html#Enumerable.find"/>
+<entry name="tqfind" url="html/lib_standard.html#Find.tqfind"/>
+<entry name="tqfind (Enumerable)" url="html/ref_m_enumerable.html#Enumerable.tqfind"/>
 <entry name="find_all (Enumerable)" url="html/ref_m_enumerable.html#Enumerable.find_all"/>
 <entry name="find_library (mkmf)" url="html/lib_standard.html#mkmf.find_library"/>
 <entry name="finish (Net::POP)" url="html/lib_network.html#Net::POP.finish"/>
@@ -970,9 +970,9 @@
 <entry name="rename (File)" url="html/ref_c_file.html#File.rename"/>
 <entry name="reopen (IO)" url="html/ref_c_io.html#IO.reopen"/>
 <entry name="Repetition (stdtypes)" url="html/tut_stdtypes.html#UH"/>
-<entry name="replace (Array)" url="html/ref_c_array.html#Array.replace"/>
-<entry name="replace (Hash)" url="html/ref_c_hash.html#Hash.replace"/>
-<entry name="replace (String)" url="html/ref_c_string.html#String.replace"/>
+<entry name="tqreplace (Array)" url="html/ref_c_array.html#Array.tqreplace"/>
+<entry name="tqreplace (Hash)" url="html/ref_c_hash.html#Hash.tqreplace"/>
+<entry name="tqreplace (String)" url="html/ref_c_string.html#String.tqreplace"/>
 <entry name="require (Kernel)" url="html/ref_m_kernel.html#Kernel.require"/>
 <entry name="REQUIRED_ARGUMENT (GetoptLong)" url="html/lib_standard.html#GetoptLong.REQUIRED_ARGUMENT"/>
 <entry name="Requirements for a Hash Key (language)" url="html/language.html#UH"/>
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index 11244f8f..068d983a 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -39,13 +39,13 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerRubyIntegration::QtDesignerRubyIntegration(KDevLanguageSupport *part,
+TQtDesignerRubyIntegration::TQtDesignerRubyIntegration(KDevLanguageSupport *part,
     ImplementationWidget *impl)
-    :QtDesignerIntegration(part, impl, false, 0)
+    :TQtDesignerIntegration(part, impl, false, 0)
 {
 }
 
-void QtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
+void TQtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
 {
     m_part->partController()->editDocument( KURL( klass->fileName() ) );
     KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() );
@@ -61,7 +61,7 @@ void QtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function
     klass->getStartPosition( &line, &column );
 
     // compute the insertion point
-    QPair<int,int> point;
+    TQPair<int,int> point;
     point.first = line + 1;
     point.second = column;
 
diff --git a/languages/ruby/qtdesignerrubyintegration.h b/languages/ruby/qtdesignerrubyintegration.h
index 86c09ea5..b2f8d4ef 100644
--- a/languages/ruby/qtdesignerrubyintegration.h
+++ b/languages/ruby/qtdesignerrubyintegration.h
@@ -17,16 +17,17 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef QTDESIGNERRUBYINTEGRATION_H
-#define QTDESIGNERRUBYINTEGRATION_H
+#ifndef TQTDESIGNERRUBYINTEGRATION_H
+#define TQTDESIGNERRUBYINTEGRATION_H
 
 #include <qtdesignerintegration.h>
 
-class QtDesignerRubyIntegration : public QtDesignerIntegration
+class TQtDesignerRubyIntegration : public TQtDesignerIntegration
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
+    TQtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
 
 protected:
     void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
diff --git a/languages/ruby/rubyconfigwidget.cpp b/languages/ruby/rubyconfigwidget.cpp
index a7ec7a7a..874fe680 100644
--- a/languages/ruby/rubyconfigwidget.cpp
+++ b/languages/ruby/rubyconfigwidget.cpp
@@ -11,8 +11,8 @@
 #include <kurlcompletion.h>
 #include <kdebug.h>
 
-RubyConfigWidget::RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent, const char* name)
-: RubyConfigWidgetBase(parent,name), dom (projectDom) {
+RubyConfigWidget::RubyConfigWidget(TQDomDocument &projectDom, TQWidget* tqparent, const char* name)
+: RubyConfigWidgetBase(tqparent,name), dom (projectDom) {
     kdDebug (9019) << "Creating RubyConfigWidget" << endl;
     interpreterEdit->setText(DomUtil::readEntry(dom, "/kdevrubysupport/run/interpreter"));
     if (interpreterEdit->text().isEmpty()) {
diff --git a/languages/ruby/rubyconfigwidget.h b/languages/ruby/rubyconfigwidget.h
index 2effa213..f4f367d1 100644
--- a/languages/ruby/rubyconfigwidget.h
+++ b/languages/ruby/rubyconfigwidget.h
@@ -9,8 +9,9 @@ class TQDomDocument;
 class RubyConfigWidget : public RubyConfigWidgetBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent = 0, const char* name = 0);
+  RubyConfigWidget(TQDomDocument &projectDom, TQWidget* tqparent = 0, const char* name = 0);
 
 public slots:
   void accept();
diff --git a/languages/ruby/rubyconfigwidgetbase.ui b/languages/ruby/rubyconfigwidgetbase.ui
index 64ae3e1c..93d020aa 100644
--- a/languages/ruby/rubyconfigwidgetbase.ui
+++ b/languages/ruby/rubyconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>RubyConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>RubyConfigWidgetBase</cstring>
     </property>
@@ -16,9 +16,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -34,7 +34,7 @@
                         <cstring>mainProgramEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -62,7 +62,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <cstring>interpreterEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel1_2_3_2</cstring>
                     </property>
@@ -84,7 +84,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <string>These are the arguments passed to the Ruby interpreter</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -106,7 +106,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <string>This is the path (or just name, if in $PATH) to the Ruby interpreter. Defaults to "ruby"</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel1_2_3</cstring>
                     </property>
@@ -133,7 +133,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <cstring>shellEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>textLabel1_3</cstring>
                     </property>
@@ -158,14 +158,14 @@ def cd(dir) Dir.chdir dir end</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>runRadioBox</cstring>
             </property>
@@ -184,7 +184,7 @@ def cd(dir) Dir.chdir dir end</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>mainProgramRadio</cstring>
                     </property>
@@ -192,7 +192,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <string>Main pr&amp;ogram</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>selectedWindowRadio</cstring>
                     </property>
@@ -202,7 +202,7 @@ def cd(dir) Dir.chdir dir end</string>
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>terminalCheckbox</cstring>
             </property>
@@ -213,7 +213,7 @@ def cd(dir) Dir.chdir dir end</string>
                 <string>Check this if you want your applications to be opened in terminal window.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>enableFloatingToolBarBox</cstring>
             </property>
@@ -224,7 +224,7 @@ def cd(dir) Dir.chdir dir end</string>
                 <string>Check this if you want to control the debugger via a floating toolbar.</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>showConstants</cstring>
             </property>
@@ -235,7 +235,7 @@ def cd(dir) Dir.chdir dir end</string>
                 <string>Check this if you want the debugger to show constants (with many constants this may be slow).</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>traceIntoRuby</cstring>
             </property>
@@ -246,7 +246,7 @@ def cd(dir) Dir.chdir dir end</string>
                 <string>Trace through the Ruby code installed under sitedir in the debugger</string>
             </property>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>characterCodingRadioBox</cstring>
             </property>
@@ -265,7 +265,7 @@ def cd(dir) Dir.chdir dir end</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>asciiOption</cstring>
                     </property>
@@ -276,7 +276,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <number>0</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>eucOption</cstring>
                     </property>
@@ -287,7 +287,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>sjisOption</cstring>
                     </property>
@@ -298,7 +298,7 @@ def cd(dir) Dir.chdir dir end</string>
                         <number>2</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>utf8Option</cstring>
                     </property>
@@ -321,7 +321,7 @@ def cd(dir) Dir.chdir dir end</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -349,8 +349,8 @@ def cd(dir) Dir.chdir dir end</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp
index b1371a24..3ddaec11 100644
--- a/languages/ruby/rubyimplementationwidget.cpp
+++ b/languages/ruby/rubyimplementationwidget.cpp
@@ -34,8 +34,8 @@
 #include <kdevproject.h>
 
 RubyImplementationWidget::RubyImplementationWidget(KDevLanguageSupport* part, 
-    TQWidget* parent, const char* name, bool modal)
-    :ImplementationWidget(part, parent, name, modal)
+    TQWidget* tqparent, const char* name, bool modal)
+    :ImplementationWidget(part, tqparent, name, modal)
 {
 }
 
@@ -44,9 +44,9 @@ TQStringList RubyImplementationWidget::createClassFiles()
     TQString template_rb = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n    def initialize(*k)\n        super(*k)\n    end\n\nend\n";
 
     TQFileInfo formInfo(m_formName);
-    template_rb.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb");
-    template_rb.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text());
-    template_rb.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName);
+    template_rb.tqreplace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb");
+    template_rb.tqreplace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text());
+    template_rb.tqreplace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName);
     
     template_rb = FileTemplate::read(m_part, "rb") + template_rb;
 
diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h
index 4393b94b..5dfaf4a4 100644
--- a/languages/ruby/rubyimplementationwidget.h
+++ b/languages/ruby/rubyimplementationwidget.h
@@ -24,8 +24,9 @@
 
 class RubyImplementationWidget : public ImplementationWidget {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, 
+    RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* tqparent = 0, 
         const char* name = 0, bool modal = true);
 
     virtual TQStringList createClassFiles();
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 411f06ff..4fe000a5 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -41,8 +41,8 @@ typedef KDevGenericFactory<RubySupportPart> RubySupportFactory;
 static const KDevPluginInfo data("kdevrubysupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) )
 
-RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
+RubySupportPart::RubySupportPart(TQObject *tqparent, const char *name, const TQStringList& )
+  : KDevLanguageSupport (&data, tqparent, name ? name : "RubySupportPart" )
 {
   setInstance(RubySupportFactory::instance());
   setXMLFile("kdevrubysupport.rc");
@@ -205,7 +205,7 @@ void RubySupportPart::savedFile(const KURL &fileName)
 {
   kdDebug() << "savedFile()" << endl;
 
-  if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) {
+  if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) {
     maybeParse(fileName.path());
     emit addedSourceInfo( fileName.path() );
   }
@@ -261,11 +261,11 @@ void RubySupportPart::parse(const TQString &fileName)
         m_file->addClass( lastClass );
 	  }
 
-      TQString parent = classre.cap(5);
-      if (!parent.isEmpty())
+      TQString tqparent = classre.cap(5);
+      if (!tqparent.isEmpty())
       {
-        kdDebug() << "Add parent " << parent << endl;
-        lastClass->addBaseClass( parent );
+        kdDebug() << "Add tqparent " << tqparent << endl;
+        lastClass->addBaseClass( tqparent );
       }
 
 	  lastAccess = CodeModelItem::Public;
@@ -532,12 +532,12 @@ void RubySupportPart::slotRun ()
             appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
     } else {
         TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
-                          .arg(interpreter())
-                          .arg(characterCoding())
-                          .arg(runDirectory())
-                          .arg(program.dirPath())
-                          .arg(program.fileName())
-                          .arg(programArgs());
+                          .tqarg(interpreter())
+                          .tqarg(characterCoding())
+                          .tqarg(runDirectory())
+                          .tqarg(program.dirPath())
+                          .tqarg(program.fileName())
+                          .tqarg(programArgs());
         startApplication(cmd);
     }
 }
@@ -632,12 +632,12 @@ KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT
     KDevDesignerIntegration *des = 0;
     switch (type)
     {
-        case KInterfaceDesigner::QtDesigner:
+        case KInterfaceDesigner::TQtDesigner:
             des = m_designers[type];
             if (des == 0)
             {
                 RubyImplementationWidget *impl = new RubyImplementationWidget(this);
-                des = new QtDesignerRubyIntegration(this, impl);
+                des = new TQtDesignerRubyIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
                     "kdevrubysupport/designerintegration");
                 m_designers[type] = des;
@@ -669,7 +669,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context
         {
             m_contextFileName = url.fileName();
             int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass()));
-            popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
+            popup->tqsetWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
         }
     }
 }
@@ -679,7 +679,7 @@ void RubySupportPart::slotCreateSubclass()
     TQFileInfo fi(m_contextFileName);
     if (fi.extension(false) != "ui")
         return;
-    QtDesignerRubyIntegration *des = dynamic_cast<QtDesignerRubyIntegration*>(designer(KInterfaceDesigner::QtDesigner));
+    TQtDesignerRubyIntegration *des = dynamic_cast<TQtDesignerRubyIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
     if (des)
         des->selectImplementation(m_contextFileName);
 }
@@ -715,7 +715,7 @@ void RubySupportPart::slotSwitchToController()
     }
     else if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb")
     {
-        //this is a view, we need to find the directory of this view and try to find
+        //this is a view, we need to find the directory of this view and try to tqfind
         //the controller basing on the directory information
         switchTo = file.dir().dirName();
     }
@@ -896,12 +896,12 @@ void RubySupportPart::slotRunTestUnderCursor()
 
     TQFileInfo program(prog);
     TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
-                          .arg(interpreter())
-                          .arg(characterCoding())
-                          .arg(runDirectory())
-                          .arg(program.dirPath())
-                          .arg(program.fileName())
-                          .arg(" -n " + fun->name());
+                          .tqarg(interpreter())
+                          .tqarg(characterCoding())
+                          .tqarg(runDirectory())
+                          .tqarg(program.dirPath())
+                          .tqarg(program.fileName())
+                          .tqarg(" -n " + fun->name());
     startApplication(cmd);
 }
 
diff --git a/languages/ruby/rubysupport_part.h b/languages/ruby/rubysupport_part.h
index f55ecc4e..2fbfed42 100644
--- a/languages/ruby/rubysupport_part.h
+++ b/languages/ruby/rubysupport_part.h
@@ -18,10 +18,11 @@ class KDevShellWidget;
 class RubySupportPart : public KDevLanguageSupport
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  RubySupportPart(TQObject *parent, const char *name, const TQStringList &);
+  RubySupportPart(TQObject *tqparent, const char *name, const TQStringList &);
   virtual ~RubySupportPart();
 
   virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
diff --git a/languages/sql/README.dox b/languages/sql/README.dox
index bfa52e2e..e44edb43 100644
--- a/languages/sql/README.dox
+++ b/languages/sql/README.dox
@@ -6,7 +6,7 @@ This is a SQL support plugin
 \maintainer <a href="mailto:harry AT kdevelop.org">Harald Fernengel</a>
 
 \feature SQL language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index df8ba309..8d533a9e 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -25,16 +25,14 @@
 #include "kdevlanguagesupport.h"
 #include "sqlsupport_part.h"
 
-SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, 
+SqlListAction::SqlListAction(STQLSupportPart *part, const TQString &text, 
 				 const KShortcut& cut,
                                  const TQObject *receiver, const char *slot,
-                                 KActionCollection *parent, const char *name)
-    : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part)
+                                 KActionCollection *tqparent, const char *name)
+    : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, tqparent, name), m_part(part)
 {
-#if (QT_VERSION >= 0x030100)
     m_combo->setEditable( false );
     m_combo->setAutoCompletion( true );
-#endif
 
     m_combo->setMinimumWidth( 200 );
     m_combo->setMaximumWidth( 400 );
@@ -51,7 +49,7 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text,
 
 void SqlListAction::setCurrentConnectionName(const TQString &name)
 {
-    int idx = m_part->connections().findIndex( name );
+    int idx = m_part->connections().tqfindIndex( name );
     if ( idx < 0 )
         m_combo->setCurrentItem( 0 );
     else
@@ -62,7 +60,7 @@ void SqlListAction::setCurrentConnectionName(const TQString &name)
 TQString SqlListAction::currentConnectionName() const
 {
     if ( m_combo->currentItem() <= 0 )
-        return TQString::null;
+        return TQString();
     return m_part->connections()[ m_combo->currentItem() - 1 ];
 }
 
@@ -88,7 +86,7 @@ void SqlListAction::refresh()
         TQSqlDatabase* db = TQSqlDatabase::database( (*it), false );
         if ( !db ) {
             kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl;
-            m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").arg( *it ) );
+            m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").tqarg( *it ) );
             continue;
         }
         cName = db->driverName();
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index 8cc7b5df..ff71ae54 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -9,23 +9,24 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _SQLACTION_H_
-#define _SQLACTION_H_
+#ifndef _STQLACTION_H_
+#define _STQLACTION_H_
 
 #include <kdeversion.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
-class SQLSupportPart;
+class STQLSupportPart;
 class KComboBox;
 
 class SqlListAction : public KWidgetAction
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut,
+    SqlListAction( STQLSupportPart *part, const TQString &text, const KShortcut& cut,
                      const TQObject *receiver, const char *slot,
-                     KActionCollection *parent, const char *name );
+                     KActionCollection *tqparent, const char *name );
     void setCurrentConnectionName(const TQString &name);
     TQString currentConnectionName() const;
     void refresh();
@@ -34,7 +35,7 @@ private slots:
     void activated(int);
 
 private:
-    SQLSupportPart *m_part;
+    STQLSupportPart *m_part;
     KComboBox* m_combo;
 };
 
diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui
index e85b09d9..98be3606 100644
--- a/languages/sql/sqlconfigwidget.ui
+++ b/languages/sql/sqlconfigwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>SqlConfigWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SqlConfigWidget</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTable">
+        <widget class="TQTable">
             <column>
                 <property name="text">
                     <string>Plugin</string>
@@ -78,7 +78,7 @@
                 <enum>SingleRow</enum>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -86,9 +86,9 @@
                 <string>&lt;i&gt;Warning:&lt;/i&gt; password will be saved with weak encryption.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -161,27 +161,27 @@
     <include location="local" impldecl="in implementation">sqlconfigwidget.ui.h</include>
 </includes>
 <forwards>
-    <forward>class QDomDocument;</forward>
+    <forward>class TQDomDocument;</forward>
 </forwards>
 <variables>
-    <variable access="private">QDomDocument* doc;</variable>
+    <variable access="private">TQDomDocument* doc;</variable>
     <variable access="private">bool changed;</variable>
 </variables>
-<signals>
+<Q_SIGNALS>
     <signal>newConfigSaved()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>valueChanged( int, int )</slot>
     <slot>removeDb()</slot>
     <slot>updateButtons()</slot>
     <slot>testDb()</slot>
     <slot>accept()</slot>
-    <slot>setProjectDom( QDomDocument * doc )</slot>
+    <slot>setProjectDom( TQDomDocument * doc )</slot>
     <slot>loadConfig()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index b7725a49..877c1569 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
@@ -22,10 +22,10 @@
 #include "sqlsupport_part.h"
 
 // displays a ComboBox on edit to let the user choose the plugin
-class PluginTableItem: public QTableItem
+class PluginTableItem: public TQTableItem
 {
 public:
-    PluginTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {}
+    PluginTableItem( TQTable* table, const TQString& text = TQString() ): TQTableItem( table, TQTableItem::OnTyping, text ) {}
 
     virtual TQWidget* createEditor() const
     {
@@ -46,10 +46,10 @@ public:
 };
 
 // uses a spinbox to let the user choose the port
-class PortTableItem: public QTableItem
+class PortTableItem: public TQTableItem
 {
 public:
-    PortTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {}
+    PortTableItem( TQTable* table, const TQString& text = TQString() ): TQTableItem( table, TQTableItem::OnTyping, text ) {}
 
     virtual TQWidget* createEditor() const
     {
@@ -70,10 +70,10 @@ public:
 };
 
 // uses a spinbox to let the user choose the port
-class PasswordTableItem: public QTableItem
+class PasswordTableItem: public TQTableItem
 {
 public:
-    PasswordTableItem( TQTable* table, const TQString& text = TQString::null ): TQTableItem( table, TQTableItem::OnTyping, text ) {}
+    PasswordTableItem( TQTable* table, const TQString& text = TQString() ): TQTableItem( table, TQTableItem::OnTyping, text ) {}
 
     virtual TQWidget* createEditor() const
     {
@@ -203,7 +203,7 @@ void SqlConfigWidget::accept()
 	db << dbTable->text( i, 0 ) << dbTable->text( i, 1 )
 		<< dbTable->text( i, 2 ) << dbTable->text( i, 3 )
 		<< dbTable->text( i, 4 )
-		<< SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
+		<< STQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
 	
 	DomUtil::writeListEntry( *doc, 
 				 "/kdevsqlsupport/servers/server" + TQString::number( i ), 
@@ -235,7 +235,7 @@ void SqlConfigWidget::loadConfig()
         int row = dbTable->numRows() - 2;
         for ( int ii = 0; ii < 6; ii++ )
             dbTable->setText( row, ii, db[ii] );
-        ((PasswordTableItem*)dbTable->item( row, 5 ))->password = SQLSupportPart::cryptStr( db[5] );
+        ((PasswordTableItem*)dbTable->item( row, 5 ))->password = STQLSupportPart::cryptStr( db[5] );
 
         i++;
     }
diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp
index f7d84fde..73228dd7 100644
--- a/languages/sql/sqloutputwidget.cpp
+++ b/languages/sql/sqloutputwidget.cpp
@@ -24,11 +24,11 @@
 
 #include "sqloutputwidget.h"
 
-class QCustomSqlCursor: public QSqlCursor
+class TQCustomSqlCursor: public TQSqlCursor
 {
 public:
-    QCustomSqlCursor( const TQString & query = TQString::null, bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) :
-                TQSqlCursor( TQString::null, autopopulate, db )
+    TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) :
+                TQSqlCursor( TQString(), autopopulate, db )
     {
         exec( query );
         if ( isSelect() && autopopulate ) {
@@ -39,23 +39,23 @@ public:
         }
         setMode( TQSqlCursor::ReadOnly );
     }
-    QCustomSqlCursor( const QCustomSqlCursor & other ): TQSqlCursor( other ) {}
+    TQCustomSqlCursor( const TQCustomSqlCursor & other ): TQSqlCursor( other ) {}
     bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() )
         { return exec( lastQuery() ); }
     TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const
         { return TQSqlIndex(); }
-    int insert( bool /*invalidate*/ = TRUE )
+    int insert( bool /*tqinvalidate*/ = TRUE )
         { return FALSE; }
-    int update( bool /*invalidate*/ = TRUE )
+    int update( bool /*tqinvalidate*/ = TRUE )
         { return FALSE; }
-    int del( bool /*invalidate*/ = TRUE )
+    int del( bool /*tqinvalidate*/ = TRUE )
         { return FALSE; }
     void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {}
 };
 
 
-SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) :
-    TQWidget( parent, name )
+SqlOutputWidget::SqlOutputWidget ( TQWidget* tqparent, const char* name ) :
+    TQWidget( tqparent, name )
 {
     m_stack = new TQWidgetStack( this );
     m_table = new TQDataTable( this );
@@ -67,8 +67,8 @@ SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) :
     m_stack->addWidget( m_textEdit );
     m_stack->addWidget( m_table );
 
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    layout->addWidget( m_stack );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_stack );
 }
 
 SqlOutputWidget::~SqlOutputWidget()
@@ -78,7 +78,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString&
 {
     TQSqlDatabase* db = TQSqlDatabase::database( connectionName, true );
     if ( !db ) {
-        showError( i18n("No such connection: %1").arg( connectionName ) );
+        showError( i18n("No such connection: %1").tqarg( connectionName ) );
         return;
     }
     if ( !db->isOpen() ) {
@@ -86,7 +86,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString&
         return;
     }
 
-    TQSqlCursor* cur = new QCustomSqlCursor( query, true, db );
+    TQSqlCursor* cur = new TQCustomSqlCursor( query, true, db );
     if ( !cur->isActive() ) {
         showError( cur->lastError() );
     } else if ( cur->isSelect() ) {
@@ -101,7 +101,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString&
 void SqlOutputWidget::showSuccess( int rowsAffected )
 {
     m_textEdit->clear();
-    m_textEdit->setText( i18n("Query successful, number of rows affected: %1").arg( rowsAffected ) );
+    m_textEdit->setText( i18n("Query successful, number of rows affected: %1").tqarg( rowsAffected ) );
     m_stack->raiseWidget( m_textEdit );
 }
 
diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h
index 126963a2..c4a58ddf 100644
--- a/languages/sql/sqloutputwidget.h
+++ b/languages/sql/sqloutputwidget.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _SQLOUTPUTWIDGET_H_
-#define _SQLOUTPUTWIDGET_H_
+#ifndef _STQLOUTPUTWIDGET_H_
+#define _STQLOUTPUTWIDGET_H_
 
 #include <tqwidget.h>
 
@@ -19,12 +19,13 @@ class TQDataTable;
 class TQTextEdit;
 class TQSqlError;
 
-class SqlOutputWidget : public QWidget
+class SqlOutputWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SqlOutputWidget( TQWidget* parent = 0, const char* name = 0 );
+    SqlOutputWidget( TQWidget* tqparent = 0, const char* name = 0 );
     virtual ~SqlOutputWidget();
 
 public:
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 78c1c1f2..c31a4499 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -29,14 +29,14 @@
 #include "sqloutputwidget.h"
 #include "domutil.h"
 
-typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory;
+typedef KDevGenericFactory<STQLSupportPart> STQLSupportFactory;
 static const KDevPluginInfo data("kdevsqlsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, STQLSupportFactory( data ) )
 
-SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& )
-        : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
+STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& )
+        : KDevLanguageSupport ( &data, tqparent, name ? name : "STQLSupportPart" )
 {
-    setInstance( SQLSupportFactory::instance() );
+    setInstance( STQLSupportFactory::instance() );
     setXMLFile( "kdevsqlsupport.rc" );
 
     KAction *action;
@@ -46,7 +46,7 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri
 
     dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" );
 
-    kdDebug( 9000 ) << "Creating SQLSupportPart" << endl;
+    kdDebug( 9000 ) << "Creating STQLSupportPart" << endl;
 
     connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ),
              this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
@@ -61,30 +61,30 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri
 }
 
 
-SQLSupportPart::~SQLSupportPart()
+STQLSupportPart::~STQLSupportPart()
 {
     mainWindow()->removeView(m_widget);
     delete m_widget;
 }
 
-TQString SQLSupportPart::cryptStr(const TQString& aStr)
+TQString STQLSupportPart::cryptStr(const TQString& aStr)
 {
     TQString result;
     for (unsigned int i = 0; i < aStr.length(); i++)
-	result += (aStr[i].unicode() < 0x20) ? aStr[i] :
-		  TQChar(0x1001F - aStr[i].unicode());
+	result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
+		  TQChar(0x1001F - aStr[i].tqunicode());
     return result;
 }
 
-void SQLSupportPart::activeConnectionChanged()
+void STQLSupportPart::activeConnectionChanged()
 {
     updateCatalog();
 }
 
-void SQLSupportPart::clearConfig()
+void STQLSupportPart::clearConfig()
 {
     for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) {
-        if ( TQSqlDatabase::contains( *it ) ) {
+        if ( TQSqlDatabase::tqcontains( *it ) ) {
             TQSqlDatabase::database( *it, false )->close();
             TQSqlDatabase::removeDatabase( *it );
         } else {
@@ -96,7 +96,7 @@ void SQLSupportPart::clearConfig()
     dbAction->refresh();
 }
 
-void SQLSupportPart::loadConfig()
+void STQLSupportPart::loadConfig()
 {
     clearConfig();
 
@@ -110,10 +110,10 @@ void SQLSupportPart::loadConfig()
         if ( (int)sdb.size() < 6 )
             break;
 
-        conName = "KDEVSQLSUPPORT_";
+        conName = "KDEVSTQLSUPPORT_";
         conName += TQString::number( i );
         conNames << conName;
-	TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).arg( i ) );
+	TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSTQLSUPPORT_%1" ).tqarg( i ) );
         db->setDatabaseName( sdb[1] );
         db->setHostName( sdb[2] );
         bool ok;
@@ -130,7 +130,7 @@ void SQLSupportPart::loadConfig()
     dbAction->refresh();
 }
 
-void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
+void STQLSupportPart::projectConfigWidget( KDialogBase *dlg )
 {
     TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) );
     SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" );
@@ -140,7 +140,7 @@ void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
     connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) );
 }
 
-void SQLSupportPart::projectOpened()
+void STQLSupportPart::projectOpened()
 {
     connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
              this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) );
@@ -155,12 +155,12 @@ void SQLSupportPart::projectOpened()
 }
 
 
-void SQLSupportPart::projectClosed()
+void STQLSupportPart::projectClosed()
 {
     clearConfig();
 }
 
-void SQLSupportPart::slotRun ()
+void STQLSupportPart::slotRun ()
 {
     TQString cName = dbAction->currentConnectionName();
     if ( cName.isEmpty() ) {
@@ -183,20 +183,20 @@ static TQString dbCaption(const TQSqlDatabase* db)
     if (!db)
         return res;
     res = db->driverName();
-    res += TQString::fromLatin1("@");
+    res += TQString::tqfromLatin1("@");
     res += db->hostName();
     if (db->port() >= 0)
-        res += TQString::fromLatin1(":") + TQString::number(db->port());
+        res += TQString::tqfromLatin1(":") + TQString::number(db->port());
     return res;
 }
 #endif
 
-void SQLSupportPart::parse()
+void STQLSupportPart::parse()
 {
     // @todo
 }
 
-void SQLSupportPart::updateCatalog()
+void STQLSupportPart::updateCatalog()
 {
     if (!project() || !dbAction)
         return;
@@ -236,7 +236,7 @@ void SQLSupportPart::updateCatalog()
     emit updatedSourceInfo();
 }
 
-void SQLSupportPart::addedFilesToProject( const TQStringList &fileList )
+void STQLSupportPart::addedFilesToProject( const TQStringList &fileList )
 {
     TQStringList::ConstIterator it;
 
@@ -248,7 +248,7 @@ void SQLSupportPart::addedFilesToProject( const TQStringList &fileList )
 }
 
 
-void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
+void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
 {
     TQStringList::ConstIterator it;
 
@@ -259,20 +259,20 @@ void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
     emit updatedSourceInfo();
 }
 
-void SQLSupportPart::savedFile( const KURL &fileName )
+void STQLSupportPart::savedFile( const KURL &fileName )
 {
-    if ( project() ->allFiles().contains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) {
+    if ( project() ->allFiles().tqcontains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) {
 //        parse( fileName );
 //        emit updatedSourceInfo();
     }
 }
 
-KDevLanguageSupport::Features SQLSupportPart::features()
+KDevLanguageSupport::Features STQLSupportPart::features()
 {
     return Features( Classes | Functions );
 }
 
-KMimeType::List SQLSupportPart::mimeTypes( )
+KMimeType::List STQLSupportPart::mimeTypes( )
 {
     KMimeType::List list;
     KMimeType::Ptr mime = KMimeType::mimeType( "text/plain" );
diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h
index 187a4bbd..71007d3c 100644
--- a/languages/sql/sqlsupport_part.h
+++ b/languages/sql/sqlsupport_part.h
@@ -1,5 +1,5 @@
-#ifndef __KDEVPART_SQLSUPPORT_H__
-#define __KDEVPART_SQLSUPPORT_H__
+#ifndef __KDEVPART_STQLSUPPORT_H__
+#define __KDEVPART_STQLSUPPORT_H__
 
 #include <tqguardedptr.h>
 #include <tqstringlist.h>
@@ -14,14 +14,15 @@ class SqlListAction;
 class SqlOutputWidget;
 class CodeModel;
 
-class SQLSupportPart : public KDevLanguageSupport
+class STQLSupportPart : public KDevLanguageSupport
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    SQLSupportPart(TQObject *parent, const char *name, const TQStringList &);
-    virtual ~SQLSupportPart();
+    STQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
+    virtual ~STQLSupportPart();
 
     static TQString cryptStr(const TQString& aStr);
     const TQStringList& connections() const { return conNames; }
diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.hpp
index b01a60a9..a25144f9 100644
--- a/lib/antlr/antlr/AST.hpp
+++ b/lib/antlr/antlr/AST.hpp
@@ -63,10 +63,10 @@ public:
 
    /// Add a node to the end of the child list for this node
 	virtual void addChild(RefAST c) = 0;
-	/// Get the number of children. Returns 0 if the node is a leaf
+	/// Get the number of tqchildren. Returns 0 if the node is a leaf
 	virtual size_t getNumberOfChildren() const = 0;
 
-	/// Get the first child of this node; null if no children
+	/// Get the first child of this node; null if no tqchildren
 	virtual RefAST getFirstChild() const = 0;
 	/// Get  the next sibling in line after this one
 	virtual RefAST getNextSibling() const = 0;
@@ -151,7 +151,7 @@ extern ANTLR_API RefAST nullAST;
 extern ANTLR_API AST* const nullASTptr;
 
 #ifdef NEEDS_OPERATOR_LESS_THAN
-// RK: apparently needed by MSVC and a SUN CC, up to and including
+// RK: aptqparently needed by MSVC and a SUN CC, up to and including
 // 2.7.2 this was undefined ?
 inline bool operator<( RefAST l, RefAST r )
 {
diff --git a/lib/antlr/antlr/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.hpp
index 968ab6c5..0fb78dc1 100644
--- a/lib/antlr/antlr/ASTFactory.hpp
+++ b/lib/antlr/antlr/ASTFactory.hpp
@@ -86,7 +86,7 @@ public:
 	RefAST dupTree(RefAST t);
 	/** Make a tree from a list of nodes. The first element in the
 	 * array is the root. If the root is null, then the tree is
-	 * a simple list not a tree. Handles null children nodes correctly.
+	 * a simple list not a tree. Handles null tqchildren nodes correctly.
 	 * For example, make(a, b, null, c) yields tree (a b c).  make(null,a,b)
 	 * yields tree (nil a b).
 	 */
diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.hpp
index 1bfc4e56..3a88db32 100644
--- a/lib/antlr/antlr/BaseAST.hpp
+++ b/lib/antlr/antlr/BaseAST.hpp
@@ -96,7 +96,7 @@ public:
 	 */
 	virtual size_t getNumberOfChildren() const;
 
-	/// Get the first child of this node; null if no children
+	/// Get the first child of this node; null if no tqchildren
 	virtual RefAST getFirstChild() const
 	{
 		return RefAST(down);
@@ -118,7 +118,7 @@ public:
 		return 0;
 	}
 
-	/// Remove all children
+	/// Remove all tqchildren
 	virtual void removeChildren()
 	{
 		down = static_cast<BaseAST*>(static_cast<AST*>(nullAST));
diff --git a/lib/antlr/antlr/CharScanner.hpp b/lib/antlr/antlr/CharScanner.hpp
index f7e58520..5f2b8e9e 100644
--- a/lib/antlr/antlr/CharScanner.hpp
+++ b/lib/antlr/antlr/CharScanner.hpp
@@ -43,7 +43,7 @@ class ANTLR_API CharScanner;
 ANTLR_C_USING(tolower)
 
 #ifdef ANTLR_REALLY_NO_STRCASECMP
-// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior
+// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior
 // on the mac has neither...
 inline int strcasecmp(const char *s1, const char *s2)
 {
diff --git a/lib/antlr/antlr/TokenStreamBasicFilter.hpp b/lib/antlr/antlr/TokenStreamBasicFilter.hpp
index bcdb131c..353014a4 100644
--- a/lib/antlr/antlr/TokenStreamBasicFilter.hpp
+++ b/lib/antlr/antlr/TokenStreamBasicFilter.hpp
@@ -34,7 +34,7 @@ public:
 
 	void discard(int ttype);
 
-	void discard(const BitSet& mask);
+	void discard(const BitSet& tqmask);
 
 	RefToken nextToken();
 };
diff --git a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
index ed007a7a..867a4101 100644
--- a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
+++ b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
@@ -69,7 +69,7 @@ public:
 
 	void hide(int m);
 
-	void hide(const BitSet& mask);
+	void hide(const BitSet& tqmask);
 
 protected:
 	RefToken LA(int i);
diff --git a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp b/lib/antlr/antlr/TokenStreamRewriteEngine.hpp
index 9fab08c2..6aa948fe 100644
--- a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp
+++ b/lib/antlr/antlr/TokenStreamRewriteEngine.hpp
@@ -34,7 +34,7 @@ namespace antlr {
  *	 Useful for dumping out the input stream exactly after doing some
  *	 augmentation or other manipulations.	Tokens are index from 0..n-1
  *
- *	 You can insert stuff, replace, and delete chunks.	 Note that the
+ *	 You can insert stuff, tqreplace, and delete chunks.	 Note that the
  *	 operations are done lazily--only if you convert the buffer to a
  *	 String.	 This is very efficient because you are not moving data around
  *	 all the time.	 As the buffer of tokens is converted to strings, the
@@ -262,43 +262,43 @@ public:
 		addToSortedRewriteList(programName, new InsertBeforeOp(index,text));
 	}
 
-	void replace(size_t index, const ANTLR_USE_NAMESPACE(std)string& text)
+	void tqreplace(size_t index, const ANTLR_USE_NAMESPACE(std)string& text)
 	{
-		replace(DEFAULT_PROGRAM_NAME, index, index, text);
+		tqreplace(DEFAULT_PROGRAM_NAME, index, index, text);
 	}
 
-	void replace( size_t from, size_t to,
+	void tqreplace( size_t from, size_t to,
 					  const ANTLR_USE_NAMESPACE(std)string& text)
 	{
-		replace(DEFAULT_PROGRAM_NAME, from, to, text);
+		tqreplace(DEFAULT_PROGRAM_NAME, from, to, text);
 	}
 
-	void replace( RefTokenWithIndex indexT,
+	void tqreplace( RefTokenWithIndex indexT,
 					  const ANTLR_USE_NAMESPACE(std)string& text )
 	{
-		replace(DEFAULT_PROGRAM_NAME, indexT->getIndex(), indexT->getIndex(), text);
+		tqreplace(DEFAULT_PROGRAM_NAME, indexT->getIndex(), indexT->getIndex(), text);
 	}
 
-	void replace( RefTokenWithIndex from,
+	void tqreplace( RefTokenWithIndex from,
 					  RefTokenWithIndex to,
 					  const ANTLR_USE_NAMESPACE(std)string& text )
 	{
-		replace(DEFAULT_PROGRAM_NAME, from, to, text);
+		tqreplace(DEFAULT_PROGRAM_NAME, from, to, text);
 	}
 
-	void replace(const ANTLR_USE_NAMESPACE(std)string& programName,
+	void tqreplace(const ANTLR_USE_NAMESPACE(std)string& programName,
 					 size_t from, size_t to,
 					 const ANTLR_USE_NAMESPACE(std)string& text )
 	{
 		addToSortedRewriteList(programName,new ReplaceOp(from, to, text));
 	}
 
-	void replace( const ANTLR_USE_NAMESPACE(std)string& programName,
+	void tqreplace( const ANTLR_USE_NAMESPACE(std)string& programName,
 					  RefTokenWithIndex from,
 					  RefTokenWithIndex to,
 					  const ANTLR_USE_NAMESPACE(std)string& text )
 	{
-		replace(programName,
+		tqreplace(programName,
 				  from->getIndex(),
 				  to->getIndex(),
 				  text);
@@ -323,13 +323,13 @@ public:
 	void remove( const ANTLR_USE_NAMESPACE(std)string& programName,
 					 size_t from, size_t to)
 	{
-		replace(programName,from,to,"");
+		tqreplace(programName,from,to,"");
 	}
 
 	void remove( const ANTLR_USE_NAMESPACE(std)string& programName,
 					 RefTokenWithIndex from, RefTokenWithIndex to )
 	{
-		replace(programName,from,to,"");
+		tqreplace(programName,from,to,"");
 	}
 
 	void discard(int ttype) {
diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp
index 98ce6b7a..a255ca10 100644
--- a/lib/antlr/src/ASTFactory.cpp
+++ b/lib/antlr/src/ASTFactory.cpp
@@ -217,7 +217,7 @@ RefAST ASTFactory::dupList(RefAST t)
 RefAST ASTFactory::dupTree(RefAST t)
 {
 	RefAST result = dup(t);		// make copy of root
-	// copy all children of root.
+	// copy all tqchildren of root.
 	if( t )
 		result->setFirstChild( dupList(t->getFirstChild()) );
 	return result;
@@ -225,7 +225,7 @@ RefAST ASTFactory::dupTree(RefAST t)
 
 /** Make a tree from a list of nodes.  The first element in the
  * array is the root.  If the root is null, then the tree is
- * a simple list not a tree.  Handles null children nodes correctly.
+ * a simple list not a tree.  Handles null tqchildren nodes correctly.
  * For example, make(a, b, null, c) yields tree (a b c).  make(null,a,b)
  * yields tree (nil a b).
  */
@@ -240,7 +240,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST>& nodes)
 	if( root )
 		root->setFirstChild(RefAST(nullASTptr));	// don't leave any old pointers set
 
-	// link in children;
+	// link in tqchildren;
 	for( unsigned int i = 1; i < nodes.size(); i++ )
 	{
 		if ( nodes[i] == 0 )		// ignore null nodes
@@ -336,7 +336,7 @@ void ASTFactory::loadChildren( ANTLR_USE_NAMESPACE(std)istream& infile,
 {
 	char ch;
 
-	for(;;)			// for all children of this node....
+	for(;;)			// for all tqchildren of this node....
 	{
 		eatwhite(infile);
 
@@ -438,7 +438,7 @@ RefAST ASTFactory::LoadAST( ANTLR_USE_NAMESPACE(std)istream& infile )
 	infile.get(ch);
 
 	// now if we have a '/' here it's a single node. If it's a '>' we get
-	// a tree with children
+	// a tree with tqchildren
 
 	if( ch == '/' )
 	{
diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp
index f10f1e16..17d8de68 100644
--- a/lib/antlr/src/BaseAST.cpp
+++ b/lib/antlr/src/BaseAST.cpp
@@ -47,7 +47,7 @@ void BaseAST::doWorkForFindAll(
 				(!partialMatch && sibling->equalsTree(target)) ) {
 			v.push_back(sibling);
 		}
-		// regardless of match or not, check any children for matches
+		// regardless of match or not, check any tqchildren for matches
 		if ( sibling->getFirstChild() ) {
 			RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch);
 		}
@@ -70,7 +70,7 @@ bool BaseAST::equalsList(RefAST t) const
 		// as a quick optimization, check roots first.
 		if (!sibling->equals(t))
 			return false;
-		// if roots match, do full list match test on children.
+		// if roots match, do full list match test on tqchildren.
 		if (sibling->getFirstChild()) {
 			if (!sibling->getFirstChild()->equalsList(t->getFirstChild()))
 				return false;
@@ -103,7 +103,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const
 		// as a quick optimization, check roots first.
 		if (!sibling->equals(sub))
 			return false;
-		// if roots match, do partial list match test on children.
+		// if roots match, do partial list match test on tqchildren.
 		if (sibling->getFirstChild())
 			if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild()))
 				return false;
@@ -125,7 +125,7 @@ bool BaseAST::equalsTree(RefAST t) const
 	// check roots first
 	if (!equals(t))
 		return false;
-	// if roots match, do full list match test on children.
+	// if roots match, do full list match test on tqchildren.
 	if (getFirstChild()) {
 		if (!getFirstChild()->equalsList(t->getFirstChild()))
 			return false;
@@ -149,7 +149,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const
 	// check roots first
 	if (!equals(sub))
 		return false;
-	// if roots match, do full list partial match test on children.
+	// if roots match, do full list partial match test on tqchildren.
 	if (getFirstChild())
 		if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
 			return false;
@@ -256,7 +256,7 @@ void BaseAST::toStream( ANTLR_USE_NAMESPACE(std)ostream& out ) const
 
 		if( need_close_tag )
 		{
-			// got children so write them...
+			// got tqchildren so write them...
 			if( node->getFirstChild() != 0 )
 				node->getFirstChild()->toStream( out );
 
diff --git a/lib/antlr/src/Makefile.am b/lib/antlr/src/Makefile.am
index b1af9fca..3d3b94af 100644
--- a/lib/antlr/src/Makefile.am
+++ b/lib/antlr/src/Makefile.am
@@ -1,6 +1,6 @@
 
 # Make #include <antlr/xxx> work..
-INCLUDES = -I$(srcdir)/..
+INCLUDES = -I$(srcdir)/.. $(all_includes)
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
 noinst_LTLIBRARIES = libantlr.la
diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp
index 982e8645..ac6156da 100644
--- a/lib/antlr/src/TokenStreamBasicFilter.cpp
+++ b/lib/antlr/src/TokenStreamBasicFilter.cpp
@@ -24,9 +24,9 @@ void TokenStreamBasicFilter::discard(int ttype)
 	discardMask.add(ttype);
 }
 
-void TokenStreamBasicFilter::discard(const BitSet& mask)
+void TokenStreamBasicFilter::discard(const BitSet& tqmask)
 {
-	discardMask = mask;
+	discardMask = tqmask;
 }
 
 RefToken TokenStreamBasicFilter::nextToken()
diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
index 431df0c3..90d48d5a 100644
--- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
+++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
@@ -94,9 +94,9 @@ void TokenStreamHiddenTokenFilter::hide(int m)
 	hideMask.add(m);
 }
 
-void TokenStreamHiddenTokenFilter::hide(const BitSet& mask)
+void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask)
 {
-	hideMask = mask;
+	hideMask = tqmask;
 }
 
 RefToken TokenStreamHiddenTokenFilter::LA(int)
diff --git a/lib/astyle/ASBeautifier.cpp b/lib/astyle/ASBeautifier.cpp
index 432d58a9..7ea8ec5f 100644
--- a/lib/astyle/ASBeautifier.cpp
+++ b/lib/astyle/ASBeautifier.cpp
@@ -1067,7 +1067,7 @@ string ASBeautifier::beautify(const string &originalLine)
 			}
 		}
 
-		// handle parenthesies
+		// handle tqparenthesies
 		if (ch == '(' || ch == '[' || ch == ')' || ch == ']')
 		{
 			if (ch == '(' || ch == '[')
@@ -1555,7 +1555,7 @@ string ASBeautifier::beautify(const string &originalLine)
 		}
 
 
-		// check for preBlockStatements ONLY if not within parenthesies
+		// check for preBlockStatements ONLY if not within tqparenthesies
 		// (otherwise 'struct XXX' statements would be wrongly interpreted...)
 		if (isWhiteSpace(prevCh) && !isInTemplate && parenDepth == 0)
 		{
diff --git a/lib/astyle/ASFormatter.cpp b/lib/astyle/ASFormatter.cpp
index eb418760..62f7efc4 100644
--- a/lib/astyle/ASFormatter.cpp
+++ b/lib/astyle/ASFormatter.cpp
@@ -573,7 +573,7 @@ string ASFormatter::nextLine()
 			}
 		}
 
-		// handle parenthesies
+		// handle tqparenthesies
 		if (currentChar == '(' || currentChar == '[' || (isInTemplate && currentChar == '<'))
 		{
 			parenStack->back()++;
@@ -593,7 +593,7 @@ string ASFormatter::nextLine()
 				}
 			}
 
-			// check if this parenthesis closes a header, e.g. if (...), while (...)
+			// check if this tqparenthesis closes a header, e.g. if (...), while (...)
 			if (isInHeader && parenStack->back() == 0)
 			{
 				isInHeader = false;
@@ -1033,10 +1033,10 @@ void ASFormatter::setOperatorPaddingMode(bool state)
 }
 
 /**
-* set parenthesis outside padding mode.
+* set tqparenthesis outside padding mode.
 * options:
-*    true     statement parenthesiss will be padded with spaces around them.
-*    false    statement parenthesiss will not be padded.
+*    true     statement tqparenthesiss will be padded with spaces around them.
+*    false    statement tqparenthesiss will not be padded.
 *
 * @param state         the padding mode.
 */
@@ -1046,10 +1046,10 @@ void ASFormatter::setParensOutsidePaddingMode(bool state)
 }
 
 /**
-* set parenthesis inside padding mode.
+* set tqparenthesis inside padding mode.
 * options:
-*    true     statement parenthesis will be padded with spaces around them.
-*    false    statement parenthesis will not be padded.
+*    true     statement tqparenthesis will be padded with spaces around them.
+*    false    statement tqparenthesis will not be padded.
 *
 * @param state         the padding mode.
 */
@@ -1059,10 +1059,10 @@ void ASFormatter::setParensInsidePaddingMode(bool state)
 }
 
 /**
-* set parenthesis unpadding mode.
+* set tqparenthesis unpadding mode.
 * options:
-*    true     statement parenthesis will be unpadded with spaces removed around them.
-*    false    statement parenthesis will not be unpadded.
+*    true     statement tqparenthesis will be unpadded with spaces removed around them.
+*    false    statement tqparenthesis will not be unpadded.
 *
 * @param state         the padding mode.
 */
diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp
index c58bbe7d..5ece8b2b 100644
--- a/lib/catalog/catalog.cpp
+++ b/lib/catalog/catalog.cpp
@@ -48,7 +48,7 @@ struct _Catalog_Private
 
     bool hasIndex( const TQCString& name ) const
     {
-        return indexList.contains( name );
+        return indexList.tqcontains( name );
     }
 
     DB* index( const TQCString& name )
@@ -172,7 +172,7 @@ void  Catalog::setEnabled( bool isEnabled )
 {
     Q_ASSERT( d->dbp != 0 );
 
-    TQMap<TQCString, DB*>::Iterator it = d->indexList.find( name );
+    TQMap<TQCString, DB*>::Iterator it = d->indexList.tqfind( name );
     if( it == d->indexList.end() ){
         DB* dbp = 0;
 
@@ -213,7 +213,7 @@ void  Catalog::setEnabled( bool isEnabled )
 
  void  Catalog::close()
 {
-    d->dbName = TQString::null;
+    d->dbName = TQString();
 
     TQMap<TQCString, DB*>::Iterator it = d->indexList.begin();
     while( it != d->indexList.end() ){
@@ -369,7 +369,7 @@ void  Catalog::setEnabled( bool isEnabled )
 
     DBC** cursors = new DBC* [ args.size() + 1 ];
 
-    TQValueList< QPair<TQCString,TQVariant> >::ConstIterator it = args.begin();
+    TQValueList< TQPair<TQCString,TQVariant> >::ConstIterator it = args.begin();
     int current = 0;
     while( it != args.end() ){
         TQCString indexName = (*it).first;
diff --git a/lib/catalog/catalog.h b/lib/catalog/catalog.h
index 00eb5b2b..c581dc8c 100644
--- a/lib/catalog/catalog.h
+++ b/lib/catalog/catalog.h
@@ -42,7 +42,7 @@ never or rarely changes. System libraries are perfect examples of such code.
 class Catalog
 {
 public:
-    typedef QPair<TQCString, TQVariant> QueryArgument;
+    typedef TQPair<TQCString, TQVariant> QueryArgument;
 
 public:
     Catalog();
diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h
index f796baa5..426358f4 100644
--- a/lib/catalog/tag.h
+++ b/lib/catalog/tag.h
@@ -122,7 +122,7 @@ public:
         data->fileName = fileName;
     }
 
-    TQString path( const TQString& sep = TQString::fromLatin1("::") ) const
+    TQString path( const TQString& sep = TQString::tqfromLatin1("::") ) const
     {
         TQString s = scope().join( sep );
         if( s.isNull() )
@@ -194,11 +194,11 @@ public:
 			if( hasAttribute( "spc" ) )
 				return data->attributes["spc"].asString();
 			else
-				return TQString::null;
+				return TQString();
 		}
 
 		bool hasSpecializationDeclaration() const {
-			return data->attributes.contains( "spc" );
+			return data->attributes.tqcontains( "spc" );
 		}
 
 		void setSpecializationDeclaration( const TQString& str ) {
@@ -216,7 +216,7 @@ public:
 	    name == "endLine" ||
 	    name == "endColumn" )
 	    return true;
-        return data->attributes.contains( name );
+        return data->attributes.tqcontains( name );
     }
 
     TQVariant attribute( const TQCString& name ) const
@@ -270,7 +270,7 @@ public:
     }
     
     void addTemplateParam( const TQString& param , const TQString& def = "" ) {
-        TQMap<TQCString, TQVariant>::iterator it = data->attributes.find( "tpl" );
+        TQMap<TQCString, TQVariant>::iterator it = data->attributes.tqfind( "tpl" );
         if( it != data->attributes.end() && (*it).type() == TQVariant::StringList ) {
         }else{
             it = data->attributes.insert( "tpl", TQVariant( TQStringList() ) );
@@ -289,7 +289,7 @@ private:
     void detach();
     
 private:
-    struct TagData: public QShared
+    struct TagData: public TQShared
     {
 	TQCString id;
 	int kind;
diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
index 209a8a99..8fe6b82f 100644
--- a/lib/cppparser/ast.cpp
+++ b/lib/cppparser/ast.cpp
@@ -125,7 +125,7 @@ TQString nodeTypeToString( int type )
 	return "Custom";
     }
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -136,7 +136,7 @@ AST::AST()
       m_endLine( 0 ), m_endColumn( 0 )
 {
 #ifndef CPPPARSER_NO_CHILDREN
-    m_children.setAutoDelete( false );
+    m_tqchildren.setAutoDelete( false );
 #endif
 }
 
@@ -178,14 +178,14 @@ void AST::getEndPosition( int* line, int* col ) const
         * col = m_endColumn;
 }
 
-void AST::setParent( AST* parent )
+void AST::setParent( AST* tqparent )
 {
 #ifndef CPPPARSER_NO_CHILDREN
     if( m_parent )
 	m_parent->removeChild( this );
 #endif
 
-    m_parent = parent;
+    m_parent = tqparent;
 
 #ifndef CPPPARSER_NO_CHILDREN
     if( m_parent )
@@ -196,12 +196,12 @@ void AST::setParent( AST* parent )
 #ifndef CPPPARSER_NO_CHILDREN
 void AST::appendChild( AST* child )
 {
-    m_children.append( child );
+    m_tqchildren.append( child );
 }
 
 void AST::removeChild( AST* child )
 {
-    m_children.remove( child );
+    m_tqchildren.remove( child );
 }
 #endif
 
@@ -235,7 +235,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam
 TQString NameAST::text() const
 {
     if( !m_unqualifiedName.get() )
-        return TQString::null;
+        return TQString();
 
     TQString str;
 
@@ -470,11 +470,11 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST::
 TQString ClassOrNamespaceNameAST::text() const
 {
     if( !m_name.get() )
-        return TQString::null;
+        return TQString();
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
+        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
 
     return str;
 }
diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h
index c9750faf..58704df9 100644
--- a/lib/cppparser/ast.h
+++ b/lib/cppparser/ast.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <ksharedptr.h>
 
-#if defined( Q_OS_WIN32 ) || defined( Q_CC_SUN )
+#if defined( Q_OS_WIN32 ) || defined( TQ_CC_SUN )
 
 #ifndef _THROW0
 #  define _THROW0()
@@ -183,9 +183,9 @@ enum NodeType
 TQString nodeTypeToString( int type );
 
 
-#if defined(CPPPARSER_QUICK_ALLOCATOR)
+#if defined(CPPPARSER_TQUICK_ALLOCATOR)
 
-#include <quick_allocator.h>
+#include <tquick_allocator.h>
 
 #define DECLARE_ALLOC(tp) \
     void * operator new(std::size_t) \
@@ -253,8 +253,8 @@ public:
     int nodeType() const { return m_nodeType; }
     void setNodeType( int nodeType ) { m_nodeType = nodeType; }
 
-    AST* parent() { return m_parent; }
-    void setParent( AST* parent );
+    AST* tqparent() { return m_parent; }
+    void setParent( AST* tqparent );
 
     void setStartPosition( int line, int col );
     void getStartPosition( int* line, int* col ) const;
@@ -263,7 +263,7 @@ public:
     void getEndPosition( int* line, int* col ) const;
 
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> children() { return m_children; }
+    TQPtrList<AST> tqchildren() { return m_tqchildren; }
     void appendChild( AST* child );
     void removeChild( AST* child );
 #endif
@@ -292,7 +292,7 @@ private:
     int m_endLine, m_endColumn;
     Slice m_slice;
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> m_children;
+    TQPtrList<AST> m_tqchildren;
 #endif
 
 private:
@@ -854,7 +854,7 @@ public:
     class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); }
     void setParameterDeclarationClause( AUTO_PTR<class ParameterDeclarationClauseAST>& parameterDeclarationClause );
 
-    // ### replace 'constant' with cvQualify
+    // ### tqreplace 'constant' with cvQualify
     AST* constant() { return m_constant.get(); }
     void setConstant( AST::Node& constant );
 
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index 80667a9e..52b196e5 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -383,7 +383,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep )
   m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local );
   
   if ( !TQFile::exists( file ) ) {
-    Problem p( i18n( "Could not find include file %1" ).arg( dep.first ),
+    Problem p( i18n( "Could not find include file %1" ).tqarg( dep.first ),
                lexer ? lexer->currentLine() : -1,
                lexer ? lexer->currentColumn() : -1, Problem::Level_Warning );
     addProblem( fileName, p );
@@ -520,7 +520,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc
     if( macrosGlobal ) {
         for( MacroMap::iterator it = m_macros.begin(); it != m_macros.end(); ++it) {
             if( (*it).second.fileName() == fileName ) {
-                (*it).second.setFileName( TQString::null );
+                (*it).second.setFileName( TQString() );
             }
         }
     }
@@ -597,32 +597,32 @@ void Driver::setupLexer( Lexer * lexer ) {
   lexer->addSkipWord( "KDE_DEPRECATED" );
 
   // qt
-  lexer->addSkipWord( "Q_OBJECT" );
-  lexer->addSkipWord( "Q_OVERRIDE", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_OBJECT" );
+  lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments );
   lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_PROPERTY", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_CLASSINFO", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_SETS", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_CLASSINFO", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments );
   lexer->addSkipWord( "Q_UNUSED", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_CREATE_INSTANCE", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_CREATE_INSTANCE", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments );
   lexer->addSkipWord( "ACTIVATE_SIGNAL_WITH_PARAM", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_INLINE_TEMPLATES" );
-  lexer->addSkipWord( "Q_TEMPLATE_EXTERN" );
-  lexer->addSkipWord( "Q_TYPENAME" );
-  lexer->addSkipWord( "Q_REFCOUNT" );
-  lexer->addSkipWord( "Q_EXPLICIT" );
-  lexer->addSkipWord( "QMAC_PASCAL" );
+  lexer->addSkipWord( "TQ_INLINE_TEMPLATES" );
+  lexer->addSkipWord( "TQ_TEMPLATE_EXTERN" );
+  lexer->addSkipWord( "TQ_TYPENAME" );
+  lexer->addSkipWord( "TQ_REFCOUNT" );
+  lexer->addSkipWord( "TQ_EXPLICIT" );
+  lexer->addSkipWord( "TQMAC_PASCAL" );
   lexer->addSkipWord( "QT_STATIC_CONST" );
   lexer->addSkipWord( "QT_STATIC_CONST_IMPL" );
-  lexer->addSkipWord( "QT_WIN_PAINTER_MEMBERS" );
-  lexer->addSkipWord( "QT_NC_MSGBOX" );
-  lexer->addSkipWord( "Q_VARIANT_AS", SkipWordAndArguments );
+  lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" );
+  lexer->addSkipWord( "TQT_NC_MSGBOX" );
+  lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments );
   lexer->addSkipWord( "CALLBACK_CALL_TYPE" );
 
   // qt4 [erbsland]
-  lexer->addSkipWord( "Q_DECLARE_FLAGS", SkipWordAndArguments );
-  lexer->addSkipWord( "Q_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_DECLARE_FLAGS", SkipWordAndArguments );
+  lexer->addSkipWord( "TQ_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments );
 
   // flex
   lexer->addSkipWord( "yyconst" );
@@ -688,7 +688,7 @@ TQString Driver::findIncludeFile( const Dependence& dep, const TQString& fromFil
       return fileInfo.absFilePath();
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 TQString Driver::findIncludeFile( const Dependence& dep ) const {
@@ -707,7 +707,7 @@ TQString Driver::findIncludeFile( const Dependence& dep ) const {
       return fileInfo.absFilePath();
   }
 
-  return TQString::null;
+  return TQString();
 }
 
 void Driver::setResolveDependencesEnabled( bool enabled ) {
diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h
index 3c12d34c..078c420f 100644
--- a/lib/cppparser/driver.h
+++ b/lib/cppparser/driver.h
@@ -49,7 +49,7 @@ enum
   Dep_Local
 };
 
-typedef QPair<TQString, int> Dependence;
+typedef TQPair<TQString, int> Dependence;
 
 class ParsedFile;
 typedef KSharedPtr< ParsedFile > ParsedFilePointer;
@@ -129,7 +129,7 @@ class ParsedFile : public AbstractParseResult {
         m_directIncludeFiles.clear();
         for( int a = 0; a < directIncludeFilesCount; a++ ) {
             IncludeDesc i;
-            Q_INT8 in;
+            TQ_INT8 in;
             stream >> in;
             i.local = in;
             stream >> i.includePath;
@@ -149,7 +149,7 @@ class ParsedFile : public AbstractParseResult {
       int i = m_directIncludeFiles.size();
       stream << i;
         for( TQValueList<IncludeDesc>::const_iterator it = m_directIncludeFiles.begin(); it != m_directIncludeFiles.end(); ++it ) {
-            Q_INT8 i = (*it).local;
+            TQ_INT8 i = (*it).local;
             stream << i;
             stream << (*it).includePath;
         }
@@ -297,7 +297,7 @@ class Driver {
      */
     TQMap<TQString, Dependence> dependences( const TQString& fileName ) const;
     /**
-     * Get all the macros the driver contains
+     * Get all the macros the driver tqcontains
      * @return The macros
      */
     const MacroMap& macros() const;
@@ -306,7 +306,7 @@ class Driver {
      * Take all macros from the given map(forgetting own macros) */
     void insertMacros( const MacroSet& macros );
     /**
-     * Get the list of problem areas the driver contains
+     * Get the list of problem areas the driver tqcontains
      * @param fileName The filename to get problems for
      * @return The list of problems for @p fileName
      */
diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h
index e649a5a9..e48107e0 100644
--- a/lib/cppparser/keywords.h
+++ b/lib/cppparser/keywords.h
@@ -8,8 +8,8 @@ INSERT( "K_DCOP", Token_K_DCOP );
 INSERT( "k_dcop", Token_k_dcop );
 INSERT( "k_dcop_signals", Token_k_dcop_signals );
 
-// Qt Keywords
-INSERT( "Q_OBJECT", Token_Q_OBJECT );
+// TQt Keywords
+INSERT( "TQ_OBJECT", Token_TQ_OBJECT );
 INSERT( "signals", Token_signals );
 INSERT( "slots", Token_slots );
 INSERT( "emit", Token_emit );
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 97fe0dc0..b62cce32 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -30,7 +30,7 @@
 #if defined( KDEVELOP_BGPARSER )
 #include <tqthread.h>
 
-class KDevTread: public QThread
+class KDevTread: public TQThread
 {
 public:
     static void yield()
@@ -82,7 +82,7 @@ struct LexerData
             const Scope& scope = *it;
             ++it;
 
-            if( scope.contains(name) )
+            if( scope.tqcontains(name) )
                 return true;
         }
 
@@ -96,11 +96,11 @@ struct LexerData
             const Scope& scope = *it;
             ++it;
 
-            if( scope.contains(name) )
+            if( scope.tqcontains(name) )
                 return scope[ name ];
         }
 
-        return TQString::null;
+        return TQString();
     }
 
 };
@@ -152,7 +152,7 @@ void Lexer::reset()
     m_index = 0;
     m_size = 0;
     m_tokens.clear();
-    m_source = TQString::null;
+    m_source = TQString();
     m_ptr = 0;
     m_endPtr = 0;
     m_startLine = false;
@@ -184,7 +184,7 @@ int Lexer::toInt( const Token& token )
 	int i = s[0] == 'L' ? 2 : 1; // wide char ?
 	if( s[i] == '\\' ){
 	    // escaped char
-	    int c = s[i+1].unicode();
+	    int c = s[i+1].tqunicode();
 	    switch( c ) {
 	    case '0':
 		return 0;
@@ -195,7 +195,7 @@ int Lexer::toInt( const Token& token )
 		return c;
 	    }
 	} else {
-	    return s[i].unicode();
+	    return s[i].tqunicode();
 	}
     } else {
 	return 0;
@@ -386,21 +386,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 TQString tokText = tok.text();
                 HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
                 if( str == ide ){
-			//Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning );
+			//Problem p( i18n("unsafe use of macro '%1', macro is ignored").tqarg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning );
                     //m_driver->addProblem( m_driver->currentFileName(), p );
                     m_driver->removeMacro( ide );
-                    // str = TQString::null;
+                    // str = TQString();
                 }
 
                 if( stringify ) {
-                    textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") );
+                    textToInsert.append( TQString::tqfromLatin1("\"") + str.str() + TQString::tqfromLatin1("\" ") );
                 } else if( merge ){
                     textToInsert.truncate( textToInsert.length() - 1 );
-                    textToInsert.append( str.str()  + TQString::fromLatin1(" ") );
+                    textToInsert.append( str.str()  + TQString::tqfromLatin1(" ") );
                 } else if( tok == Token_ellipsis && d->hasBind("...") ){
                     textToInsert.append( ellipsisArg );
                 } else {
-                    textToInsert.append( str.str() + TQString::fromLatin1(" ") );
+                    textToInsert.append( str.str() + TQString::tqfromLatin1(" ") );
                 }
             }
         
@@ -419,7 +419,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	    tk.setStartPosition( startLine, startColumn );
 	    tk.setEndPosition( m_currentLine, m_currentColumn );
 	} else if( m_skipWordsEnabled ){
-	    __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> >::iterator pos = m_words.find( ide );
+	    __gnu_cxx::hash_map< HashedString, TQPair<SkipType, TQString> >::iterator pos = m_words.find( ide );
 	    if( pos != m_words.end() ){
 		if( (*pos).second.first == SkipWordAndArguments ){
 		    readWhiteSpaces();
@@ -434,9 +434,9 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 		}
 	    } else if( /*qt_rx.exactMatch(ide) ||*/
 		ide.str().endsWith("EXPORT") ||
-		(ide.str().startsWith("Q_EXPORT") && ide.str() != "Q_EXPORT_INTERFACE") ||
-		ide.str().startsWith("QM_EXPORT") ||
-		ide.str().startsWith("QM_TEMPLATE")){
+		(ide.str().startsWith("TQ_EXPORT") && ide.str() != "TQ_EXPORT_INTERFACE") ||
+		ide.str().startsWith("TQM_EXPORT") ||
+		ide.str().startsWith("TQM_TEMPLATE")){
 
 		readWhiteSpaces();
 		if( currentChar() == '(' )
@@ -514,7 +514,7 @@ void Lexer::resetSkipWords()
 
 void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str )
 {
-    m_words[ word ] = qMakePair( skipType, str );
+    m_words[ word ] = tqMakePair( skipType, str );
 }
 
 void Lexer::skip( int l, int r )
@@ -1026,7 +1026,7 @@ int Lexer::macroExpression()
 }
 
 // *IMPORTANT*
-// please, don't include lexer.moc here, because Lexer isn't a TQObject class!!
+// please, don't include lexer.tqmoc here, because Lexer isn't a TQObject class!!
 // if you have problem while recompiling try to remove cppsupport/.deps,
 // cppsupport/Makefile.in and rerun automake/autoconf
 
diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h
index a94e5c5e..cbaed1be 100644
--- a/lib/cppparser/lexer.h
+++ b/lib/cppparser/lexer.h
@@ -30,7 +30,7 @@
 #include <hashedstring.h>
 #include <ext/hash_map>
 
-#define CHARTYPE QChar
+#define CHARTYPE TQChar
 
 enum Type {
     Token_eof = 0,
@@ -60,7 +60,7 @@ enum Type {
     Token_k_dcop,
     Token_k_dcop_signals,
 
-    Token_Q_OBJECT,
+    Token_TQ_OBJECT,
     Token_signals,
     Token_slots,
     Token_emit,
@@ -217,7 +217,7 @@ public:
     void setPreprocessorEnabled( bool enabled );
 
     void resetSkipWords();
-    void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null );
+    void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString() );
 
     TQString source() const;
     void setSource( const TQString& source );
@@ -243,11 +243,11 @@ public:
     int currentColumn() const { return m_currentColumn; }
 
     inline const CHARTYPE* offset( int offset ) const {
-        return m_source.unicode() + offset;
+        return m_source.tqunicode() + offset;
     }
 
     inline int getOffset( const TQChar* p ) const {
-        return int(p - (m_source.unicode()));
+        return int(p - (m_source.tqunicode()));
     }
     
 private:
@@ -322,7 +322,7 @@ private:
     bool m_recordComments;
     bool m_recordWhiteSpaces;
     bool m_startLine;
-    __gnu_cxx::hash_map< HashedString, QPair<SkipType, TQString> > m_words;
+    __gnu_cxx::hash_map< HashedString, TQPair<SkipType, TQString> > m_words;
 
     
     int m_skippedLines;
@@ -513,12 +513,12 @@ inline const Token& Lexer::nextToken()
 
 inline const Token& Lexer::tokenAt( int n ) const
 {
-    return *m_tokens[ QMIN(n, m_size-1) ];
+    return *m_tokens[ TQMIN(n, m_size-1) ];
 }
 
 inline const Token& Lexer::lookAhead( int n ) const
 {
-    return *m_tokens[ QMIN(m_index + n, m_size-1) ];
+    return *m_tokens[ TQMIN(m_index + n, m_size-1) ];
 }
 
 inline int Lexer::tokenPosition( const Token& token ) const
diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp
index 230a7de1..2d28e27d 100644
--- a/lib/cppparser/lexercache.cpp
+++ b/lib/cppparser/lexercache.cpp
@@ -112,13 +112,13 @@ TQDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName
   FileModificationMap::const_iterator it = m_fileModificationCache.find( fileName );
   if( it != m_fileModificationCache.end() ) {
     ///Use the cache for 10 seconds
-    if( (*it).second.m_readTime.secsTo( m_currentDateTime ) < 10 ) {
+    if( (*it).second.m_readTime.secsTo( m_tqcurrentDateTime ) < 10 ) {
       return (*it).second.m_modificationTime;
     }
   }
   
   TQFileInfo fileInfo( fileName.str() );
-  m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime();
+  m_fileModificationCache[fileName].m_readTime = TQDateTime::tqcurrentDateTime();
   m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified();
   return fileInfo.lastModified();
   
@@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const {
 }
 
 void LexerCache::initFileModificationCache() {
-  m_currentDateTime = TQDateTime::currentDateTime();
+  m_tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
 }
 
 void LexerCache::saveMemory() {
diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h
index 662e0270..a68c4a6b 100644
--- a/lib/cppparser/lexercache.h
+++ b/lib/cppparser/lexercache.h
@@ -155,7 +155,7 @@ class LexerCache : public CacheManager {
     typedef __gnu_cxx::hash_map<HashedString, FileModificationCache> FileModificationMap;
     FileModificationMap m_fileModificationCache;
     Driver* m_driver;
-    TQDateTime m_currentDateTime;
+    TQDateTime m_tqcurrentDateTime;
 };
 
 
diff --git a/lib/cppparser/macro.h b/lib/cppparser/macro.h
index e8fe0b9c..c4912bb3 100644
--- a/lib/cppparser/macro.h
+++ b/lib/cppparser/macro.h
@@ -228,7 +228,7 @@ class Macro {
     }
 
     void read( TQDataStream& stream ) {
-        Q_INT8 i;
+        TQ_INT8 i;
         stream >> i; m_idHashValid = i;
         stream >> i; m_valueHashValid = i;
         stream >> i; m_hasArguments = i;
@@ -244,7 +244,7 @@ class Macro {
     }
     
     void write( TQDataStream& stream ) const {
-        Q_INT8 i;
+        TQ_INT8 i;
         i = m_idHashValid; stream << i;
         i = m_valueHashValid; stream << i;
         i = m_hasArguments; stream << i;
@@ -266,7 +266,7 @@ class Macro {
     /** Set the name for this macro */
     void setName( const TQString& name ) {
       m_name = name;
-      invalidateHash();
+      tqinvalidateHash();
     }
 
     /** Get the file name that contains this macro */
@@ -276,7 +276,7 @@ class Macro {
     /** Set the file name that contains this macro */
     void setFileName( const TQString& fileName ) {
       m_fileName = fileName;
-      invalidateHash();
+      tqinvalidateHash();
     }
 
     /** Get the line the macro is defined on */
@@ -304,7 +304,7 @@ class Macro {
     /** Set the body of the macro */
     void setBody( const TQString& body ) {
       m_body = body;
-      invalidateHash();
+      tqinvalidateHash();
     }
 
     /** This is used so the lexer does not have to remove macros that should really stay(they are just temporarily shadowed by an isUndef-macro */
@@ -314,7 +314,7 @@ class Macro {
 
     void setUndef() {
       m_isUndefMacro = true;
-      invalidateHash();
+      tqinvalidateHash();
     };
 
     /** Check whether the macro has arguments that are passed to it */
@@ -323,7 +323,7 @@ class Macro {
     }
     void setHasArguments( bool hasArguments ) {
       m_hasArguments = hasArguments;
-      invalidateHash();
+      tqinvalidateHash();
     }
     /** Get a list of arguments passed to this macro */
     TQValueList<Argument> argumentList() const {
@@ -334,7 +334,7 @@ class Macro {
     void clearArgumentList() {
       m_argumentList.clear();
       m_hasArguments = false;
-      invalidateHash();
+      tqinvalidateHash();
     }
     /** Add an argument to this macro */
     void addArgument( const Argument& argument ) {
@@ -343,7 +343,7 @@ class Macro {
     /** Add a list of arguments to this macro */
     void addArgumentList( const TQValueList<Argument>& arguments ) {
       m_argumentList += arguments;
-      invalidateHash();
+      tqinvalidateHash();
     }
 
     ///This hash respects macro-name and argument-count
@@ -359,7 +359,7 @@ class Macro {
     }
     
   private:
-    inline void invalidateHash() const {
+    inline void tqinvalidateHash() const {
         m_idHashValid = m_valueHashValid = false;
     }
     
diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp
index 31c14385..77265ce6 100644
--- a/lib/cppparser/parser.cpp
+++ b/lib/cppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
       return false; \
   } \
   nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
   } \
   else \
       nextToken(); \
@@ -139,7 +139,7 @@ bool Parser::reportError( const Error& err )
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
 
-	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
+	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
     }
 
     return true;
@@ -216,8 +216,8 @@ bool Parser::skipUntilDeclaration()
 	case Token_public:
 	case Token_protected:
 	case Token_private:
-	case Token_signals:      // Qt
-	case Token_slots:        // Qt
+	case Token_signals:      // TQt
+	case Token_slots:        // TQt
   	    return true;
 
 	default:
@@ -2005,7 +2005,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node )
     if( lex->lookAhead(0) == ';' ){
 	nextToken();
 	return true;
-    } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
+    } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
 	nextToken();
 	return true;
     } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){
diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h
index 5603e0f5..9fb34d13 100644
--- a/lib/interfaces/KDevCoreIface.h
+++ b/lib/interfaces/KDevCoreIface.h
@@ -30,6 +30,7 @@ class KDevCore;
 class KDevCoreIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
     
 public:
diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h
index 3f519159..b140df97 100644
--- a/lib/interfaces/KDevPartControllerIface.h
+++ b/lib/interfaces/KDevPartControllerIface.h
@@ -28,6 +28,7 @@ class KDevPartController;
 class KDevPartControllerIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
     
 public:
diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp
index e2e211ad..3d4bbe63 100644
--- a/lib/interfaces/codemodel.cpp
+++ b/lib/interfaces/codemodel.cpp
@@ -380,12 +380,12 @@ const FileList CodeModel::fileList( ) const
 
 bool CodeModel::hasFile( const TQString & name ) const
 {
-    return m_files.contains( name );
+    return m_files.tqcontains( name );
 }
 
 FileDom CodeModel::fileByName( const TQString & name )
 {
-    TQMap<TQString, FileDom>::const_iterator it = m_files.find( name );
+    TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name );
     if( it != m_files.end() ) {
       return *it;
     } else {
@@ -395,7 +395,7 @@ FileDom CodeModel::fileByName( const TQString & name )
 
 const FileDom CodeModel::fileByName( const TQString & name ) const
 {
-    TQMap<TQString, FileDom>::const_iterator it = m_files.find( name );
+    TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name );
     if( it != m_files.end() ) {
       return *it;
     } else {
@@ -502,7 +502,7 @@ bool CodeModel::addFile( FileDom file )
     if( file->name().isEmpty() )
 		return false;
 
-		if( m_files.find( file->name() ) != m_files.end() ) {
+		if( m_files.tqfind( file->name() ) != m_files.end() ) {
 			///the error-channel is set to 9007 because this problem appears with the cpp-support, so it is needed while debugging it
 			kdDebug(9007) << "file " << file->name() << " was added to code-model without removing it before! \n" << kdBacktrace() << endl;
 			removeFile( fileByName( file->name() ) );
@@ -679,17 +679,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const
 
 NamespaceDom NamespaceModel::namespaceByName( const TQString & name )
 {
-    return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom();
+    return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom();
 }
 
 const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const
 {
-    return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom();
+    return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom();
 }
 
 bool NamespaceModel::hasNamespace( const TQString & name ) const
 {
-    return m_namespaces.contains( name );
+    return m_namespaces.tqcontains( name );
 }
 
 bool NamespaceModel::addNamespace( NamespaceDom ns )
@@ -760,17 +760,17 @@ const ClassList ClassModel::classList( ) const
 
 bool ClassModel::hasClass( const TQString & name ) const
 {
-    return m_classes.contains( name );
+    return m_classes.tqcontains( name );
 }
 
 ClassList ClassModel::classByName( const TQString & name )
 {
-    return m_classes.contains( name ) ? m_classes[ name ] : ClassList();
+    return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList();
 }
 
 const ClassList ClassModel::classByName( const TQString & name ) const
 {
-    return m_classes.contains( name ) ? m_classes[ name ] : ClassList();
+    return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList();
 }
 
 bool ClassModel::addClass( ClassDom klass )
@@ -816,17 +816,17 @@ const FunctionList ClassModel::functionList( ) const
 
 bool ClassModel::hasFunction( const TQString & name ) const
 {
-    return m_functions.contains( name );
+    return m_functions.tqcontains( name );
 }
 
 FunctionList ClassModel::functionByName( const TQString & name )
 {
-    return m_functions.contains( name ) ? m_functions[ name ] : FunctionList();
+    return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList();
 }
 
 const FunctionList ClassModel::functionByName( const TQString & name ) const
 {
-    return m_functions.contains( name ) ? m_functions[ name ] : FunctionList();
+    return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList();
 }
 
 bool ClassModel::addFunction( FunctionDom fun )
@@ -872,17 +872,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const
 
 bool ClassModel::hasFunctionDefinition( const TQString & name ) const
 {
-    return m_functionDefinitions.contains( name );
+    return m_functionDefinitions.tqcontains( name );
 }
 
 FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name )
 {
-    return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
+    return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
 }
 
 const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const
 {
-    return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
+    return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
 }
 
 bool ClassModel::addFunctionDefinition( FunctionDefinitionDom fun )
@@ -914,17 +914,17 @@ const VariableList ClassModel::variableList( ) const
 
 VariableDom ClassModel::variableByName( const TQString & name )
 {
-    return m_variables.contains( name ) ? m_variables[ name ] : VariableDom();
+    return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom();
 }
 
 const VariableDom ClassModel::variableByName( const TQString & name ) const
 {
-    return m_variables.contains( name ) ? m_variables[ name ] : VariableDom();
+    return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom();
 }
 
 bool ClassModel::hasVariable( const TQString & name ) const
 {
-    return m_variables.contains( name );
+    return m_variables.tqcontains( name );
 }
 
 bool ClassModel::addVariable( VariableDom var )
@@ -953,17 +953,17 @@ const EnumList ClassModel::enumList( ) const
 
 EnumDom ClassModel::enumByName( const TQString & name )
 {
-    return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom();
+    return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom();
 }
 
 const EnumDom ClassModel::enumByName( const TQString & name ) const
 {
-    return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom();
+    return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom();
 }
 
 bool ClassModel::hasEnum( const TQString & name ) const
 {
-    return m_enumerators.contains( name );
+    return m_enumerators.tqcontains( name );
 }
 
 bool ClassModel::addEnum( EnumDom e )
@@ -1028,17 +1028,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const
 
 bool ClassModel::hasTypeAlias( const TQString & name ) const
 {
-    return m_typeAliases.contains( name );
+    return m_typeAliases.tqcontains( name );
 }
 
 TypeAliasList ClassModel::typeAliasByName( const TQString & name )
 {
-    return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList();
+    return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList();
 }
 
 const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const
 {
-    return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList();
+    return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList();
 }
 
 bool ClassModel::addTypeAlias( TypeAliasDom typeAlias )
diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h
index 882420b8..f85ff4c3 100644
--- a/lib/interfaces/codemodel.h
+++ b/lib/interfaces/codemodel.h
@@ -161,7 +161,7 @@ typedef KSharedPtr<EnumeratorModel> EnumeratorDom;
 @class ItemList
 The list of code model items.
 This is a type definition: @code typedef TQValueList<ItemDom> ItemList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<ItemDom> ItemList;
 
@@ -169,7 +169,7 @@ typedef TQValueList<ItemDom> ItemList;
 @class FileList
 The list of code model files.
 This is a type definition: @code typedef TQValueList<FileDom> FileList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<FileDom> FileList;
 
@@ -177,7 +177,7 @@ typedef TQValueList<FileDom> FileList;
 @class NamespaceList
 The list of code model namespaces.
 This is a type definition: @code typedef TQValueList<NamespaceDom> NamespaceList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<NamespaceDom> NamespaceList;
 
@@ -185,7 +185,7 @@ typedef TQValueList<NamespaceDom> NamespaceList;
 @class ClassList
 The list of code model classes.
 This is a type definition: @code typedef TQValueList<ClassDom> ClassList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<ClassDom> ClassList;
 
@@ -193,7 +193,7 @@ typedef TQValueList<ClassDom> ClassList;
 @class FunctionList
 The list of code model functions.
 This is a type definition: @code typedef TQValueList<FunctionDom> FunctionList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<FunctionDom> FunctionList;
 
@@ -201,7 +201,7 @@ typedef TQValueList<FunctionDom> FunctionList;
 @class FunctionDefinitionList
 The list of code model function definitions.
 This is a type definition: @code typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 
 typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList;
@@ -209,7 +209,7 @@ typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList;
 @class VariableList
 The list of code model variables.
 This is a type definition: @code typedef TQValueList<VariableDom> VariableList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<VariableDom> VariableList;
 
@@ -217,7 +217,7 @@ typedef TQValueList<VariableDom> VariableList;
 @class ArgumentList
 The list of code model arguments.
 This is a type definition: @code typedef TQValueList<ArgumentDom> ArgumentList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<ArgumentDom> ArgumentList;
 
@@ -225,7 +225,7 @@ typedef TQValueList<ArgumentDom> ArgumentList;
 @class EnumList
 The list of code model enums.
 This is a type definition: @code typedef TQValueList<EnumDom> EnumList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<EnumDom> EnumList;
 
@@ -233,7 +233,7 @@ typedef TQValueList<EnumDom> EnumList;
 @class TypeAliasList
 The list of code model type aliases.
 This is a type definition: @code typedef TQValueList<TypeAliasDom> TypeAliasList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<TypeAliasDom> TypeAliasList;
 
@@ -241,7 +241,7 @@ typedef TQValueList<TypeAliasDom> TypeAliasList;
 @class EnumeratorList
 The list of code model enumerators.
 This is a type definition: @code typedef TQValueList<EnumeratorDom> EnumeratorList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<EnumeratorDom> EnumeratorList;
 
@@ -619,7 +619,7 @@ private:
 
 class TemplateModelItem {
     public:
-        typedef QPair< TQString, TQString > ParamPair;
+        typedef TQPair< TQString, TQString > ParamPair;
         typedef TQValueVector< ParamPair > ParamMap; ///The first is the name, and the second the default-parameter, or "" if there is none.
         
         virtual const ParamMap& getTemplateParams() {
@@ -706,10 +706,10 @@ public:
 
     virtual bool isClass() const { return true; }
 
-    /**@return The scope of the class. Scope is a string list composed from names of parent classes and namespaces.*/
+    /**@return The scope of the class. Scope is a string list composed from names of tqparent classes and namespaces.*/
     TQStringList scope() const { return m_scope; }
     /**Sets the scope of this class.
-    @param scope The scope - a list of parent classes and namespaces.*/
+    @param scope The scope - a list of tqparent classes and namespaces.*/
     void setScope( const TQStringList& scope ) { m_scope = scope; }
 
     /**@return The list of base class names.*/
@@ -1044,7 +1044,7 @@ protected:
     NamespaceModel( CodeModel* model );
 
 public:
-  typedef std::set<NamespaceAliasModel> NamespaceAliasModelList; ///I'm using std-sets here, because Qt-3 has no appropriate replacement
+  typedef std::set<NamespaceAliasModel> NamespaceAliasModelList; ///I'm using std-sets here, because TQt-3 has no appropriate replacement
   typedef std::set<NamespaceImportModel> NamespaceImportModelList;
   
     /**A definition of safe pointer to the namespace model.*/
@@ -1256,7 +1256,7 @@ public:
     virtual bool isFunction() const { return true; }
 
     /**@return The scope of the function. Scope is a string list composed 
-    from names of parent functions, classes and namespaces.*/
+    from names of tqparent functions, classes and namespaces.*/
     TQStringList scope() const { return m_scope; }
 
     /**Sets the scope of the function.
diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp
index afb946bd..5c9c71e9 100644
--- a/lib/interfaces/codemodel_utils.cpp
+++ b/lib/interfaces/codemodel_utils.cpp
@@ -296,7 +296,7 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom )
 
 
 bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) {
-    if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType();
+    if( !def->resultType().tqcontains("::") ) return dec->resultType() == def->resultType();
     TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() );
     TQStringList l2 = TQStringList::split("::", def->resultType() );
     
diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h
index 2879a424..14e97656 100644
--- a/lib/interfaces/codemodel_utils.h
+++ b/lib/interfaces/codemodel_utils.h
@@ -462,11 +462,11 @@ class PredAmOwner{
 /**@return A list of all functions in the file.
 @param dom File Dom to look for functions in.*/
 FunctionList allFunctions(const FileDom &dom);
-/**@return A detailed list of all functions in the file (detailed list contains
+/**@return A detailed list of all functions in the file (detailed list tqcontains
 the information about a scope of each FunctionDom found).
 @param dom File Dom to look for functions in.*/
 AllFunctions allFunctionsDetailed(const FileDom &dom);
-/**@return A detailed list of all function definitions in the file (detailed list contains
+/**@return A detailed list of all function definitions in the file (detailed list tqcontains
 the information about a scope of each FunctionDefinitionDom found).
 @param dom File Dom to look for functions in.*/
 AllFunctionDefinitions allFunctionDefinitionsDetailed(const FileDom &dom);
diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox
index d306a1e8..5906ccfe 100644
--- a/lib/interfaces/extensions/Mainpage.dox
+++ b/lib/interfaces/extensions/Mainpage.dox
@@ -38,8 +38,8 @@ those should be loaded at a time. This can be accomplished by:
   @code
   class KDevMyExtension: public KDevPlugin {
   public:
-      KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name)
-          :KDevPlugin(info, parent, name) {}
+      KDevMyExtension(const KDevPluginInfo *info, QObject* tqparent, const char* name)
+          :KDevPlugin(info, tqparent, name) {}
       
       virtual void doSomething() = 0;
   };
diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h
index 52dd5a1e..2ce7090b 100644
--- a/lib/interfaces/extensions/codebrowserfrontend.h
+++ b/lib/interfaces/extensions/codebrowserfrontend.h
@@ -27,10 +27,11 @@ namespace Extensions {
 
 class KDevCodeBrowserFrontend  : public KDevPlugin {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-            :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {}
+        KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+            :KDevPlugin(info, tqparent, name ? name : "CodeBrowserFrontend") {}
         
         ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item
         virtual bool jumpedToItem( ItemDom item ) = 0;
diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h
index 4f17154d..bd6dc559 100644
--- a/lib/interfaces/extensions/kdevappfrontend.h
+++ b/lib/interfaces/extensions/kdevappfrontend.h
@@ -57,6 +57,7 @@ if (apf) {
 class KDevAppFrontend : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructor.
@@ -65,11 +66,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {}
+    KDevAppFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+        :KDevPlugin(info, tqparent, name ? name : "KDevAppFrontend") {}
 
     /**@return Whether the application is currently running.*/
     virtual bool isRunning() = 0;
diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h
index b3f5e080..fd11b993 100644
--- a/lib/interfaces/extensions/kdevcreatefile.h
+++ b/lib/interfaces/extensions/kdevcreatefile.h
@@ -54,7 +54,7 @@ public:
 
   public:
     /**The status of a file.*/
-    enum Status {
+    enum tqStatus {
         STATUS_OK                /**<File was successfuly created.*/,
         STATUS_CANCELED          /**<File was not created due to user intervention.*/,
         STATUS_NOTCREATED        /**<File was not created due to error.*/,
@@ -105,7 +105,7 @@ public:
     there are several file templates for each extension.*/
     TQString subtype;
     /**Current status.*/
-    Status status;
+    tqStatus status;
     /**true if the file should be added to a project.*/
     bool addToProject;
   };
@@ -119,14 +119,14 @@ public:
   plugin information in various places like "about application" dialog, plugin selector
   dialog, etc. Plugin does not take ownership on info object, also its lifetime should
   be equal to the lifetime of the plugin.
-  @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+  @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
   interface. Otherwise the plugin will not be constructed.
   @param name The internal name which identifies the plugin.*/
-  KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0)
-      :KDevPlugin(info, parent, name) {}
+  KDevCreateFile(const KDevPluginInfo *info, TQObject * tqparent = 0, const char * name = 0)
+      :KDevPlugin(info, tqparent, name) {}
 
   /**Creates a new file, within or without the project.
-  Supply as much information as you know. Leave what you don't know as TQString::null.
+  Supply as much information as you know. Leave what you don't know as TQString().
   The user will be prompted as necessary for the missing information, and the
   file created, and added to the project as necessary.
   @param ext File extension (type).
@@ -135,10 +135,10 @@ public:
   @param subtype The subtype, pass this only if an extension is not enough to find the
   file template.
   @return @ref CreatedFile instance with information about file and file creation process.*/
-  virtual CreatedFile createNewFile(TQString ext = TQString::null,
-                     TQString dir = TQString::null,
-                     TQString name = TQString::null,
-                     TQString subtype = TQString::null) = 0;
+  virtual CreatedFile createNewFile(TQString ext = TQString(),
+                     TQString dir = TQString(),
+                     TQString name = TQString(),
+                     TQString subtype = TQString()) = 0;
 
 
 };
diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp
index 745703e4..a3af79d4 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.cpp
+++ b/lib/interfaces/extensions/kdevdifffrontend.cpp
@@ -21,8 +21,8 @@
 #include "kdevdifffrontend.h"
 
 
-KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend")
+KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    : KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend")
 {
 }
 
diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h
index ecf360ad..b1158cb4 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.h
+++ b/lib/interfaces/extensions/kdevdifffrontend.h
@@ -55,11 +55,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {}
+    KDevDiffFrontend( const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+        :KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") {}
 
     /**Displays the patch.
     @param diff A string which contains a patch in unified format.*/
diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h
index 96749bd2..cc136536 100644
--- a/lib/interfaces/extensions/kdevmakefrontend.h
+++ b/lib/interfaces/extensions/kdevmakefrontend.h
@@ -53,6 +53,7 @@ if (mf) {
 class KDevMakeFrontend : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -62,11 +63,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {}
+    KDevMakeFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+        :KDevPlugin(info, tqparent, name ? name : "KDevMakeFrontend") {}
 
     /**@return The widget where the make output is shown.*/
     virtual TQWidget* widget() { return 0L; }
diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h
index 09c7bb1b..e66e01b3 100644
--- a/lib/interfaces/extensions/kdevquickopen.h
+++ b/lib/interfaces/extensions/kdevquickopen.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVQUICKOPEN_H
-#define KDEVQUICKOPEN_H
+#ifndef KDEVTQUICKOPEN_H
+#define KDEVTQUICKOPEN_H
 
 #include <kdevplugin.h>
 #include <kurl.h>
@@ -51,11 +51,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name)
+        :KDevPlugin(info, tqparent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
@@ -81,8 +81,8 @@ public:
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVQUICKOPEN_H
-#define KDEVQUICKOPEN_H
+#ifndef KDEVTQUICKOPEN_H
+#define KDEVTQUICKOPEN_H
 
 #include <kdevplugin.h>
 #include <kurl.h>
@@ -116,11 +116,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name)
+        :KDevPlugin(info, tqparent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h
index 5ca33079..0542fbf1 100644
--- a/lib/interfaces/extensions/kdevsourceformatter.h
+++ b/lib/interfaces/extensions/kdevsourceformatter.h
@@ -51,11 +51,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevSourceFormatter(const KDevPluginInfo *info, TQObject* tqparent, const char* name)
+        :KDevPlugin(info, tqparent, name) {}
 
     /**Formats the source.
     @param text A string with a code.
diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h
index 9b0571b8..63656c9e 100644
--- a/lib/interfaces/extensions/kdevversioncontrol.h
+++ b/lib/interfaces/extensions/kdevversioncontrol.h
@@ -135,6 +135,7 @@ if (vcs) {
 class KDevVersionControl: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructs a VCS plugin.
@@ -143,11 +144,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name )
-        :KDevPlugin(info, parent, name ) {}
+    KDevVersionControl(const KDevPluginInfo *info, TQObject *tqparent, const char *name )
+        :KDevPlugin(info, tqparent, name ) {}
 
     /**Creates a new project in the passed path @p dir. This should instantiate
     VCS infrastructure and import a project into the VCS in that directory.
@@ -181,22 +182,23 @@ signals:
 /**
 Basic interface for providing info on file registered in a version control repository repository.
 */
-class KDevVCSFileInfoProvider: public QObject
+class KDevVCSFileInfoProvider: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.
-    @param parent The parent VCS plugin.
+    @param tqparent The tqparent VCS plugin.
     @param name The name of a provider object.*/
-    KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name)
-        : TQObject( parent, name ), m_owner(parent) {}
+    KDevVCSFileInfoProvider(KDevVersionControl *tqparent, const char *name)
+        : TQObject( tqparent, name ), m_owner(tqparent) {}
 
     /**Gets the status for local files in the specified directory:
     the info are collected locally so they are necessarily in sync with the repository
 
     This is a <b>synchronous operation</b> (blocking).
     @param dirPath The relative (to project dir) directory path to stat.
-    @return Status for all <b>registered</b> files.*/
+    @return tqStatus for all <b>registered</b> files.*/
     virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0;
 
     /**Starts a request for directory status to the remote repository.
@@ -208,18 +210,18 @@ public:
     @param dirPath The (relative to project directory) directory which status you are asking for.
     @param callerData The pointer to some data you want the provider will return
     to you when it has done.
-    @param recursive If false, retrieve information only for dirPath's immediate children.
+    @param recursive If false, retrieve information only for dirPath's immediate tqchildren.
     @param checkRepos If true, contact remote repository and augment repository's status.
     If false, retrieve only for local modification information.
     @return true if the request has been successfully started, false otherwise.*/
-    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0;
+    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0;
 
 signals:
     /**Emitted when the status request to remote repository has finished.
     @param fileInfoMap The status for <b>registered in repository</b> files.
     @param callerData The pointer to some data you want the provider will return
     to you when it has done
-    @see requestStatus for to find out when this signal should be used.*/
+    @see requesttqStatus for to find out when this signal should be used.*/
     void statusReady(const VCSFileInfoMap &fileInfoMap, void *callerData);
 
 protected:
diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox
index 4618c3d5..8b91bf8c 100644
--- a/lib/interfaces/external/Mainpage.dox
+++ b/lib/interfaces/external/Mainpage.dox
@@ -10,14 +10,14 @@ GUI Designer integration framework.
 
 \section designerintegration Overview of GUI designer integration process
 Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer
-interface. It defines necessary signals to communicate with an IDE and abstract virtual
+interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual
 functions to determine designer type.
 
 If a part which can "design" user interface files of a certain mimetype
 implements this interface and sets itself as a default handler for that 
 mimetype then it becomes automatically integrated into KDevelop IDE.
 
-When a part is embedded into KDevelop shell, its signals (defined in @ref
+When a part is embedded into KDevelop shell, its Q_SIGNALS (defined in @ref
 KInterfaceDesigner::Designer interface):
 @code
     void addedFunction(DesignerType type, const QString &formName, Function function)
@@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface):
     void editFunction(DesignerType type, const QString &formName, const QString &functionName)
     void editSource(DesignerType type, const QString &formName);
 @endcode
-are connected to corresponding slots of KDevelop designer integration engine which can be implemented in KDevelop language support plugin.
+are connected to corresponding Q_SLOTS of KDevelop designer integration engine which can be implemented in KDevelop language support plugin.
  
 Each language support which wants to use integrated designer, must reimplement 
 @code
diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp
index 606fd2b4..06c28d50 100644
--- a/lib/interfaces/external/designer.cpp
+++ b/lib/interfaces/external/designer.cpp
@@ -20,8 +20,8 @@
 
 namespace KInterfaceDesigner{
 
-Designer::Designer(TQObject *parent, const char *name)
-    :KParts::ReadWritePart(parent, name)
+Designer::Designer(TQObject *tqparent, const char *name)
+    :KParts::ReadWritePart(tqparent, name)
 {
 }
 
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index c254ab07..72d7508a 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -26,14 +26,14 @@ namespace KInterfaceDesigner{
 
 /**The type of a GUI Designer.*/
 enum DesignerType {
-    QtDesigner    /**<Qt Designer.*/,
+    TQtDesigner    /**<TQt Designer.*/,
     Glade         /**<Glade (version >= 3).*/
 };
 
 /**Function type.*/
 enum FunctionType {
     ftFunction    /**<Simple function or a callback.*/,
-    ftQtSlot      /**<Qt slot.*/
+    ftTQtSlot      /**<TQt slot.*/
 };
 
 /**Function.*/
@@ -65,8 +65,9 @@ mimetype then it becomes automatically integrated into KDevelop IDE.
 */
 class Designer: public KParts::ReadWritePart{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    Designer(TQObject *parent, const char *name);
+    Designer(TQObject *tqparent, const char *name);
     
     /**Reimplement this to be able to open projects.*/
     virtual void openProject(const TQString &projectFile) = 0;
@@ -90,7 +91,7 @@ signals:
     /**Emitted when a form state is changed in the designer.
     @param formName An absolute name of the form file.
     @param status 0: form is clean, 1: form is modified.*/
-    void newStatus(const TQString &formName, int status);
+    void newtqStatus(const TQString &formName, int status);
 };
 
 }
diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp
index 22c701f1..08f5d19f 100644
--- a/lib/interfaces/extras/kdevcompileroptions.cpp
+++ b/lib/interfaces/extras/kdevcompileroptions.cpp
@@ -1,7 +1,7 @@
 #include "kdevcompileroptions.h"
 
-KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name )
-        :TQObject(parent, name)
+KDevCompilerOptions::KDevCompilerOptions( TQObject * tqparent, const char * name )
+        :TQObject(tqparent, name)
 {
 }
 
diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h
index bac7e16e..15d9a066 100644
--- a/lib/interfaces/extras/kdevcompileroptions.h
+++ b/lib/interfaces/extras/kdevcompileroptions.h
@@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog.
 
 Common use case:
 @code
-static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent )
 {
     KService::Ptr service = KService::serviceByDesktopName( name );
     if ( !service )
@@ -49,7 +49,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
-    TQObject *obj = factory->create(parent, service->name().latin1(),
+    TQObject *obj = factory->create(tqparent, service->name().latin1(),
                                    "KDevCompilerOptions", args);
 
     if (!obj->inherits("KDevCompilerOptions"))
@@ -60,21 +60,22 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 }
 
 ...
-KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent);
+KDevCompilerOptions *plugin = createCompilerOptions(compilerName, tqparent);
 TQString flags = ""; //old compiler flags
 if ( plugin )
 {
-    flags = plugin->exec( parent, flags ); //new compiler flags are returned
+    flags = plugin->exec( tqparent, flags ); //new compiler flags are returned
     delete plugin;
 }
 @endcode
 */
-class KDevCompilerOptions : public QObject
+class KDevCompilerOptions : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KDevCompilerOptions( TQObject *parent=0, const char *name=0 );
+    KDevCompilerOptions( TQObject *tqparent=0, const char *name=0 );
 
     /**
      * Opens a dialog which allows the user to configure the
@@ -82,9 +83,9 @@ public:
      * will be set from the flags argument of this method.
      * After the dialog is accepted, the new settings will
      * be returned as a string. If the dialog was cancelled,
-     * TQString::null is returned.
+     * TQString() is returned.
      */
-    virtual TQString exec(TQWidget *parent, const TQString &flags) = 0;
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags) = 0;
 };
 
 #endif
diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp
index 5a6ab429..cb3cb263 100644
--- a/lib/interfaces/extras/kdevvcsintegrator.cpp
+++ b/lib/interfaces/extras/kdevvcsintegrator.cpp
@@ -18,8 +18,8 @@
 */
 #include "kdevvcsintegrator.h"
 
-KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name)
-    :TQObject(parent, name)
+KDevVCSIntegrator::KDevVCSIntegrator(TQObject *tqparent, const char *name)
+    :TQObject(tqparent, name)
 {
 }
 
diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h
index 260f2a20..e13798e2 100644
--- a/lib/interfaces/extras/kdevvcsintegrator.h
+++ b/lib/interfaces/extras/kdevvcsintegrator.h
@@ -35,7 +35,7 @@ VCS Integration Dialog.
 Usually it is created as:
 @code
 class MyVCSDialog: public TQWidget, public VCSDialog {
-    MyVCSDialog(TQWidget *parent = 0, const char *name = 0);
+    MyVCSDialog(TQWidget *tqparent = 0, const char *name = 0);
     virtual void accept() { ... }
     virtual void init(const TQString &projectName, const TQString &projectLocation) { ... }
     virtual TQWidget *self() {
@@ -52,8 +52,8 @@ public:
     virtual void accept() = 0;
     /**Init integration dialog with the project name and location.*/
     virtual void init(const TQString &projectName, const TQString &projectLocation) = 0;
-    /**Reimplement to return an actual integration widget. Use QWidgets for that, not
-    QDialogs because integrator dialogs are usually have parent containers.*/
+    /**Reimplement to return an actual integration widget. Use TQWidgets for that, not
+    TQDialogs because integrator dialogs are usually have tqparent containers.*/
     virtual TQWidget *self() = 0;
 };
 
@@ -64,13 +64,14 @@ It can, for example, perform checkout or import operations.
 */
 class KDevVCSIntegrator: public TQObject {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0);
+    KDevVCSIntegrator(TQObject *tqparent = 0, const char *name = 0);
 
     /**Reimplement to return a dialog to fetch the project from VCS.*/
-    virtual VCSDialog *fetcher(TQWidget *parent) = 0;
+    virtual VCSDialog *fetcher(TQWidget *tqparent) = 0;
     /**Reimplement to return a dialog to integrate the project into VCS.*/
-    virtual VCSDialog *integrator(TQWidget *parent) = 0;
+    virtual VCSDialog *integrator(TQWidget *tqparent) = 0;
 };
 
 #endif
diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp
index aae068a3..723dd28b 100644
--- a/lib/interfaces/hashedstring.cpp
+++ b/lib/interfaces/hashedstring.cpp
@@ -30,7 +30,7 @@ size_t hashStringSafe( const TQString& str ) {
   size_t hash = 0;
   int len = str.length();
   for( int a = 0; a < len; a++ ) {
-    hash = str[a].unicode() + (hash * 17);
+    hash = str[a].tqunicode() + (hash * 17);
   }
   return hash;
 }
@@ -43,12 +43,12 @@ size_t HashedString::hashString(  const TQString& str )
 size_t fastHashString( const TQString& str ) {
   size_t hash = 0;
   if( !str.isEmpty() ) {
-    const TQChar* curr = str.unicode();
+    const TQChar* curr = str.tqunicode();
     const TQChar* end = curr + str.length();
     TQChar c;
     for(; curr < end ;) {
       c = *curr;
-      hash = c.unicode() + ( hash * 17 );
+      hash = c.tqunicode() + ( hash * 17 );
       ++curr;
     }
   }
@@ -72,7 +72,7 @@ class HashedStringSetData : public KShared {
       mutable size_t m_hash;
       HashedStringSetData() : m_hashValid( false ) {
       }
-  inline void invalidateHash() {
+  inline void tqinvalidateHash() {
     m_hashValid = false;
   }
 
@@ -180,7 +180,7 @@ void HashedStringSet::insert( const HashedString& str ) {
   if( str.str().isEmpty() ) return;
   makeDataPrivate();
   m_data->m_files.insert( str );
-  m_data->invalidateHash();
+  m_data->tqinvalidateHash();
 }
 
 bool HashedStringSet::operator <= ( const HashedStringSet& rhs ) const {
diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h
index f4264d2e..97ef2ad4 100644
--- a/lib/interfaces/katedocumentmanagerinterface.h
+++ b/lib/interfaces/katedocumentmanagerinterface.h
@@ -33,6 +33,7 @@ This is an emulated interface to provide compatibility with Kate scripts.
 class KateDocumentManagerInterface : public TQObject, public DCOPObject {
 
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
     KateDocumentManagerInterface( KDevPartController *pc );
diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h
index a933811e..36fc3605 100644
--- a/lib/interfaces/kdevapi.h
+++ b/lib/interfaces/kdevapi.h
@@ -44,9 +44,10 @@ The interface to KDevelop's core components.
 Needs to be implemented in a shell. Developers do not need to use this
 class because @ref KDevPlugin already provides API convenience methods.
 */
-class KDevApi: public QObject
+class KDevApi: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.*/
     KDevApi();
diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h
index 8b862f6b..791ae580 100644
--- a/lib/interfaces/kdevcoderepository.h
+++ b/lib/interfaces/kdevcoderepository.h
@@ -45,9 +45,10 @@ never or rarely changes. System libraries are perfect examples of such code.
 Symbols from code contained in project files are better stored in memory
 symbol store like @ref CodeModel.
 */
-class KDevCodeRepository : public QObject
+class KDevCodeRepository : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.*/
     KDevCodeRepository();
diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp
index dda66cbf..700693d6 100644
--- a/lib/interfaces/kdevcore.cpp
+++ b/lib/interfaces/kdevcore.cpp
@@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const
 // class KDevCore
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevCore::KDevCore( TQObject *parent, const char *name )
-    : TQObject( parent, name )
+KDevCore::KDevCore( TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name )
 {
     new KDevCoreIface(this);
 }
diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h
index de2fccd8..09fba17c 100644
--- a/lib/interfaces/kdevcore.h
+++ b/lib/interfaces/kdevcore.h
@@ -297,14 +297,15 @@ It defines:
 - etc.
 .
 */
-class KDevCore: public QObject
+class KDevCore: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor
-    @param parent The TQObject that's the parent of this class.
+    @param tqparent The TQObject that's the tqparent of this class.
     @param name The name of the class.*/
-    KDevCore(TQObject *parent=0, const char *name=0);
+    KDevCore(TQObject *tqparent=0, const char *name=0);
 
     /**Destructor.*/
     virtual ~KDevCore();
diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp
index 0ba325ab..c95cfbe9 100644
--- a/lib/interfaces/kdevdesignerintegration.cpp
+++ b/lib/interfaces/kdevdesignerintegration.cpp
@@ -24,8 +24,8 @@ public:
   	KDevDesignerIntegrationIface *m_iface;
 };
 
-KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name)
- : TQObject(parent, name)
+KDevDesignerIntegration::KDevDesignerIntegration(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
   dptr = new KDevDesignerIntegrationPrivate();
   
diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h
index c1604a4a..6cd8fffb 100644
--- a/lib/interfaces/kdevdesignerintegration.h
+++ b/lib/interfaces/kdevdesignerintegration.h
@@ -40,22 +40,23 @@ into KDevelop GUI designers:
 Designer integration is a layer between visual form (GUI) designer of any type
 and the current language support. Usually designers create some kind of forms
 and allow developers to define actions which are executed upon some GUI events
-(for example, Qt Designer allows to define slots connected to GUI signals).
+(for example, TQt Designer allows to define slots connected to GUI signals).
 The actual code with action implementations needs to be written by hand in source
 files. Designer integration captures such implementation requests and opens
 necessary files at desired line numbers and adds (edits, removes) code for implementations.
 
-For example, Qt Designer integration should be able to create an subclass for a form
+For example, TQt Designer integration should be able to create an subclass for a form
 and reimplement slots defined in the form.
 */
-class KDevDesignerIntegration : public QObject
+class KDevDesignerIntegration : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.
-    @param parent Parent object.
+    @param tqparent Parent object.
     @param name Internal name.*/
-    KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0);
+    KDevDesignerIntegration(TQObject *tqparent = 0, const char *name = 0);
     /**Destructor.*/
     ~KDevDesignerIntegration();
     
diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
index f928d815..4199d14a 100644
--- a/lib/interfaces/kdevgenericfactory.h
+++ b/lib/interfaces/kdevgenericfactory.h
@@ -51,8 +51,8 @@ static const KDevPluginInfo data("KDevDummyPlugin");
 typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
 K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
 
-DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
-    :KDevPlugin(&data, parent, name)
+DummyPlugin::DummyPlugin(TQObject *tqparent, const char *name, const TQStringList & )
+    :KDevPlugin(&data, tqparent, name)
 {
 }
 @endcode
diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp
index 9b3cc40b..b0449d6b 100644
--- a/lib/interfaces/kdevlanguagesupport.cpp
+++ b/lib/interfaces/kdevlanguagesupport.cpp
@@ -29,8 +29,8 @@
 #include "kdevdesignerintegration.h"
 #include "kdevlanguagesupport.h"
 
-KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" )
+KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    : KDevPlugin(info, tqparent, name ? name : "KDevLanguageSupport" )
 {
 }
 
@@ -50,7 +50,7 @@ KMimeType::List KDevLanguageSupport::mimeTypes()
 
 TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ )
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQString KDevLanguageSupport::formatClassName(const TQString &name)
diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h
index 78694193..765fde79 100644
--- a/lib/interfaces/kdevlanguagesupport.h
+++ b/lib/interfaces/kdevlanguagesupport.h
@@ -61,6 +61,7 @@ formatted name).
 class KDevLanguageSupport: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -90,10 +91,10 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name);
+    KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name);
     /**Destructor.*/
     ~KDevLanguageSupport();
 
@@ -164,13 +165,13 @@ public:
 	 */
 	virtual void createAccessMethods(ClassDom theClass, VariableDom theVariable);
 
-    /**Opens an "Subclass Widget" dialog for given Qt .ui file (formName)
+    /**Opens an "Subclass Widget" dialog for given TQt .ui file (formName)
     and propmts to implement it's slots.
     @param formName The name of a form to subclass.
     @return A list of newly created files.*/
     virtual TQStringList subclassWidget(const TQString& formName);
 
-    /**Opens an "Update Widget" dialog for given Qt .ui file (formName)
+    /**Opens an "Update Widget" dialog for given TQt .ui file (formName)
     and prompts to add missing slot implementations
     in the subclass located in fileName.
     @param formName The name of a form which is being subclassed.
@@ -185,12 +186,12 @@ public:
     KDevDesignerIntegration *des = 0;
     switch (type)
     {
-        case KInterfaceDesigner::QtDesigner:
+        case KInterfaceDesigner::TQtDesigner:
             des = getDesignerFromCache(type);
             if (des == 0)
             {
                 MyLanguageImplementationWidget *impl = new MyLanguageImplementationWidget(this);
-                des = new QtDesignerMyLanguageIntegration(this, impl);
+                des = new TQtDesignerMyLanguageIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(), "kdevmylangsupport/designerintegration");
                 saveDesignerToCache(type, des);
             }
@@ -198,7 +199,7 @@ public:
     }
     return des;
     @endcode
-    @ref ImplementationWidget and @ref QtDesignerIntegration classes are available
+    @ref ImplementationWidget and @ref TQtDesignerIntegration classes are available
     from designerintegration support library.
     @param type The type of the designer to integrate.
     @return The pointer to designer integration of given type or 0.*/
diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/kdevmainwindow.h
index 5750be7e..c68dac77 100644
--- a/lib/interfaces/kdevmainwindow.h
+++ b/lib/interfaces/kdevmainwindow.h
@@ -47,7 +47,7 @@ public:
     @param view The view to embed. Must be a KPart.
     @param title The title of a view.
     @param toolTip The tooltip of a view.*/
-    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null) = 0;
+    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString()) = 0;
 
     /**Embeds a toolview at the left of the main window.
     @param view The view to embed. Must be a KPart.
diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp
index 58f1dc2a..09a47493 100644
--- a/lib/interfaces/kdevpartcontroller.cpp
+++ b/lib/interfaces/kdevpartcontroller.cpp
@@ -20,8 +20,8 @@
 #include "kdevpartcontroller.h"
 #include "katedocumentmanagerinterface.h"
 
-KDevPartController::KDevPartController(TQWidget *parent)
-  : KParts::PartManager(parent)
+KDevPartController::KDevPartController(TQWidget *tqparent)
+  : KParts::PartManager(tqparent)
 {
   new KDevPartControllerIface(this);
   new KateDocumentManagerInterface(this);
diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h
index be7084b9..e2ff8069 100644
--- a/lib/interfaces/kdevpartcontroller.h
+++ b/lib/interfaces/kdevpartcontroller.h
@@ -56,11 +56,12 @@ GUI designers, etc.
 class KDevPartController: public KParts::PartManager
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructor.
-    @param parent The parent object.*/
-    KDevPartController(TQWidget *parent);
+    @param tqparent The tqparent object.*/
+    KDevPartController(TQWidget *tqparent);
     
     /**Call this before a call to @ref editDocument to set the encoding of the
     document to be opened.
diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp
index 5b4de199..d2a40332 100644
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@@ -54,11 +54,11 @@ struct KDevPlugin::Private
 // class KDevPlugin
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    :TQObject(parent, name), d(new Private)
+KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    :TQObject(tqparent, name), d(new Private)
 {
-    assert(parent->inherits( "KDevApi" ));
-    m_api = static_cast<KDevApi *>( parent );
+    assert(tqparent->inherits( "KDevApi" ));
+    m_api = static_cast<KDevApi *>( tqparent );
 
     actionCollection()->setHighlightingEnabled( true );
 
diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h
index a683c5db..249ff808 100644
--- a/lib/interfaces/kdevplugin.h
+++ b/lib/interfaces/kdevplugin.h
@@ -78,7 +78,7 @@ plugin names in GUI (required);
 - <i>X-KDevelop-Plugin-Version</i> is a version of a plugin (optional);
 - <i>X-KDevelop-Plugin-Homepage</i> is a home page of a plugin (optional);
 - <i>X-KDevelop-Plugin-License</i> is a license (optional). can be: GPL, LGPL, BSD, Artistic,
-QPL or Custom. If this property is not set, license is considered as unknown;
+TQPL or Custom. If this property is not set, license is considered as unknown;
 - <i>X-KDevelop-Plugin-BugsEmailAddress</i> is an email address for bug reports (optional);
 - <i>X-KDevelop-Plugin-Copyright</i> is a copyright statement (optional);
 - <i>X-KDE-Library</i> is a name of library which contains the plugin (required);
@@ -107,6 +107,7 @@ from shell applications.
 class KDevPlugin: public TQObject, public KXMLGUIClient
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructs a plugin.
@@ -115,10 +116,10 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0);
+    KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name = 0);
 
     /**Destructs a plugin.*/
     virtual ~KDevPlugin();
@@ -182,7 +183,7 @@ public:
           They belong to the application rc file (kdeveloprc)
     @note Project session file is useful for settings which cannot be shared between
           developers. If a setting should be shared, modify projectDom instead.
-    @param el The parent DOM element for plugins session settings.*/
+    @param el The tqparent DOM element for plugins session settings.*/
     virtual void restorePartialProjectSession(const TQDomElement* el);
 
     /**Saves session settings.
diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp
index 686fd1ce..d2459d17 100644
--- a/lib/interfaces/kdevplugincontroller.cpp
+++ b/lib/interfaces/kdevplugincontroller.cpp
@@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType,
     const TQString &constraint)
 {
     return KTrader::self()->query(serviceType,
-        TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION));
+        TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION));
 }
 
 KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)
diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h
index 2ffba0ba..ee583ff4 100644
--- a/lib/interfaces/kdevplugincontroller.h
+++ b/lib/interfaces/kdevplugincontroller.h
@@ -36,9 +36,10 @@ class ProfileEngine;
 The base class for KDevelop plugin controller.
 Plugin controller is responsible for quering, loading and unloading available plugins.
 */
-class KDevPluginController: public QObject
+class KDevPluginController: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp
index daa64c2b..613c759d 100644
--- a/lib/interfaces/kdevplugininfo.cpp
+++ b/lib/interfaces/kdevplugininfo.cpp
@@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const
 
 TQVariant KDevPluginInfo::property(const TQString &name) const
 {
-    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->property(name);
     return TQVariant();
@@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const
 
 TQStringList KDevPluginInfo::propertyNames( ) const
 {
-    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->propertyNames();
     return TQStringList();
diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h
index 50fe4601..746098c7 100644
--- a/lib/interfaces/kdevplugininfo.h
+++ b/lib/interfaces/kdevplugininfo.h
@@ -60,7 +60,7 @@ public:
     TQString version() const;
     /**@return A license type of a plugin. Information is taken from .desktop file.*/
     int licenseType() const;
-    /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, QPL).*/
+    /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, TQPL).*/
     TQString license() const;
     /**@return A copyright statement of a plugin. Information is taken from .desktop file.*/
     TQString copyrightStatement() const;
diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp
index f558cc48..1c334a8d 100644
--- a/lib/interfaces/kdevproject.cpp
+++ b/lib/interfaces/kdevproject.cpp
@@ -37,8 +37,8 @@ struct KDevProject::Private {
     KDevProjectIface *m_iface;
 };
 
-KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name), d(new KDevProject::Private())
+KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    : KDevPlugin(info, tqparent, name), d(new KDevProject::Private())
 {
     connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
     connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
@@ -80,14 +80,14 @@ KDevProject::Options KDevProject::options() const
 
 bool KDevProject::isProjectFile( const TQString & absFileName )
 {
-    return d->m_absToRel.contains( absFileName );
+    return d->m_absToRel.tqcontains( absFileName );
 }
 
 TQString KDevProject::relativeProjectFile( const TQString & absFileName )
 {
     if( isProjectFile(absFileName) )
 	return d->m_absToRel[ absFileName ];
-    return TQString::null;
+    return TQString();
 }
 
 void KDevProject::buildFileMap()
diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h
index 3e27d886..62e936b4 100644
--- a/lib/interfaces/kdevproject.h
+++ b/lib/interfaces/kdevproject.h
@@ -48,6 +48,7 @@ as a way of providing support for a build system (like it is done in KDevelop ID
 class KDevProject: public KDevPlugin
 {
     Q_OBJECT
+    TQ_OBJECT
 public:
     /**Constructs a project plugin.
     @param info Important information about the plugin - plugin internal and generic
@@ -55,10 +56,10 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0);
+    KDevProject(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0);
     /**Destructor.*/
     virtual ~KDevProject();
 
@@ -66,7 +67,7 @@ public:
     enum Options {
         UsesOtherBuildSystem = 0        /**<Project uses unknown or unspecified build system or build system is not used at all.*/,
         UsesAutotoolsBuildSystem = 1    /**<Project uses autotools for building.*/,
-        UsesQMakeBuildSystem =2         /**<Project uses qmake for building.*/
+        UsesTQMakeBuildSystem =2         /**<Project uses qmake for building.*/
     };
 
     /**This method is invoked when the project is opened
diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h
index eb2a0f32..59323f71 100644
--- a/lib/interfaces/kdevprojectiface.h
+++ b/lib/interfaces/kdevprojectiface.h
@@ -34,6 +34,7 @@ DCOP Interface for the @ref KDevProject object.
 class KDevProjectIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
       K_DCOP
 public:
   KDevProjectIface(KDevProject *prj);
@@ -62,7 +63,7 @@ k_dcop:
     TQStringList symlinkProjectFiles();
     
     // Project DOM access
-    TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString::null);
+    TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString());
     int readIntEntry(const TQString &path, int defaultEntry = 0);
     bool readBoolEntry(const TQString &path, bool defaultEntry = false);
     TQStringList readListEntry(const TQString &path, const TQString &tag);
diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp
index 9c9d9130..2a99f23b 100644
--- a/lib/util/blockingkprocess.cpp
+++ b/lib/util/blockingkprocess.cpp
@@ -14,8 +14,8 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name)
-  : KProcess(parent, name)
+BlockingKProcess::BlockingKProcess(TQObject *tqparent, const char *name)
+  : KProcess(tqparent, name)
 {
   m_stdOut = "";
   m_stdErr = "";
@@ -68,24 +68,24 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm)
 
 void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen)
 {
-  m_stdOut += TQString::fromLatin1(buffer, buflen);
+  m_stdOut += TQString::tqfromLatin1(buffer, buflen);
 }
 
 void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen)
 {
-  m_stdErr += TQString::fromLatin1(buffer, buflen);
+  m_stdErr += TQString::tqfromLatin1(buffer, buflen);
 }
 
 void BlockingKProcess::slotProcessExited(KProcess *)
 {
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
 void BlockingKProcess::slotTimeOut()
 {
   m_timeout = true;
   kill();
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
 
@@ -95,9 +95,9 @@ void qt_leave_modal( TQWidget *widget );
 void BlockingKProcess::enter_loop()
 {
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TQWidget::NoFocus );
+  dummy.setFocusPolicy( TQ_NoFocus );
   qt_enter_modal(&dummy);
-  qApp->enter_loop();
+  tqApp->enter_loop();
   qt_leave_modal(&dummy);
 }
 
diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h
index 4006af74..dd15002e 100644
--- a/lib/util/blockingkprocess.h
+++ b/lib/util/blockingkprocess.h
@@ -31,9 +31,10 @@ class TQTimer;
 class BlockingKProcess : public KProcess
 {
   Q_OBJECT
+  TQ_OBJECT
   
 public:
-    BlockingKProcess(TQObject *parent, const char *name=0);
+    BlockingKProcess(TQObject *tqparent, const char *name=0);
     BlockingKProcess();
 
     virtual ~BlockingKProcess();
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index 66f267b7..5ce6becf 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -43,12 +43,12 @@ ConfigWidgetProxy::~ConfigWidgetProxy()
 
 void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon )
 {
-	_globalTitleMap.insert( pagenumber, qMakePair( title, icon ) );
+	_globalTitleMap.insert( pagenumber, tqMakePair( title, icon ) );
 }
 
 void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon )
 {
-	_projectTitleMap.insert( pagenumber, qMakePair( title, icon ) );
+	_projectTitleMap.insert( pagenumber, tqMakePair( title, icon ) );
 }
 
 void ConfigWidgetProxy::removeConfigPage( int pagenumber )
@@ -92,14 +92,14 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page )
 {
 	if ( !page ) return;
 	
-	PageMap::Iterator it = _pageMap.find( page );
+	PageMap::Iterator it = _pageMap.tqfind( page );
 	if ( it != _pageMap.end() )
 	{
-		emit insertConfigWidget( static_cast<KDialogBase*>(const_cast<TQObject*>(sender())), page, it.data() );
+		emit insertConfigWidget( static_cast<KDialogBase*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))), page, it.data() );
 		_pageMap.remove( it );
 	}
 }
 
 #include "configwidgetproxy.moc"
 
-// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4;
+// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4;
diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h
index 1ba7e5c5..c35c09c9 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -68,9 +68,10 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned
 Note that this replaces the functionality of typical KDevCore::configWidget() and
 KDevCore::projectConfigWidget() slots.
 */
-class ConfigWidgetProxy : public QObject
+class ConfigWidgetProxy : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	/**Constructor.
@@ -104,7 +105,7 @@ signals:
 	/**
 	* The proxy emits this signal to notify the client that a specific config page has been requested.
 	* @param dlg The settings dialog. The client should connect to its okClicked() signal.
-	* @param page The setting page. The client should use this as parent to the config widget.
+	* @param page The setting page. The client should use this as tqparent to the config widget.
 	* @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page.
 	*/
 	void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber );
@@ -116,7 +117,7 @@ private slots:
 	void slotAboutToShowPage( TQWidget * page );
 
 private:
-	typedef TQMap<unsigned int, QPair<TQString,TQString> > TitleMap;
+	typedef TQMap<unsigned int, TQPair<TQString,TQString> > TitleMap;
 	typedef TQMap<TQWidget*, int> PageMap;
 	
 	TitleMap _globalTitleMap;
@@ -126,4 +127,4 @@ private:
 
 #endif
 
-// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4;
+// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4;
diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp
index 9f5d40c9..a8f036e6 100644
--- a/lib/util/domutil.cpp
+++ b/lib/util/domutil.cpp
@@ -57,7 +57,7 @@ TQString DomUtil::readEntryAux(const TQDomDocument &doc, const TQString &path)
 {
     TQDomElement el = elementByPath(doc, path);
     if (el.isNull())
-        return TQString::null;
+        return TQString();
     else
         return el.firstChild().toText().data();
 }
@@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths
 {
   DomPath dompath = resolvPathStringExt(pathstring);
   TQDomElement elem = doc.documentElement();
-  TQDomNodeList children;
+  TQDomNodeList tqchildren;
   TQDomElement nextElem = elem;
   for (unsigned int j=0; j<dompath.count(); j++)
   {
-    children = nextElem.childNodes();
+    tqchildren = nextElem.childNodes();
     DomPathElement dompathelement= dompath[j];
     bool wrongchild = false;
     int matchCount = 0;
-    for (unsigned int i=0; i<children.count(); i++)
+    for (unsigned int i=0; i<tqchildren.count(); i++)
     {
       wrongchild = false;
-      TQDomElement child = children.item(i).toElement();
+      TQDomElement child = tqchildren.item(i).toElement();
       TQString tag = child.tagName();
       tag = dompathelement.tagName;
       if (child.tagName() == dompathelement.tagName)
@@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt)
   TQDomElement elem = elementByPathExt(doc,pathExt);
   if (elem.isNull())
     return false;
-  TQDomNodeList children = elem.childNodes();
-  for (unsigned int i=0;i<children.count();i++)
-    if (children.item(i).isText())
-      elem.removeChild(children.item(i));
+  TQDomNodeList tqchildren = elem.childNodes();
+  for (unsigned int i=0;i<tqchildren.count();i++)
+    if (tqchildren.item(i).isText())
+      elem.removeChild(tqchildren.item(i));
   return true;
 }
 
diff --git a/lib/util/domutil.h b/lib/util/domutil.h
index 08d2571a..394b3600 100644
--- a/lib/util/domutil.h
+++ b/lib/util/domutil.h
@@ -45,7 +45,7 @@ typedef TQValueList<DomPathElement> DomPath;
 class DomUtil
 {
 public:
-    typedef QPair<TQString, TQString> Pair;
+    typedef TQPair<TQString, TQString> Pair;
     typedef TQValueList<Pair> PairList;
     /**
      * Remove all child elements from a given element.
@@ -54,7 +54,7 @@ public:
     /**
      * Reads a string entry.
      */
-    static TQString readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry = TQString::null);
+    static TQString readEntry(const TQDomDocument &doc, const TQString &path, const TQString &defaultEntry = TQString());
     /**
      * Reads a number entry.
      */
@@ -168,13 +168,13 @@ public:
       Retrieve an element specified with extended path
       examples:
 
-       - 1: "widget|class=QDialog/property|name=geometry"
-         or "widget|class=QDialog/property||1"
+       - 1: "widget|class=TQDialog/property|name=tqgeometry"
+         or "widget|class=TQDialog/property||1"
        - 2: "widget/property|name=caption/string"
          or "widget/property||2/string"
        .
       \verbatim
-        <widget class="TQDialog">
+        <widget class=TQDIALOG_OBJECT_NAME_STRING>
           <property name="name">
               <cstring>KdevFormName</cstring>
           </property>
@@ -205,17 +205,17 @@ public:
     static bool saveDOMFile(TQDomDocument &doc, TQString filename);
 
     /**
-    * Remove all child text nodes of parent described in pathExt
+    * Remove all child text nodes of tqparent described in pathExt
     */
     static bool removeTextNodes(TQDomDocument doc,TQString pathExt);
 
     /**
-    * Add child text node to parent described in pathExt
+    * Add child text node to tqparent described in pathExt
     */
     static bool appendText(TQDomDocument doc, TQString pathExt, TQString text);
 
     /**
-    * Replace all chilt text nodes of parent described in pathExt with one new.
+    * Replace all chilt text nodes of tqparent described in pathExt with one new.
     */
     static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text);
 
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index 7c4fea89..e1236474 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -26,8 +26,8 @@
 
 ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, 
                           const TQString& workingDir, const TQStringList& env,
-                          TQObject* parent, const char* name ):
-	TQObject( parent, name ), out( "" ) /* make sure out is not TQString::null since that would mean "error" */
+                          TQObject* tqparent, const char* name ):
+	TQObject( tqparent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */
 
 {
   progressDlg = 0;
@@ -49,15 +49,15 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
   bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
 
   if ( !ok ) {
-    KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ),
+    KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ),
                         i18n("Error Invoking Command") );
 
-    emit finished( TQString::null, TQString::null );
+    emit finished( TQString(), TQString() );
     deleteLater();
 
   } else {
     progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."),
-                      i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false );
+                      i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false );
     connect( progressDlg, TQT_SIGNAL(cancelClicked()),
              this, TQT_SLOT(cancelClicked()) );
   }
@@ -88,7 +88,7 @@ void ExecCommand::cancelClicked()
   progressDlg = 0;
   proc->kill();
 
-  emit finished( TQString::null, TQString::null );
+  emit finished( TQString(), TQString() );
   deleteLater();
 }
 
diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h
index c3e20d47..5be67682 100644
--- a/lib/util/execcommand.h
+++ b/lib/util/execcommand.h
@@ -37,18 +37,19 @@ Command execution facilities.
  * a progress dialog with the possibility to cancel the command.
  *
  * If there was an error or the user pressed cancel, finished ()
- * will emit a TQString::null, otherwise QStrings containing the stdout/stderr.
+ * will emit a TQString(), otherwise TQStrings containing the stdout/stderr.
  *
  * The object will delete itself after the finished signal has been emitted.
- * Additional environment can be set in the TQStringList env via QStrings with the format "foo=blah"
+ * Additional environment can be set in the TQStringList env via TQStrings with the format "foo=blah"
  */
-class ExecCommand : public QObject
+class ExecCommand : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ExecCommand( const TQString& executable, const TQStringList& args,
-		 const TQString& workingDir = TQString::null,
-                 const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 );
+		 const TQString& workingDir = TQString(),
+                 const TQStringList& env = TQStringList(), TQObject* tqparent = 0, const char* name = 0 );
     ~ExecCommand();
 
 signals:
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index cbf4f8bb..f153642f 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -56,7 +56,7 @@ TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName)
 
     TQFile f(fileName);
     if (!f.open(IO_ReadOnly))
-        return TQString::null;
+        return TQString();
     TQTextStream stream(&f);
     TQString str = stream.read();
 
@@ -69,19 +69,19 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
     TQString email = DomUtil::readEntry(dom, "/general/email");
     TQString version = DomUtil::readEntry(dom, "/general/version");
     TQString appname = DomUtil::readEntry(dom, "/general/projectname");
-    TQString date = TQDate::currentDate().toString();
-    TQString year = TQString::number(TQDate::currentDate().year());
+    TQString date = TQDate::tqcurrentDate().toString();
+    TQString year = TQString::number(TQDate::tqcurrentDate().year());
 
     TQString str = text;
-    str.replace(TQRegExp("\\$EMAIL\\$"),email);
-    str.replace(TQRegExp("\\$AUTHOR\\$"),author);
-    str.replace(TQRegExp("\\$VERSION\\$"),version);
-    str.replace(TQRegExp("\\$DATE\\$"),date);
-    str.replace(TQRegExp("\\$YEAR\\$"),year);
-    str.replace(TQRegExp("\\$APPNAME\\$"),appname);
-    str.replace(TQRegExp("\\$APPNAME\\$"),appname);
-    str.replace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper());
-    str.replace(TQRegExp("\\$APPNAMELC\\$"),appname.lower());
+    str.tqreplace(TQRegExp("\\$EMAIL\\$"),email);
+    str.tqreplace(TQRegExp("\\$AUTHOR\\$"),author);
+    str.tqreplace(TQRegExp("\\$VERSION\\$"),version);
+    str.tqreplace(TQRegExp("\\$DATE\\$"),date);
+    str.tqreplace(TQRegExp("\\$YEAR\\$"),year);
+    str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname);
+    str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname);
+    str.tqreplace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper());
+    str.tqreplace(TQRegExp("\\$APPNAMELC\\$"),appname.lower());
 
     return str;
 }
@@ -99,8 +99,8 @@ bool FileTemplate::copy(KDevPlugin *part, const TQString &name,
     TQFileInfo fi(f);
     TQString module = fi.baseName();
     TQString basefilename = fi.baseName(true);
-    text.replace(TQRegExp("\\$MODULE\\$"),module);
-    text.replace(TQRegExp("\\$FILENAME\\$"),basefilename);
+    text.tqreplace(TQRegExp("\\$MODULE\\$"),module);
+    text.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename);
 
     TQTextStream stream(&f);
     stream << text;
diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp
index ca946ce6..3c01f780 100644
--- a/lib/util/kdeveditorutil.cpp
+++ b/lib/util/kdeveditorutil.cpp
@@ -66,7 +66,7 @@ TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::
 
 	TQString linestr = editIface->textLine(line);
 
-	int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 );
+	int startPos = TQMAX( TQMIN( (int)col, (int)linestr.length()-1 ), 0 );
 	int endPos = startPos;
     startPos--;
 	while (startPos >= 0 && ( linestr[startPos].isLetterOrNumber() || linestr[startPos] == '_' || linestr[startPos] == '~') )
@@ -74,7 +74,7 @@ TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::
 	while (endPos < (int)linestr.length() && ( linestr[endPos].isLetterOrNumber() || linestr[endPos] == '_' ) )
 		endPos++;
 
-	return ( ( startPos == endPos ) ? TQString::null : linestr.mid( startPos+1, endPos-startPos-1 ) );
+	return ( ( startPos == endPos ) ? TQString() : linestr.mid( startPos+1, endPos-startPos-1 ) );
 }
 
 
diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp
index b0b78250..a4ac7aa2 100644
--- a/lib/util/kdevjobtimer.cpp
+++ b/lib/util/kdevjobtimer.cpp
@@ -11,8 +11,8 @@
 
 #include "kdevjobtimer.h"
 
-KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name)
- : TQTimer(parent, name)
+KDevJobTimer::KDevJobTimer( void * payload, TQObject *tqparent, const char *name)
+ : TQTimer(tqparent, name)
 {
 	m_payload = payload;
 	connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) );
diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h
index 19915d06..5fb9dbba 100644
--- a/lib/util/kdevjobtimer.h
+++ b/lib/util/kdevjobtimer.h
@@ -14,9 +14,10 @@
 
 #include <tqtimer.h>
 
-class KDevJobTimer : public QTimer
+class KDevJobTimer : public TQTimer
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	static void singleShot( int msec, TQObject * receiver, const char * member, void * payload );
 
@@ -24,7 +25,7 @@ signals:
 	void timeout(void*);
 
 private:
-	KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
+	KDevJobTimer( void * payload, TQObject *tqparent = 0, const char *name = 0);
 	~KDevJobTimer();
 
 private slots:
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index f9f07fd8..0ea05299 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -20,8 +20,8 @@
 
 #include "kdevshellwidget.h"
 
-KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name)
- : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false )
+KDevShellWidget::KDevShellWidget(TQWidget *tqparent, const char *name)
+ : TQVBox(tqparent, name), m_doAutoActivate( false ), m_isRunning( false )
 {
 }
 
@@ -41,14 +41,14 @@ void KDevShellWidget::activate( )
 	KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
 	if ( !factory ) return;
 
-  	m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" );
+  	m_konsolePart = (KParts::ReadOnlyPart *) factory->create( TQT_TQOBJECT(this), "libkonsolepart", "KParts::ReadOnlyPart" );
 	if ( !m_konsolePart ) return;
 
 	connect( m_konsolePart, TQT_SIGNAL( processExited(KProcess *) ), this, TQT_SLOT( processExited(KProcess *) ) );
 	connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) );
 	connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) );
 
- 	m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus );
+ 	m_konsolePart->widget()->setFocusPolicy( TQ_WheelFocus );
  	setFocusProxy( m_konsolePart->widget() );
  	m_konsolePart->widget()->setFocus();
 
diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h
index 69198a7a..62dbf171 100644
--- a/lib/util/kdevshellwidget.h
+++ b/lib/util/kdevshellwidget.h
@@ -23,13 +23,14 @@ namespace KParts
 	class ReadOnlyPart;
 }
 
-class KDevShellWidget : public QVBox
+class KDevShellWidget : public TQVBox
 {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KDevShellWidget(TQWidget *parent = 0, const char *name = 0);
+	KDevShellWidget(TQWidget *tqparent = 0, const char *name = 0);
 	virtual ~KDevShellWidget();
 
 	/**
diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp
index ffc3a536..9b764a75 100644
--- a/lib/util/kscriptactionmanager.cpp
+++ b/lib/util/kscriptactionmanager.cpp
@@ -95,12 +95,12 @@ void KScriptAction::activate( )
         }
         else
         {
-            KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error"));
+            KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").tqarg(m_scriptType), i18n("KScript Error"));
 	    kdDebug() << "Query string: " << scriptTypeQuery << endl;
             return;
         }
     }
-    m_interface->run(parent(), TQVariant());
+    m_interface->run(tqparent(), TQVariant());
     m_timeout->start(60000,FALSE); // after 1 minute unload
     m_refs++;
 }
@@ -119,7 +119,7 @@ void KScriptAction::scriptFinished()
     m_refs--;
 }
 
-KScriptActionManager::KScriptActionManager(  TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac)
+KScriptActionManager::KScriptActionManager(  TQObject *tqparent, KActionCollection * ac ) : TQObject(tqparent), m_ac(ac)
 {
     m_actions.setAutoDelete(true);
 }
diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h
index d04c0518..69de43ac 100644
--- a/lib/util/kscriptactionmanager.h
+++ b/lib/util/kscriptactionmanager.h
@@ -37,6 +37,7 @@ class TQTimer;
 */
 class KScriptAction : public TQObject, public KScriptClientInterface {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac );
@@ -92,12 +93,13 @@ private:
  */
 class KScriptActionManager : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
     * Create a script manager that is attached to an action collection.
      */
-    KScriptActionManager( TQObject *parent, KActionCollection *ac );
+    KScriptActionManager( TQObject *tqparent, KActionCollection *ac );
     ~KScriptActionManager();
 
     /**
diff --git a/lib/util/rurl.cpp b/lib/util/rurl.cpp
index 0d631bda..86ca920a 100644
--- a/lib/util/rurl.cpp
+++ b/lib/util/rurl.cpp
@@ -113,26 +113,26 @@ TQString Name::extension( bool complete ) const
     {
         TQString temp = fileName();
         if (complete)
-            return temp.mid(temp.find('.')+1);
+            return temp.mid(temp.tqfind('.')+1);
         else
-            return temp.mid(temp.findRev('.')+1);
+            return temp.mid(temp.tqfindRev('.')+1);
     }
-    return TQString::null;
+    return TQString();
 }
 
 TQString Name::fileName( ) const
 {
     if (m_type == File)
         return m_rurl.section('/', -1);
-    return TQString::null;
+    return TQString();
 }
 
 TQString Name::directory( ) const
 {
-    if ( (m_type == File) && (m_rurl.findRev('/') == -1) )
-        return TQString::null;
+    if ( (m_type == File) && (m_rurl.tqfindRev('/') == -1) )
+        return TQString();
     
-    return m_rurl.mid(0, m_rurl.findRev('/')+1);
+    return m_rurl.mid(0, m_rurl.tqfindRev('/')+1);
 }
 
 bool Name::isFile( ) const
@@ -159,7 +159,7 @@ bool Name::isValid( ) const
 {
     if (m_rurl.startsWith("/"))
         return false;
-    if (m_rurl.contains("//"))
+    if (m_rurl.tqcontains("//"))
         return false;
     if ( (m_rurl.endsWith("/")) && (m_type == File) )
         return false;
diff --git a/lib/util/rurl.h b/lib/util/rurl.h
index 5ab2ec73..09d14b43 100644
--- a/lib/util/rurl.h
+++ b/lib/util/rurl.h
@@ -41,14 +41,14 @@ public:
     /**Removes "//" from the name.*/
     void cleanRURL();
     
-    /**Returns the extension of a file or TQString::null for directories.
+    /**Returns the extension of a file or TQString() for directories.
     If complete is true then returns extensions like "tar.gz".
     Else returns "gz".*/
     TQString extension(bool complete = true) const;
-    /**Returns the name of the file without the path or TQString::null
+    /**Returns the name of the file without the path or TQString()
     for directories.*/
     TQString fileName() const;
-    /**Returns the name of the directory or TQString::null if there are no dirs in path.*/
+    /**Returns the name of the directory or TQString() if there are no dirs in path.*/
     TQString directory() const;
 
     /**Returns true if the type of RName is file.*/
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 129cdd66..9855b06b 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -23,12 +23,12 @@ TQString Settings::terminalEmulatorName( KConfig & config )
 
 	if ( useKDESetting )
 	{
-		KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
-		terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole"));
+		KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+		terminal = confGroup.readEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
 	}
 	else
 	{
-		terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole"));
+		terminal = config.readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole"));
 	}
 	return terminal;
 }
@@ -46,9 +46,9 @@ TQString Settings::profileByAttributes(const TQString &language, const TQStringL
     for (TQStringList::const_iterator it = profileKeywords.constBegin();
         it != profileKeywords.constEnd(); ++it)
     {
-        if (keywords.contains(*it))
+        if (keywords.tqcontains(*it))
         {
-            idx = profileKeywords.findIndex(*it);
+            idx = profileKeywords.tqfindIndex(*it);
             break;
         }
     }
diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp
index 849cc555..5f4d2dcd 100644
--- a/lib/util/urlutil.cpp
+++ b/lib/util/urlutil.cpp
@@ -37,14 +37,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::filename(const TQString & name) {
-  int slashPos = name.findRev("/");
+  int slashPos = name.tqfindRev("/");
   return slashPos<0 ? name : name.mid(slashPos+1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::directory(const TQString & name) {
-  int slashPos = name.findRev("/");
+  int slashPos = name.tqfindRev("/");
   return slashPos<0 ? TQString("") : name.left(slashPos);
 }
 
@@ -82,29 +82,29 @@ TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& dest
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) {
+TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) {
   bool slashPrefix = slashPolicy & SLASH_PREFIX;
   bool slashSuffix = slashPolicy & SLASH_SUFFIX;
-  if (parent.equals(child,true))
+  if (tqparent.equals(child,true))
     return slashPrefix ? TQString("/") : TQString("");
 
-  if (!parent.isParentOf(child)) return TQString();
+  if (!tqparent.isParentOf(child)) return TQString();
   int a=slashPrefix ? -1 : 1;
   int b=slashSuffix ? 1 : -1;
-  return child.path(b).mid(parent.path(a).length());
+  return child.path(b).mid(tqparent.path(a).length());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) {
-  return relativePath(KURL(parent), KURL(child), slashPolicy);
+TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) {
+  return relativePath(KURL(tqparent), KURL(child), slashPolicy);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::upDir(const TQString & path, bool slashSuffix) {
-  int slashPos = path.findRev("/");
-  if (slashPos<1) return TQString::null;
+  int slashPos = path.tqfindRev("/");
+  if (slashPos<1) return TQString();
   return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) );
 }
 
@@ -132,7 +132,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::getExtension(const TQString & path) {
-  int dotPos = path.findRev('.');
+  int dotPos = path.tqfindRev('.');
   if (dotPos<0) return TQString("");
   return path.mid(dotPos+1);
 }
@@ -143,7 +143,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
 {
   TQString absBase = extractPathNameAbsolute( baseDirUrl ),
     absRef = extractPathNameAbsolute( url );
-  int i = absRef.find( absBase, 0, true );
+  int i = absRef.tqfind( absBase, 0, true );
 
   if (i == -1)
     return TQString();
@@ -151,7 +151,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
   if (absRef == absBase)
     return TQString( "." );
   else
-    return absRef.replace( 0, absBase.length(), TQString() );
+    return absRef.tqreplace( 0, absBase.length(), TQString() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -298,12 +298,12 @@ TQString URLUtil::envExpand ( const TQString& str )
 
     if (len > 1 && str[0] == '$')
     {
-      int pos = str.find ('/');
+      int pos = str.tqfind ('/');
 
       if (pos < 0)
         pos = len;
 
-      char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
+      char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
 
       if (ret)
       {
diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h
index e8c84607..39615858 100644
--- a/lib/util/urlutil.h
+++ b/lib/util/urlutil.h
@@ -50,27 +50,27 @@ namespace URLUtil
    */
   TQString directory(const TQString & pathName);
   /**
-   * @return The relative path between a parent and child URL, or blank if the specified 
-   * child is not a child of parent.
-   * @param parent The parent URL.
+   * @return The relative path between a tqparent and child URL, or blank if the specified 
+   * child is not a child of tqparent.
+   * @param tqparent The tqparent URL.
    * @param child The child URL.
-   * @param slashPolicy If parent and child are equal then the function returns "/" if 
+   * @param slashPolicy If tqparent and child are equal then the function returns "/" if 
    * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result
    * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if 
    * slashPolicy contains SLASH_PREFIX.
    */
-  TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
+  TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
   /**
-   * @return The relative path between a parent and child URL, or blank if the specified 
-   * child is not a child of parent.
-   * @param parent The parent URL.
+   * @return The relative path between a tqparent and child URL, or blank if the specified 
+   * child is not a child of tqparent.
+   * @param tqparent The tqparent URL.
    * @param child The child URL.
-   * @param slashPolicy If parent and child are equal then the function returns "/" if 
+   * @param slashPolicy If tqparent and child are equal then the function returns "/" if 
    * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result
    * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if 
    * slashPolicy contains SLASH_PREFIX.
    */
-  TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
+  TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
   /**
    * @return The relative path between a base path and destination path or.
    * @param base The base Path.
@@ -133,7 +133,7 @@ namespace URLUtil
   TQString extractPathNameRelative(const KURL &baseDirUrl, const KURL &url );
   /**Same as above. @p basePath is TQString.*/
   TQString extractPathNameRelative(const TQString &basePath, const KURL &url );
-  /**Same as above. Both @p basePath and @p absFilePath are QStrings.*/
+  /**Same as above. Both @p basePath and @p absFilePath are TQStrings.*/
   TQString extractPathNameRelative(const TQString &basePath, const TQString &absFilePath );
 
   /**
@@ -167,10 +167,10 @@ namespace URLUtil
   * @param urls URLs to dump.
   * @param aMessage Message to be written onto a stdout.
   */
-  void dump( const KURL::List &urls, const TQString &aMessage = TQString::null );
+  void dump( const KURL::List &urls, const TQString &aMessage = TQString() );
 
   /**
-   * Same as TQDir::canonicalPath in later versions of Qt. Earlier versions of Qt
+   * Same as TQDir::canonicalPath in later versions of TQt. Earlier versions of TQt
    * had this broken, so it's reproduced here.
    * Deprecated, use TQDir::canonicalPath instead.    
    */
diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp
index 6e60f1a4..26677de6 100644
--- a/lib/widgets/fancylistviewitem.cpp
+++ b/lib/widgets/fancylistviewitem.cpp
@@ -108,13 +108,13 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
         if ( isEnabled() || !lv ) 
             p->setPen( cg.highlightedText() );
         else if ( !isEnabled() && lv)
-            p->setPen( lv->palette().disabled().highlightedText() );
+            p->setPen( lv->tqpalette().disabled().highlightedText() );
     } 
     {
         if ( isEnabled() || !lv )
             p->setPen( cg.text() );
         else if ( !isEnabled() && lv)
-            p->setPen( lv->palette().disabled().text() );
+            p->setPen( lv->tqpalette().disabled().text() );
 
 
         int iconWidth = 0;
@@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
             else if ( align & AlignTop )
                 yo = 0;
 
-// respect horizontal alignment when there is no text for an item.
+// respect horizontal tqalignment when there is no text for an item.
             if ( t.isEmpty() ) {
                 if ( align & AlignRight )
                     xo = width - 2 * marg - iconWidth;
@@ -193,7 +193,7 @@ int FancyListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int
         if ( pm )
             width += pm->width() + lv->itemMargin();
         
-        width =  QMAX( width, TQApplication::globalStrut().width() );
+        width =  TQMAX( width, TQApplication::globalStrut().width() );
     }
     else
         width = TQListViewItem::width(fm, lv, column);
diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h
index ab8b3310..9673d8cc 100644
--- a/lib/widgets/fancylistviewitem.h
+++ b/lib/widgets/fancylistviewitem.h
@@ -53,7 +53,7 @@ class TextPaintStyleStore {
         }
         
         Item& getStyle( int num ) {
-            Store::Iterator it = m_styles.find( num );
+            Store::Iterator it = m_styles.tqfind( num );
             if( it != m_styles.end() ) return *it;
             return m_styles[0];
         }
@@ -67,7 +67,7 @@ class TextPaintStyleStore {
         }
         
         bool hasStyle( int num ) {
-            Store::Iterator it = m_styles.find( num );
+            Store::Iterator it = m_styles.tqfind( num );
             return ( it != m_styles.end() );
         }
         
@@ -124,11 +124,11 @@ class TextPaintItem {
 class FancyListViewItem : public KListViewItem
 {
     public:
-        FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) {
+        FancyListViewItem(TextPaintStyleStore& styles, TQListView *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) {
             init(label1, label2);
         }
         
-        FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) {
+        FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) {
             init(label1, label2);
         }
         
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index e109a36d..53a9af77 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -35,8 +35,8 @@
 
 #include "flagboxes.h"
 
-// partial copy of Qt-3.1 for back-compatibility to KDE-3.0
-TQString QRegExp_escape( const TQString& str )
+// partial copy of TQt-3.1 for back-compatibility to KDE-3.0
+TQString TQRegExp_escape( const TQString& str )
 {
     static const char meta[] = "$()*+.?[\\]^{|}";
     TQString quoted = str;
@@ -51,47 +51,47 @@ TQString QRegExp_escape( const TQString& str )
 }
 
 
-class FlagListToolTip : public QToolTip
+class FlagListToolTip : public TQToolTip
 {
 public:
-    FlagListToolTip(TQWidget *parent);
+    FlagListToolTip(TQWidget *tqparent);
 protected:
     void maybeTip(const TQPoint &p);
 };
 
 
-FlagListToolTip::FlagListToolTip(TQWidget *parent)
-    : TQToolTip(parent)
+FlagListToolTip::FlagListToolTip(TQWidget *tqparent)
+    : TQToolTip(tqparent)
 {}
 
 
 void FlagListToolTip::maybeTip(const TQPoint &pos)
 {
-    FlagListBox *listbox = static_cast<FlagListBox*>(parentWidget());
+    FlagListBox *listbox = static_cast<FlagListBox*>(tqparentWidget());
     TQListViewItem *item = listbox->itemAt(pos);
     FlagListItem *flitem = static_cast<FlagListItem*>(item);
 
     if (item)
-        tip(listbox->itemRect(item), flitem->desc);
+        tip(listbox->tqitemRect(item), flitem->desc);
 }
 
 
-FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr,
+FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr,
                            const TQString &description)
-    : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox),
+    : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox),
       flag(flagstr), desc(description)
 {}
 
 
-FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr,
+FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr,
                            const TQString &description, const TQString &offstr)
-    : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox),
+    : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox),
       flag(flagstr), off(offstr), desc(description)
 {}
 
 
-FlagListBox::FlagListBox(TQWidget *parent, const char *name)
-    : TQListView(parent, name)
+FlagListBox::FlagListBox(TQWidget *tqparent, const char *name)
+    : TQListView(tqparent, name)
 {
     setResizeMode(LastColumn);
     header()->hide();
@@ -105,12 +105,12 @@ void FlagListBox::readFlags(TQStringList *list)
     TQListViewItem *item = firstChild();
     for (; item; item = item->nextSibling()) {
         FlagListItem *flitem = static_cast<FlagListItem*>(item);
-        TQStringList::Iterator sli = list->find(flitem->flag);
+        TQStringList::Iterator sli = list->tqfind(flitem->flag);
         if (sli != list->end()) {
             flitem->setOn(true);
             list->remove(sli);
         }
-        sli = list->find(flitem->off);
+        sli = list->tqfind(flitem->off);
         if (sli != list->end()) {
             flitem->setOn(false);
             list->remove(sli);
@@ -130,28 +130,28 @@ void FlagListBox::writeFlags(TQStringList *list)
 }
 
 
-FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller,
                            const TQString &flagstr, const TQString &description)
-    : TQCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false)
+    : TQCheckBox(description, tqparent), flag(flagstr), includeOff(false), useDef(false), defSet(false)
 {
     TQToolTip::add(this, flagstr);
     controller->addCheckBox(this);
 }
 
 
-FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller,
                            const TQString &flagstr, const TQString &description,
                            const TQString &offstr)
-    : TQCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false)
+    : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false)
 {
     TQToolTip::add(this, flagstr);
     controller->addCheckBox(this);
 }
 
-FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller,
                            const TQString &flagstr, const TQString &description,
                            const TQString &offstr, const TQString &defstr)
-    : TQCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false)
+    : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false)
 {
     TQToolTip::add(this, flagstr);
     controller->addCheckBox(this);
@@ -205,13 +205,13 @@ void FlagCheckBoxController::readFlags(TQStringList *list)
     TQPtrListIterator<FlagCheckBox> it(cblist);
     for (; it.current(); ++it) {
         FlagCheckBox *fitem = it.current();
-        TQStringList::Iterator sli = list->find(fitem->flag);
+        TQStringList::Iterator sli = list->tqfind(fitem->flag);
         if (sli != list->end()) {
             fitem->setChecked(true);
             fitem->useDef = false;
             list->remove(sli);
         }
-        sli = list->find(fitem->off);
+        sli = list->tqfind(fitem->off);
         if (sli != list->end()) {
             fitem->setChecked(false);
             fitem->includeOff = true;
@@ -270,13 +270,13 @@ void FlagPathEditController::readFlags( TQStringList * list )
             if ((*sli).startsWith(peitem->flag))
             {
 //                kdDebug() << "Processing.." << endl;
-                peitem->setText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),""));
+                peitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
              ++sli;
         }
-/*        TQStringList::Iterator sli = list->find(peitem->flag);
+/*        TQStringList::Iterator sli = list->tqfind(peitem->flag);
         if (sli != list->end()) {
             peitem->setText((*sli).remove(peitem->flag));
             list->remove(sli);
@@ -299,29 +299,29 @@ void FlagPathEditController::addPathEdit( FlagPathEdit * item )
     plist.append(item);
 }
 
-FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter,
+FlagPathEdit::FlagPathEdit( TQWidget * tqparent, TQString pathDelimiter,
     FlagPathEditController * controller, const TQString & flagstr, const TQString & description,
     KFile::Mode mode )
-    : TQWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description)
+    : TQWidget(tqparent), delimiter(pathDelimiter), flag(flagstr), m_description(description)
 {
     TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
     topLayout->addWidget(new TQLabel(description, this));
-    TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 
     if (delimiter.isEmpty())
     {
         url = new KURLRequester(this);
         url->setMode(mode);
-        layout->addWidget(url);
+        tqlayout->addWidget(url);
     }
     else
     {
         edit = new KLineEdit(this);
-        layout->addWidget(edit);
+        tqlayout->addWidget(edit);
         details = new TQPushButton("...", this);
         details->setMaximumWidth(30);
         connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails()));
-        layout->addWidget(details);
+        tqlayout->addWidget(details);
     }
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@@ -379,8 +379,8 @@ bool FlagPathEdit::isEmpty( )
         return edit->text().isEmpty();
 }
 
-FlagRadioButton::FlagRadioButton( TQWidget * parent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description )
-    : TQRadioButton(description, parent), flag(flagstr)
+FlagRadioButton::FlagRadioButton( TQWidget * tqparent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description )
+    : TQRadioButton(description, tqparent), flag(flagstr)
 {
     TQToolTip::add(this, flagstr);
     controller->addRadioButton(this);
@@ -433,7 +433,7 @@ void FlagRadioButtonController::readFlags(TQStringList *list)
     TQPtrListIterator<FlagRadioButton> it(cblist);
     for (; it.current(); ++it) {
         FlagRadioButton *fitem = it.current();
-        TQStringList::Iterator sli = list->find(fitem->flag);
+        TQStringList::Iterator sli = list->tqfind(fitem->flag);
         if (sli != list->end()) {
             fitem->setChecked(true);
             list->remove(sli);
@@ -471,7 +471,7 @@ void FlagEditController::readFlags( TQStringList * list )
         {
             if ((*sli).startsWith(peitem->flag))
             {
-                peitem->appendText((*sli).replace(TQRegExp(QRegExp_escape(peitem->flag)),""));
+                peitem->appendText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
@@ -489,7 +489,7 @@ void FlagEditController::readFlags( TQStringList * list )
         {
             if ((*sli).startsWith(sitem->flag))
             {
-                sitem->setText((*sli).replace(TQRegExp(QRegExp_escape(sitem->flag)),""));
+                sitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(sitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
@@ -526,22 +526,22 @@ void FlagEditController::addSpinBox(FlagSpinEdit *item)
 }
 
 
-FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditController * controller,
+FlagListEdit::FlagListEdit( TQWidget * tqparent, TQString listDelimiter, FlagEditController * controller,
     const TQString & flagstr, const TQString & description)
-    : TQWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description)
+    : TQWidget(tqparent), delimiter(listDelimiter), flag(flagstr), m_description(description)
 {
     TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
     topLayout->addWidget(new TQLabel(description, this));
-    TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+    TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 
     edit = new KLineEdit(this);
-    layout->addWidget(edit);
+    tqlayout->addWidget(edit);
     if (! listDelimiter.isEmpty())
     {
         details = new TQPushButton("...", this);
         details->setMaximumWidth(30);
         connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails()));
-        layout->addWidget(details);
+        tqlayout->addWidget(details);
     }
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@@ -601,8 +601,8 @@ TQStringList FlagListEdit::flags( )
     return fl;
 }
 
-FlagSpinEdit::FlagSpinEdit( TQWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description )
-    :TQWidget(parent), m_defaultVal(defaultVal), flag(flagstr)
+FlagSpinEdit::FlagSpinEdit( TQWidget * tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description )
+    :TQWidget(tqparent), m_defaultVal(defaultVal), flag(flagstr)
 {
     TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
     topLayout->addWidget(new TQLabel(description, this));
@@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text )
 
 TQString FlagSpinEdit::text( )
 {
-    return TQString("%1").arg(spb->value());
+    return TQString("%1").tqarg(spb->value());
 }
 
 TQString FlagSpinEdit::flags( )
diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h
index e45d8230..a2193277 100644
--- a/lib/widgets/flagboxes.h
+++ b/lib/widgets/flagboxes.h
@@ -46,12 +46,12 @@ class TQPushButton;
 class KURLRequester;
 
 /**List item holding a compiler flag.*/
-class FlagListItem : public QCheckListItem
+class FlagListItem : public TQCheckListItem
 {
 public:
-    FlagListItem(FlagListBox *parent, const TQString &flagstr,
+    FlagListItem(FlagListBox *tqparent, const TQString &flagstr,
                  const TQString &description);
-    FlagListItem(FlagListBox *parent, const TQString &flagstr,
+    FlagListItem(FlagListBox *tqparent, const TQString &flagstr,
                  const TQString &description, const TQString &offstr);
     ~FlagListItem()
         {}
@@ -65,11 +65,12 @@ private:
 
 
 /**List box item holding a compiler flag.*/
-class FlagListBox : public QListView
+class FlagListBox : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FlagListBox( TQWidget *parent=0, const char *name=0 );
+    FlagListBox( TQWidget *tqparent=0, const char *name=0 );
     ~FlagListBox()
         {}
 
@@ -79,16 +80,17 @@ public:
 
 
 /**Check box item holding a compiler flag.*/
-class FlagCheckBox : public QCheckBox
+class FlagCheckBox : public TQCheckBox
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+    FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller,
                  const TQString &flagstr, const TQString &description);
-    FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+    FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller,
                  const TQString &flagstr, const TQString &description,
                  const TQString &offstr);
-    FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller,
+    FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller,
                  const TQString &flagstr, const TQString &description,
                  const TQString &offstr, const TQString &defstr);
     ~FlagCheckBox()
@@ -105,11 +107,12 @@ private:
 };
 
 /**Radiobutton item holding an option of a compiler flag.*/
-class FlagRadioButton : public QRadioButton
+class FlagRadioButton : public TQRadioButton
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller,
+    FlagRadioButton(TQWidget *tqparent, FlagRadioButtonController *controller,
                  const TQString &flagstr, const TQString &description);
     ~FlagRadioButton()
         {}
@@ -120,12 +123,13 @@ private:
 };
 
 /**Path editor if path is a compiler flag.*/
-class FlagPathEdit: public QWidget
+class FlagPathEdit: public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**If the pathDelimiter is not empty then path edit can contain a list of paths*/
-    FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller,
+    FlagPathEdit(TQWidget *tqparent, TQString pathDelimiter, FlagPathEditController *controller,
                  const TQString &flagstr, const TQString &description, KFile::Mode mode = KFile::Directory);
 
     ~FlagPathEdit() {}
@@ -149,12 +153,13 @@ private:
 };
 
 /**List editor if list is a compiler flag.*/
-class FlagListEdit: public QWidget
+class FlagListEdit: public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**If the listDelimiter is not empty then list edit can contain a list of entries*/
-    FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller,
+    FlagListEdit(TQWidget *tqparent, TQString listDelimiter, FlagEditController *controller,
                  const TQString &flagstr, const TQString &description);
 
     ~FlagListEdit() {}
@@ -179,10 +184,10 @@ private:
 };
 
 /**Spin editor of a compiler flag.*/
-class FlagSpinEdit: public QWidget
+class FlagSpinEdit: public TQWidget
 {
 public:
-    FlagSpinEdit(TQWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller,
+    FlagSpinEdit(TQWidget *tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller,
                  const TQString &flagstr, const TQString &description);
     ~FlagSpinEdit() {}
 
diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp
index 2576ed0c..ad4cd188 100644
--- a/lib/widgets/kcomboview.cpp
+++ b/lib/widgets/kcomboview.cpp
@@ -25,8 +25,8 @@
 #include "kcomboview.h"
 
 
-KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* name , CustomCompleter* comp)
-    :QComboView(rw, parent, name),  m_comp( comp ), m_defaultWidth(defaultWidth)
+KComboView::KComboView( bool rw, int defaultWidth, TQWidget* tqparent, const char* name , CustomCompleter* comp)
+    :QComboView(rw, tqparent, name),  m_comp( comp ), m_defaultWidth(defaultWidth)
 {
     if (rw)
     {
diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h
index e0230b52..e73b73e6 100644
--- a/lib/widgets/kcomboview.h
+++ b/lib/widgets/kcomboview.h
@@ -55,9 +55,10 @@ class CustomCompleter : public KCompletion {
 class KComboView: public QComboView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ///The combo-view takes the ownership of the completer and deletes it on destruction
-    KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() );
+    KComboView( bool rw, int defaultWidth = 100, TQWidget* tqparent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() );
     virtual ~KComboView();
 
     virtual void addItem(TQListViewItem *it);
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index c99dcf36..5bda3bed 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -97,7 +97,7 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
   if (!url.isEmpty() && (m_options & CanOpenInNewWindow))
   {
     idNewWindow = popup.insertItem(SmallIcon("window_new"),i18n("Open in New Tab"));
-    popup.setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window."));
+    popup.TQMenuData::setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window."));
     needSep = true;
   }
   if (m_options & CanDuplicate)
@@ -254,7 +254,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
 {
   // check for environment variables and make necessary translations
   TQString path = url;
-  int nDollarPos = path.find( '$' );
+  int nDollarPos = path.tqfind( '$' );
 
   // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;)
   while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) {
@@ -275,7 +275,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
          result = ts.read().stripWhiteSpace();
          pclose(fs);
       }
-      path.replace( nDollarPos, nEndPos-nDollarPos, result );
+      path.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
     } else if( (path)[nDollarPos+1] != '$' ) {
       uint nEndPos = nDollarPos+1;
       // the next character is no $
@@ -302,9 +302,9 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
         // A environment variables may contain values in 8bit
         // locale cpecified encoding or in UTF8 encoding.
         if (isUtf8( pEnv ))
-            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
+            path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
         else
-            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
+            path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
       } else
       path.remove( nDollarPos, nEndPos-nDollarPos );
     } else {
@@ -312,7 +312,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
       path.remove( nDollarPos, 1 );
       nDollarPos++;
     }
-    nDollarPos = path.find( '$', nDollarPos );
+    nDollarPos = path.tqfind( '$', nDollarPos );
   }
 
   return path;
@@ -494,8 +494,8 @@ void KDevHTMLPart::addHistoryEntry()
 void KDevHTMLPart::slotCopy( )
 {
     TQString text = selectedText();
-    text.replace( TQChar( 0xa0 ), ' ' );
-    QClipboard *cb = TQApplication::clipboard();
+    text.tqreplace( TQChar( 0xa0 ), ' ' );
+    TQClipboard *cb = TQApplication::tqclipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 4a03eec9..22da1d65 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -44,6 +44,7 @@ It has it's own popup menu and font/zoom settings.
 class KDevHTMLPart : public KHTMLPart
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index a7d12348..4631f16a 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -18,7 +18,7 @@
 
 #include "kdevtabwidget.h"
 
-KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name)
+KDevTabWidget::KDevTabWidget(TQWidget *tqparent, const char *name) : TQTabWidget(tqparent,name)
 {
   m_pTabBar = new KTabBar(this, "tabbar");
   setTabBar(m_pTabBar);
@@ -26,7 +26,7 @@ KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(p
   connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*)));
 }
 
-KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name)
+KTabBar::KTabBar(TQWidget *tqparent, const char *name) : TQTabBar(tqparent,name)
 {
   m_pPopupMenu = new TQPopupMenu(this);
 
@@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e)
     TQTab *tab = selectTab(e->pos() );
     if( tab == 0L ) return;
     
-    m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) );
+    m_pPage = ((KDevTabWidget*)tqparent())->page(indexOf(tab->identifier() ) );
     if(m_pPage == 0L) return;
 
     m_pPopupMenu->exec(mapToGlobal(e->pos()));
diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp
index 0a219da5..f439de6b 100644
--- a/lib/widgets/klistviewaction.cpp
+++ b/lib/widgets/klistviewaction.cpp
@@ -38,8 +38,8 @@ KListViewAction::~KListViewAction()
 }
 
 KListViewAction::KListViewAction(KComboView *view, const TQString & text, const KShortcut & cut,
-    const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name ):
-    KWidgetAction(view, text, cut, receiver, slot, parent, name), m_view(view)
+    const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name ):
+    KWidgetAction(view, text, cut, receiver, slot, tqparent, name), m_view(view)
 {
     m_view->setDuplicatesEnabled(false);
     m_view->setInsertionPolicy(KComboView::NoInsertion);
@@ -48,8 +48,8 @@ KListViewAction::KListViewAction(KComboView *view, const TQString & text, const
 }
 
 KListViewAction::KListViewAction( KComboView * view, const TQString & text, const KShortcut & cut,
-    const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ):
-    KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, parent, name), m_view(view)
+    const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name, const bool /*dummy*/ ):
+    KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, tqparent, name), m_view(view)
 {
     m_view->setDuplicatesEnabled(false);
     m_view->setInsertionPolicy(KComboView::NoInsertion);
diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h
index d8f53eb8..0334ec30 100644
--- a/lib/widgets/klistviewaction.h
+++ b/lib/widgets/klistviewaction.h
@@ -38,8 +38,8 @@ Can be used on toolbars. It appears as @ref ResizableCombo.
 class KListViewAction: public KWidgetAction
 {
 public:
-    KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name);
-    KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool);
+    KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name);
+    KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name, const bool);
 
     ~KListViewAction();
 
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index 8ddb5c89..ab267ff2 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -32,7 +32,7 @@
 namespace
 {
 
-class CheckURL : public QCheckListItem
+class CheckURL : public TQCheckListItem
 {
 public:
 	CheckURL( TQListView * lv, KURL const & url )
@@ -49,8 +49,8 @@ private:
 }
 
 
-KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) :
-  KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"),
+KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ) :
+  KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"),
 	       Ok | User1 | Close )
 {
   TQVBox *top = makeVBoxMainWidget();
@@ -62,7 +62,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
 	_listview->header()->hide();
 	_listview->setResizeMode( TQListView::LastColumn );
 
-	setButtonOK( KGuiItem(i18n("Save &Selected"), TQString::null, i18n("Saves all selected files")) );
+	setButtonOK( KGuiItem(i18n("Save &Selected"), TQString(), i18n("Saves all selected files")) );
 	setButtonText( User1, i18n("Save &None") );
 	setButtonText( Close, KStdGuiItem::cancel().text() );
 	setButtonTip( User1, i18n("Lose all modifications") );
@@ -71,7 +71,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
 	KURL::List::ConstIterator it = filelist.begin();
 	while ( it != filelist.end() )
 	{
-		if ( !ignorelist.contains( *it ) )
+		if ( !ignorelist.tqcontains( *it ) )
 		{
 			TQCheckListItem * x = new CheckURL( _listview, *it );
 			x->setOn( true );
@@ -140,8 +140,8 @@ KURL::List KSaveSelectDialog::filesNotToSave( )
 }
 
 
-KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) :
-  KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"),
+KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ) :
+  KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"),
 	       Ok | User1 | Close )
 {
   m_result = Cancel;
@@ -153,7 +153,7 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent
   lb->setMinimumHeight( lb->fontMetrics().height() * 5 );
   lb->insertStringList( filenames );
 
-  setButtonOK( KGuiItem(i18n("Save &All"), TQString::null, i18n("Saves all modified files")) );
+  setButtonOK( KGuiItem(i18n("Save &All"), TQString(), i18n("Saves all modified files")) );
   setButtonText( User1, i18n("Save &None") );
   setButtonText( Close, KStdGuiItem::cancel().text() );
   setButtonTip( User1, i18n("Lose all modifications") );
diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h
index c6592b4a..091a3ae0 100644
--- a/lib/widgets/ksavealldialog.h
+++ b/lib/widgets/ksavealldialog.h
@@ -36,9 +36,10 @@ Dialog to save selected files.
 class KSaveSelectDialog : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 	
 public:
-	KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent );
+	KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent );
 	virtual ~KSaveSelectDialog();
 	
 	KURL::List filesToSave();
@@ -61,11 +62,12 @@ Dialog to save all files.
 class KSaveAllDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum SaveAllResult{ SaveAll, Cancel, Revert };
 
-  KSaveAllDialog( const TQStringList& filenames, TQWidget* parent );
+  KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent );
   virtual ~KSaveAllDialog();
 
   SaveAllResult result() const { return m_result; }
diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp
index 8fdbc5d2..ad5f307c 100644
--- a/lib/widgets/processlinemaker.cpp
+++ b/lib/widgets/processlinemaker.cpp
@@ -39,7 +39,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer )
 {
     stdoutbuf += buffer;
     int pos;
-    while ( (pos = stdoutbuf.find('\n')) != -1) {
+    while ( (pos = stdoutbuf.tqfind('\n')) != -1) {
         TQCString line = stdoutbuf.left( pos );
         emit receivedStdoutLine(line);
         stdoutbuf.remove(0, pos+1);
@@ -60,7 +60,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer )
 {
     stderrbuf += buffer;
     int pos;
-    while ( (pos = stderrbuf.find('\n')) != -1) {
+    while ( (pos = stderrbuf.tqfind('\n')) != -1) {
         TQCString line = stderrbuf.left( pos );
         emit receivedStderrLine(line);
         stderrbuf.remove(0, pos+1);
diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h
index d124e2ed..cf5e78e4 100644
--- a/lib/widgets/processlinemaker.h
+++ b/lib/widgets/processlinemaker.h
@@ -32,9 +32,10 @@ class KProcess;
 /**
 Convenience class to catch output of KProcess.
 */
-class ProcessLineMaker : public QObject
+class ProcessLineMaker : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	ProcessLineMaker();
@@ -64,4 +65,4 @@ private:
 
 #endif
 
-//kate: replace-tabs off; indent-spaces off;
+//kate: tqreplace-tabs off; indent-spaces off;
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index a49a1078..66796266 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -33,9 +33,9 @@ ProcessListBoxItem::ProcessListBoxItem(const TQString &s, Type type)
     : TQListBoxText(s), t(type)
 {
     TQString clean = s;
-    clean.replace( TQChar('\t'), TQString("  ") );
-    clean.replace( TQChar('\n'), TQString() );
-    clean.replace( TQChar('\r'), TQString() );
+    clean.tqreplace( TQChar('\t'), TQString("  ") );
+    clean.tqreplace( TQChar('\n'), TQString() );
+    clean.tqreplace( TQChar('\r'), TQString() );
     setText( clean );
 
     setCustomHighlighting(true);
@@ -66,14 +66,14 @@ TQColor ProcessListBoxItem::blend(const TQColor &c1, const TQColor &c2, double k
     int g = normalize((int)blend1((double)c1.green(), (double)c2.green(), k));
     int b = normalize((int)blend1((double)c1.blue(),  (double)c2.blue(),  k));
 
-    return TQColor(qRgb(r, g, b));
+    return TQColor(tqRgb(r, g, b));
 }
 
 void ProcessListBoxItem::paint(TQPainter *p)
 {
     TQColor dim, warn, err, back;
     if (listBox()) {
-        const TQColorGroup& group = listBox()->palette().active();
+        const TQColorGroup& group = listBox()->tqpalette().active();
         if (isSelected()) {
             back = group.button();
             warn = group.buttonText();
@@ -88,13 +88,13 @@ void ProcessListBoxItem::paint(TQPainter *p)
     }
     else
     {
-        warn = Qt::black;
-        dim = Qt::darkBlue;
-        err = Qt::darkRed;
+        warn = TQt::black;
+        dim = TQt::darkBlue;
+        err = TQt::darkRed;
         if (isSelected())
-            back = Qt::lightGray;
+            back = TQt::lightGray;
         else
-            back = Qt::white;
+            back = TQt::white;
     }
     p->fillRect(p->window(), TQBrush(back));
     p->setPen((t==Error)? err :
@@ -103,10 +103,10 @@ void ProcessListBoxItem::paint(TQPainter *p)
 }
 
 
-ProcessWidget::ProcessWidget(TQWidget *parent, const char *name)
-    : KListBox(parent, name)
+ProcessWidget::ProcessWidget(TQWidget *tqparent, const char *name)
+    : KListBox(tqparent, name)
 {
-    setFocusPolicy(TQWidget::NoFocus);
+    setFocusPolicy(TQ_NoFocus);
 
     // Don't override the palette, as that can mess up styles. Instead, draw
     // the background ourselves (see ProcessListBoxItem::paint).
@@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status)
 
     if (normal) {
         if (status) {
-            s = i18n("*** Exited with status: %1 ***").arg(status);
+            s = i18n("*** Exited with status: %1 ***").tqarg(status);
             t = ProcessListBoxItem::Error;
         } else {
             s = i18n("*** Exited normally ***");
@@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status)
 }
 
 
-TQSize ProcessWidget::minimumSizeHint() const
+TQSize ProcessWidget::tqminimumSizeHint() const
 {
-    // I'm not sure about this, but when I don't use override minimumSizeHint(),
+    // I'm not sure about this, but when I don't use override tqminimumSizeHint(),
     // the initial size in clearly too small
 
-    return TQSize( TQListBox::sizeHint().width(),
+    return TQSize( TQListBox::tqsizeHint().width(),
                   (fontMetrics().lineSpacing()+2)*4 );
 }
 
diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h
index ee1a6012..e4ef0c5d 100644
--- a/lib/widgets/processwidget.h
+++ b/lib/widgets/processwidget.h
@@ -33,7 +33,7 @@ class ProcessLineMaker;
 /**
 Listbox item for process widgets.
 */
-class ProcessListBoxItem : public QListBoxText
+class ProcessListBoxItem : public TQListBoxText
 {
 public:
     enum Type { Diagnostic, Normal, Error };
@@ -58,9 +58,10 @@ private:
 class ProcessWidget : public KListBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ProcessWidget(TQWidget *parent, const char *name=0);
+    ProcessWidget(TQWidget *tqparent, const char *name=0);
     ~ProcessWidget();
 
     /**
@@ -108,7 +109,7 @@ signals:
     void rowSelected(int row);
 
 protected:
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
     void maybeScrollToBottom();
 
 protected slots:
diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox
index 6bc81be0..1f98b4ac 100644
--- a/lib/widgets/propeditor/Mainpage.dox
+++ b/lib/widgets/propeditor/Mainpage.dox
@@ -56,7 +56,7 @@ called @ref PropertyLib::PropertyMachineFactory. Static function @ref PropertyLi
 can be used to obtain the reference to the factory instance. Factory creates and returns
 so-called @ref PropertyLib::Machine for each registered property type (either predefined or user defined).
 
-@ref PropertyLib::Machine contains @ref PropertyLib::PropertyWidget and a list of "detailed" machines.
+@ref PropertyLib::Machine tqcontains @ref PropertyLib::PropertyWidget and a list of "detailed" machines.
 Usually only property widget is necessary for a property but there are 
 complex properties like "Font" for example. We would like to see separate editors
 for font family, size, etc. and a button to choose all of these in the dialog.
diff --git a/lib/widgets/propeditor/childproperty.cpp b/lib/widgets/propeditor/childproperty.cpp
index ac53936a..aa1326c9 100644
--- a/lib/widgets/propeditor/childproperty.cpp
+++ b/lib/widgets/propeditor/childproperty.cpp
@@ -28,16 +28,16 @@
 
 namespace PropertyLib{
 
-ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name,
+ChildProperty::ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name,
     const TQString &description, const TQVariant &value, bool save, bool readOnly)
-    :Property(type, name, description, value, save, readOnly), m_parent(parent), m_childType(childType)
+    :Property(type, name, description, value, save, readOnly), m_parent(tqparent), m_childType(childType)
 {
 }
 
-ChildProperty::ChildProperty(MultiProperty *parent, const TQString & name, ChildPropertyType childType,
+ChildProperty::ChildProperty(MultiProperty *tqparent, const TQString & name, ChildPropertyType childType,
     const TQMap<TQString, TQVariant> &v_valueList, const TQString &description,
     const TQVariant &value, bool save, bool readOnly)
-    :Property(name, v_valueList, description, value, save, readOnly), m_parent(parent), m_childType(childType)
+    :Property(name, v_valueList, description, value, save, readOnly), m_parent(tqparent), m_childType(childType)
 {
 }
 
diff --git a/lib/widgets/propeditor/childproperty.h b/lib/widgets/propeditor/childproperty.h
index 6e247fd3..0d1655ae 100644
--- a/lib/widgets/propeditor/childproperty.h
+++ b/lib/widgets/propeditor/childproperty.h
@@ -29,7 +29,7 @@ class MultiProperty;
 /**
 @short Child property
 
-Child property is a detailed property for complex parent properties.
+Child property is a detailed property for complex tqparent properties.
 For example, to edit a property of Point type one can request two
 child properties for "x" and "y" components of a point.
 
@@ -60,11 +60,11 @@ public:
     /**Constructs empty property.*/
     ChildProperty() {}
     /**Constructs property.*/
-    ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name,
+    ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name,
         const TQString &description, const TQVariant &value = TQVariant(),
         bool save = true, bool readOnly = false);
     /**Constructs property with @ref ValueFromList type.*/
-    ChildProperty(MultiProperty *parent, const TQString &name, ChildPropertyType childType,
+    ChildProperty(MultiProperty *tqparent, const TQString &name, ChildPropertyType childType,
         const TQMap<TQString, TQVariant> &v_valueList, const TQString &description,
         const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false);
 
diff --git a/lib/widgets/propeditor/multiproperty.cpp b/lib/widgets/propeditor/multiproperty.cpp
index 9c3b04c4..ac1cb0fb 100644
--- a/lib/widgets/propeditor/multiproperty.cpp
+++ b/lib/widgets/propeditor/multiproperty.cpp
@@ -47,7 +47,7 @@ TQString MultiProperty::name() const
 {
     if (list.count() >= 1)
         return list.getFirst()->name();
-    return TQString::null;   
+    return TQString();   
 }
 
 int MultiProperty::type() const
@@ -86,7 +86,7 @@ TQString MultiProperty::description() const
     while ((property = it.current()) != 0)
     {
         if (property->description() != description)
-            return TQString::null;
+            return TQString();
         ++it;
     }
 
diff --git a/lib/widgets/propeditor/multiproperty.h b/lib/widgets/propeditor/multiproperty.h
index 49410a04..2330ffa0 100644
--- a/lib/widgets/propeditor/multiproperty.h
+++ b/lib/widgets/propeditor/multiproperty.h
@@ -43,7 +43,7 @@ with many properties of the same name and type at the same type.
 
 MultiProperty is also responsible for storing detailed %property editors (instances
 of @ref ChildProperty class. It's too much overhead to store child properties
-with their parent properties. MultiProperty provides a way to store child properties
+with their tqparent properties. MultiProperty provides a way to store child properties
 only once for all properties with the same name and same type.
 */
 class MultiProperty
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index 3f406e4d..e4a14389 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -31,12 +31,12 @@
 
 namespace PropertyLib{
 
-PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PCheckBox::PCheckBox(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQCheckBox(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
@@ -64,9 +64,9 @@ void PCheckBox::updateProperty(bool val)
 void PCheckBox::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setBrush(cg.background());
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toBool() ? i18n("true") : i18n("false"));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toBool() ? i18n("true") : i18n("false"));
 }
 
 }
diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h
index b2fffc8e..5e593588 100644
--- a/lib/widgets/propeditor/pcheckbox.h
+++ b/lib/widgets/propeditor/pcheckbox.h
@@ -31,8 +31,9 @@ namespace PropertyLib{
 */
 class PCheckBox: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PCheckBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp
index 9609442f..aef37f4a 100644
--- a/lib/widgets/propeditor/pcolorbutton.cpp
+++ b/lib/widgets/propeditor/pcolorbutton.cpp
@@ -33,8 +33,8 @@
 
 namespace PropertyLib {
 
-PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name)
+PColorButton::PColorButton(MultiProperty* property, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
@@ -45,7 +45,7 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char
     connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor()));
 #endif
 
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 }
 
@@ -61,14 +61,14 @@ TQVariant PColorButton::value() const
 void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
 /*    p->setBrush(value.toColor());
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->drawRect(r);*/
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
 
     p->setBrush(value.toColor());
-    p->setPen(Qt::SolidLine);
+    p->setPen(TQt::SolidLine);
     TQRect r2(r);
     r2.setTopLeft(r.topLeft() + TQPoint(5,5));
     r2.setBottomRight(r.bottomRight() - TQPoint(5,5));
@@ -103,7 +103,7 @@ void PColorButton::updateProperty(const TQColor &// color
 void PColorButton::changeColor()
 {
 #ifdef PURE_QT
-   m_color = QColorDialog::getColor(m_color,this);
+   m_color = TQColorDialog::getColor(m_color,this);
    updateProperty(m_color);
    m_edit->setText(m_color.name());
    TQPixmap px;
diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h
index 8a18ab9c..a132f0ce 100644
--- a/lib/widgets/propeditor/pcolorbutton.h
+++ b/lib/widgets/propeditor/pcolorbutton.h
@@ -36,8 +36,9 @@ namespace PropertyLib{
 class PColorButton: public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PColorButton(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp
index eeac7de8..5fee6b1f 100644
--- a/lib/widgets/propeditor/pcolorcombo.cpp
+++ b/lib/widgets/propeditor/pcolorcombo.cpp
@@ -26,12 +26,12 @@
 
 namespace PropertyLib{
 
-PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PColorCombo::PColorCombo(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KColorCombo(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
@@ -58,12 +58,12 @@ void PColorCombo::updateProperty(int /*val*/)
 
 void PColorCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
     
     p->setBrush(value.toColor());
-    p->setPen(Qt::SolidLine);
+    p->setPen(TQt::SolidLine);
     TQRect r2(r);
     r2.setTopLeft(r.topLeft() + TQPoint(5,5));
     r2.setBottomRight(r.bottomRight() - TQPoint(5,5));
diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h
index 68f19e58..88c5b355 100644
--- a/lib/widgets/propeditor/pcolorcombo.h
+++ b/lib/widgets/propeditor/pcolorcombo.h
@@ -31,8 +31,9 @@ namespace PropertyLib{
 */
 class PColorCombo: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PColorCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp
index 958ba34d..18cad9b6 100644
--- a/lib/widgets/propeditor/pcombobox.cpp
+++ b/lib/widgets/propeditor/pcombobox.cpp
@@ -24,14 +24,14 @@
 
 namespace PropertyLib{
 
-PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name), m_valueList(list)
+PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name), m_valueList(list)
 {
     init(false);
 }
 
-PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name), m_valueList(list)
+PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name), m_valueList(list)
 {
     init(rw);
 }
@@ -40,7 +40,7 @@ void PComboBox::init(bool rw)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQComboBox(rw, this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     fillBox();
@@ -58,7 +58,7 @@ void PComboBox::fillBox()
 
 TQVariant PComboBox::value() const
 {
-    TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText());
+    TQMap<TQString, TQVariant>::const_iterator it = m_valueList.tqfind(m_edit->currentText());
     if (it == m_valueList.end())
         return TQVariant("");
     return TQVariant(it.data());
@@ -66,11 +66,7 @@ TQVariant PComboBox::value() const
 
 void PComboBox::setValue(const TQVariant &value, bool emitChange)
 {
-#if QT_VERSION >= 0x030100
     if (!value.isNull())
-#else
-    if (value.canCast(TQVariant::String))
-#endif
     {
         disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
         m_edit->setCurrentText(findDescription(value));
diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h
index 9f03407c..4176e2ed 100644
--- a/lib/widgets/propeditor/pcombobox.h
+++ b/lib/widgets/propeditor/pcombobox.h
@@ -35,11 +35,12 @@ namespace PropertyLib{
 */
 class PComboBox: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**This constructor is used for read-only selection combo. It provides a value from valueList*/
-    PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent = 0, const char *name = 0);
+    PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent = 0, const char *name = 0);
     /**This constructor is used for read-write selection combo. It provides a value from valueList*/
-    PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent = 0, const char *name = 0);
+    PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/pcursoredit.cpp b/lib/widgets/propeditor/pcursoredit.cpp
index 85aefd5e..02a2148c 100644
--- a/lib/widgets/propeditor/pcursoredit.cpp
+++ b/lib/widgets/propeditor/pcursoredit.cpp
@@ -24,8 +24,8 @@
 namespace PropertyLib{
 
 PCursorEdit::PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues,
-    TQWidget* parent, const char* name)
-    :PComboBox(property, spValues, parent, name)
+    TQWidget* tqparent, const char* name)
+    :PComboBox(property, spValues, tqparent, name)
 {
 }
 
diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h
index 6149bce7..82924fd2 100644
--- a/lib/widgets/propeditor/pcursoredit.h
+++ b/lib/widgets/propeditor/pcursoredit.h
@@ -30,9 +30,10 @@ namespace PropertyLib{
 class PCursorEdit: public PComboBox
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues,
-        TQWidget* parent = 0, const char* name = 0);
+        TQWidget* tqparent = 0, const char* name = 0);
 
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);   
 };
diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp
index 141eef20..46de4069 100644
--- a/lib/widgets/propeditor/pdateedit.cpp
+++ b/lib/widgets/propeditor/pdateedit.cpp
@@ -25,12 +25,12 @@
 
 namespace PropertyLib{
 
-PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name)
+PDateEdit::PDateEdit(MultiProperty* property, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
-    m_edit = new QDateEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit = new TQDateEdit(this);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
@@ -43,10 +43,10 @@ TQVariant PDateEdit::value() const
 
 void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDate().toString(Qt::LocalDate));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(Qt::LocalDate));
 }
 
 void PDateEdit::setValue(const TQVariant& value, bool emitChange)
diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h
index da458737..a21dbc3f 100644
--- a/lib/widgets/propeditor/pdateedit.h
+++ b/lib/widgets/propeditor/pdateedit.h
@@ -22,7 +22,7 @@
 
 #include "propertywidget.h"
 
-class QDateEdit;
+class TQDateEdit;
 
 namespace PropertyLib{
 
@@ -32,8 +32,9 @@ namespace PropertyLib{
 class PDateEdit : public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
+    PDateEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
@@ -43,7 +44,7 @@ private slots:
     void updateProperty(const TQDate &val);    
 
 private:
-    QDateEdit *m_edit;
+    TQDateEdit *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp
index 5e414c77..e7a4b04f 100644
--- a/lib/widgets/propeditor/pdatetimeedit.cpp
+++ b/lib/widgets/propeditor/pdatetimeedit.cpp
@@ -25,11 +25,11 @@
 
 namespace PropertyLib{
 
-PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
-    m_edit = new QDateTimeEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit = new TQDateTimeEdit(this);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
@@ -42,10 +42,10 @@ TQVariant PDateTimeEdit::value() const
 
 void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toDateTime().toString(Qt::LocalDate));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(Qt::LocalDate));
 }
 
 void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange)
diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h
index 40e8b428..e44c07d6 100644
--- a/lib/widgets/propeditor/pdatetimeedit.h
+++ b/lib/widgets/propeditor/pdatetimeedit.h
@@ -22,7 +22,7 @@
 
 #include "propertywidget.h"
 
-class QDateTimeEdit;
+class TQDateTimeEdit;
 
 namespace PropertyLib{
 
@@ -32,8 +32,9 @@ namespace PropertyLib{
 class PDateTimeEdit : public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
+    PDateTimeEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
@@ -43,7 +44,7 @@ private slots:
     void updateProperty(const TQDateTime &val);    
 
 private:
-    QDateTimeEdit *m_edit;
+    TQDateTimeEdit *m_edit;
 
 };
 
diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp
index df6b3bcb..742180b4 100644
--- a/lib/widgets/propeditor/pdoublenuminput.cpp
+++ b/lib/widgets/propeditor/pdoublenuminput.cpp
@@ -22,7 +22,7 @@
 #ifndef PURE_QT
 #include <knuminput.h>
 #else
-#include "qfloatinput.h"
+#include "tqfloatinput.h"
 #endif
 
 #include <limits.h>
@@ -31,19 +31,19 @@
 
 namespace PropertyLib{
 
-PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
     m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this);
-    m_edit->setLabel(TQString::null);
+    m_edit->setLabel(TQString());
     connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
 #else
-    m_edit = new QFloatInput(-999999, 999999, 0.01, 2, this );
+    m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this );
     connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
 #endif
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 /*    m_edit->setMinValue(-999999999);
     m_edit->setMaxValue(+999999999);
     m_edit->setPrecision(2);*/
@@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val)
 void PDoubleNumInput::updateProperty(int val)
 {
 #ifdef PURE_QT
-    TQString format = TQString("%.%1f").arg( m_edit->digits() );
+    TQString format = TQString("%.%1f").tqarg( m_edit->digits() );
     TQString strVal = TQString().sprintf(format.latin1(),
                                        (val/(float)pow(m_edit->digits(),10)) );
     emit propertyChanged(m_property, TQVariant(strVal));
diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h
index 83849335..a59ae43d 100644
--- a/lib/widgets/propeditor/pdoublenuminput.h
+++ b/lib/widgets/propeditor/pdoublenuminput.h
@@ -25,7 +25,7 @@
 #ifndef PURE_QT
 class KDoubleNumInput;
 #else
-class QFloatInput;
+class TQFloatInput;
 #endif
 
 namespace PropertyLib{
@@ -36,8 +36,9 @@ namespace PropertyLib{
 class PDoubleNumInput: public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PDoubleNumInput(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
@@ -46,7 +47,7 @@ public:
     virtual void setValue(const TQVariant &value, bool emitChange=true);
 
 private slots:
-    //because of a bug in moc which doesn't detect conditional slots
+    //because of a bug in tqmoc which doesn't detect conditional slots
     //we need them both
     void updateProperty(double val);
     void updateProperty(int val);
@@ -55,7 +56,7 @@ private:
 #ifndef PURE_QT
     KDoubleNumInput *m_edit;
 #else
-    QFloatInput *m_edit;
+    TQFloatInput *m_edit;
 #endif
 };
 
diff --git a/lib/widgets/propeditor/pdummywidget.cpp b/lib/widgets/propeditor/pdummywidget.cpp
index 65ec35e3..428953f2 100644
--- a/lib/widgets/propeditor/pdummywidget.cpp
+++ b/lib/widgets/propeditor/pdummywidget.cpp
@@ -23,8 +23,8 @@
 
 namespace PropertyLib{
 
-PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
 }
 
@@ -43,7 +43,7 @@ void PDummyWidget::setValue(const TQVariant &value, bool emitChange)
 void PDummyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &/*value*/)
 {
     p->setBrush(cg.background());
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->drawRect(r);
 }
 
diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h
index 0e191e87..f58e92b9 100644
--- a/lib/widgets/propeditor/pdummywidget.h
+++ b/lib/widgets/propeditor/pdummywidget.h
@@ -35,13 +35,14 @@ namespace PropertyLib{
 @short %Property editor with empty widget.
 
 This is usefull for properties which can't be edited in a generic way
-like QValueList's or QMap's stored in a variant.
+like TQValueList's or TQMap's stored in a variant.
 */
 class PDummyWidget: public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PDummyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index dc976b8f..d2a10217 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -33,12 +33,12 @@
 
 namespace PropertyLib{
 
-PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name)
+PFontButton::PFontButton(MultiProperty* property, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KFontRequester(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 #ifndef PURE_QT
     m_edit->button()->setText(i18n("..."));
 #endif
@@ -54,14 +54,14 @@ TQVariant PFontButton::value() const
 
 void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
     TQFontInfo fi(value.toFont());
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine,
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
         fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) +
         (fi.italic() ? i18n(" Italic") : TQString("")) +
-        " " + TQString("%1").arg(fi.pointSize()) );
+        " " + TQString("%1").tqarg(fi.pointSize()) );
 }
 
 void PFontButton::setValue(const TQVariant& value, bool emitChange)
diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h
index 6538f5ae..d875f307 100644
--- a/lib/widgets/propeditor/pfontbutton.h
+++ b/lib/widgets/propeditor/pfontbutton.h
@@ -32,8 +32,9 @@ namespace PropertyLib{
 class PFontButton : public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
+    PFontButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index 8b0ee7a7..240310c7 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -33,12 +33,12 @@
 
 namespace PropertyLib{
 
-PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PFontCombo::PFontCombo(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KFontCombo(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals
diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h
index a703c99d..63f07f51 100644
--- a/lib/widgets/propeditor/pfontcombo.h
+++ b/lib/widgets/propeditor/pfontcombo.h
@@ -23,7 +23,7 @@
 #include "propertywidget.h"
 
 #ifdef PURE_QT
-#define KFontCombo QComboBox
+#define KFontCombo TQComboBox
 #endif
 
 class KFontCombo;
@@ -35,8 +35,9 @@ namespace PropertyLib{
 */
 class PFontCombo: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PFontCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp
index f5e1ecb0..0d3afa85 100644
--- a/lib/widgets/propeditor/plineedit.cpp
+++ b/lib/widgets/propeditor/plineedit.cpp
@@ -24,12 +24,12 @@
 
 namespace PropertyLib{
 
-PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PLineEdit::PLineEdit(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h
index 6feb2a7b..c4d0c0f1 100644
--- a/lib/widgets/propeditor/plineedit.h
+++ b/lib/widgets/propeditor/plineedit.h
@@ -31,8 +31,9 @@ namespace PropertyLib{
 */
 class PLineEdit: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PLineEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp
index adee930e..13094245 100644
--- a/lib/widgets/propeditor/plinestyleedit.cpp
+++ b/lib/widgets/propeditor/plinestyleedit.cpp
@@ -127,11 +127,11 @@ namespace PropertyLib {
     "................................................"};
 
 
-PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQComboBox(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->insertItem(TQPixmap(nopen));
@@ -150,7 +150,7 @@ TQVariant PLineStyleEdit::value() const
 
 void PLineStyleEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
     
diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h
index 8bb076d4..6021cb9c 100644
--- a/lib/widgets/propeditor/plinestyleedit.h
+++ b/lib/widgets/propeditor/plinestyleedit.h
@@ -31,8 +31,9 @@ namespace PropertyLib {
 */
 class PLineStyleEdit : public PropertyWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
+    PLineStyleEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index a4c18791..0eaec74b 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -41,23 +41,23 @@
 
 namespace PropertyLib{
 
-PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name)
+PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQLabel(this);
-    m_edit->setAlignment(Qt::AlignTop);
+    m_edit->tqsetAlignment(TQt::AlignTop);
     m_edit->resize(width(), height()-1);
-    m_edit->setBackgroundMode(Qt::PaletteBase);
+    m_edit->setBackgroundMode(TQt::PaletteBase);
     m_edit->installEventFilter(this);
     
     m_button = new TQPushButton(i18n("..."), this);
     m_button->resize(height(), height()-8);
     m_button->move(width() - m_button->width() -1, 0);
-    m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
+    m_button->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
     l->addWidget(m_edit);
     l->addWidget(m_button);
-    m_popup = new TQLabel(0, 0, Qt::WStyle_NoBorder|Qt::WX11BypassWM|WStyle_StaysOnTop);
+    m_popup = new TQLabel(0, 0, TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop);
     m_popup->hide();
     
 
@@ -71,7 +71,7 @@ TQVariant PPixmapEdit::value() const
 
 void PPixmapEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
     p->drawPixmap(r.topLeft().x(), r.topLeft().y(), value.toPixmap());    
@@ -87,7 +87,7 @@ void PPixmapEdit::setValue(const TQVariant& value, bool emitChange)
 void PPixmapEdit::updateProperty()
 {
 #ifndef PURE_QT
-    KURL url = KFileDialog::getImageOpenURL(TQString::null, this);
+    KURL url = KFileDialog::getImageOpenURL(TQString(), this);
     if (!url.isEmpty())
     {
         m_edit->setPixmap(TQPixmap(url.path()));
@@ -112,7 +112,7 @@ void PPixmapEdit::resizeEvent(TQResizeEvent *ev)
 
 bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev)
 {
-    if(o == m_edit)
+    if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_edit))
     {
         if(ev->type() == TQEvent::MouseButtonPress)
         {
@@ -131,7 +131,7 @@ bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev)
         }
         if(ev->type() == TQEvent::KeyPress)
         {
-            TQKeyEvent* e = static_cast<TQKeyEvent*>(ev);
+            TQKeyEvent* e = TQT_TQKEYEVENT(ev);
             if((e->key() == Key_Enter) || (e->key()== Key_Space) || (e->key() == Key_Return))
             {
                     m_button->animateClick();
diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h
index 7f431289..09d7ffef 100644
--- a/lib/widgets/propeditor/ppixmapedit.h
+++ b/lib/widgets/propeditor/ppixmapedit.h
@@ -33,8 +33,9 @@ namespace PropertyLib{
 class PPixmapEdit : public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
+    PPixmapEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp
index eb1a382e..7f31d92d 100644
--- a/lib/widgets/propeditor/ppointedit.cpp
+++ b/lib/widgets/propeditor/ppointedit.cpp
@@ -25,11 +25,11 @@
 
 namespace PropertyLib{
 
-PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PPointEdit::PPointEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
@@ -42,16 +42,16 @@ TQVariant PPointEdit::value() const
 
 void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
 }
 
 void PPointEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
+    m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h
index e78f9928..e7de9178 100644
--- a/lib/widgets/propeditor/ppointedit.h
+++ b/lib/widgets/propeditor/ppointedit.h
@@ -32,8 +32,9 @@ namespace PropertyLib{
 class PPointEdit : public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
+    PPointEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp
index 6b7de9ce..562c013b 100644
--- a/lib/widgets/propeditor/prectedit.cpp
+++ b/lib/widgets/propeditor/prectedit.cpp
@@ -25,11 +25,11 @@
 
 namespace PropertyLib{
 
-PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name)
+PRectEdit::PRectEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
@@ -42,16 +42,16 @@ TQVariant PRectEdit::value() const
 
 void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
 }
 
 void PRectEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
+    m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h
index 116ee668..14381f80 100644
--- a/lib/widgets/propeditor/prectedit.h
+++ b/lib/widgets/propeditor/prectedit.h
@@ -32,8 +32,9 @@ namespace PropertyLib{
 class PRectEdit : public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0);
+    PRectEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/property.h b/lib/widgets/propeditor/property.h
index a94ea4cb..48c6987f 100644
--- a/lib/widgets/propeditor/property.h
+++ b/lib/widgets/propeditor/property.h
@@ -105,7 +105,7 @@ public:
 
         //predefined custom types
         ValueFromList = 2000               /**<string value from a list*/,
-        Symbol = 2001                      /**<unicode symbol code*/,
+        Symbol = 2001                      /**<tqunicode symbol code*/,
         FontName = 2002                    /**<font name, e.g. "times new roman"*/,
         FileURL = 2003                     /**<url of a file*/,
         DirectoryURL = 2004                /**<url of a directory*/,
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 3cd974db..ce154236 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -42,14 +42,14 @@ namespace PropertyLib{
 
 class PropertyItem: public KListViewItem{
 public:
-    PropertyItem(PropertyEditor *parent, MultiProperty *property)
-        :KListViewItem(parent, property->description()), m_editor(parent), m_property(property),
+    PropertyItem(PropertyEditor *tqparent, MultiProperty *property)
+        :KListViewItem(tqparent, property->description()), m_editor(tqparent), m_property(property),
         m_changed(false)
     {
     }
 
-    PropertyItem(PropertyEditor *editor, KListViewItem *parent, MultiProperty *property)
-        :KListViewItem(parent, property->description()), m_editor(editor),
+    PropertyItem(PropertyEditor *editor, KListViewItem *tqparent, MultiProperty *property)
+        :KListViewItem(tqparent, property->description()), m_editor(editor),
         m_property(property), m_changed(false)
     {
     }
@@ -120,13 +120,13 @@ private:
 
 class PropertyGroupItem: public KListViewItem{
 public:
-    PropertyGroupItem(KListView *parent, const TQString &name)
-        :KListViewItem(parent, name)
+    PropertyGroupItem(KListView *tqparent, const TQString &name)
+        :KListViewItem(tqparent, name)
     {
         init();
     }
-    PropertyGroupItem(KListViewItem *parent, const TQString &name)
-        :KListViewItem(parent, name)
+    PropertyGroupItem(KListViewItem *tqparent, const TQString &name)
+        :KListViewItem(tqparent, name)
     {
         init();
     }
@@ -158,14 +158,14 @@ private:
 
 class SeparatorItem: public KListViewItem{
 public:
-    SeparatorItem(KListView *parent)
-        :KListViewItem(parent)
+    SeparatorItem(KListView *tqparent)
+        :KListViewItem(tqparent)
     {
         setSelectable(false);
     }
 };
-PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
-    :KListView(parent, name)
+PropertyEditor::PropertyEditor(TQWidget *tqparent, const char *name)
+    :KListView(tqparent, name)
 {
     setSorting(-1);
 
@@ -196,7 +196,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
 #else
     m_undoButton->setPixmap( TQPixmap("undo.xpm") );
 #endif
-    m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+    m_undoButton->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     m_undoButton->resize(m_undoButton->height(), m_undoButton->height());
     m_undoButton->hide();
     connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo()));
@@ -215,8 +215,8 @@ void PropertyEditor::populateProperties(PropertyList *list)
         return;
     m_list = list;
     connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*)));
-    const TQValueList<QPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup();
-    for (TQValueList<QPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin();
+    const TQValueList<TQPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup();
+    for (TQValueList<TQPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin();
         it != groups.end(); ++it)
     {
 //        qWarning("PropertyEditor::populateProperties:    adding group %s", (*it).first.ascii());
@@ -259,24 +259,24 @@ void PropertyEditor::addProperty(const TQString &name)
     addChildProperties(pitem);
 }
 
-void PropertyEditor::addChildProperties(PropertyItem *parent)
+void PropertyEditor::addChildProperties(PropertyItem *tqparent)
 {
-    MultiProperty *prop = parent->property();
+    MultiProperty *prop = tqparent->property();
     //force machine creation to get detailed properties appended to current multiproperty
-    if ( !m_registeredForType.contains(prop->name())
+    if ( !m_registeredForType.tqcontains(prop->name())
         && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) )
     {
         //FIXME: find better solution
         machine(prop);
     }
 
-//     qWarning("seeking children: count: %d", prop->details.count());
+//     qWarning("seeking tqchildren: count: %d", prop->details.count());
 
-    parent->setOpen(true);
+    tqparent->setOpen(true);
     for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it)
     {
 //         qWarning("found child %s", (*it).name().ascii());
-        new PropertyItem(this, parent, new MultiProperty(&m_detailedList, &(*it)));
+        new PropertyItem(this, tqparent, new MultiProperty(&m_detailedList, &(*it)));
     }
 }
 
@@ -301,11 +301,11 @@ void PropertyEditor::propertyValueChanged(Property *property)
         m_currentEditWidget->setValue(property->value(), false);
     else
     {
-//        repaint all items
+//        tqrepaint all items
         TQListViewItemIterator it(this);
         while (it.current())
         {
-            repaintItem(it.current());
+            tqrepaintItem(it.current());
             ++it;
         }
     }
@@ -323,15 +323,15 @@ void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &v
     if (m_currentEditItem && (m_currentEditItem->property() == property))
     {
         m_currentEditItem->setChanged(true);
-        repaintItem(m_currentEditItem);
+        tqrepaintItem(m_currentEditItem);
     }
 
     emit changed();
 
-/*    if (m_list->contains(name))
+/*    if (m_list->tqcontains(name))
     {
         (*m_list)[name]->setValue(value, false);
-//    else if (m_detailedList->contains(*/
+//    else if (m_detailedList->tqcontains(*/
 }
 
 void PropertyEditor::hideEditor()
@@ -360,11 +360,11 @@ void PropertyEditor::showEditor(PropertyItem *item)
 
 void PropertyEditor::placeEditor(PropertyItem *item)
 {
-    TQRect r = itemRect(item);
+    TQRect r = tqitemRect(item);
     if (!r.size().isValid())
     {
         ensureItemVisible(item);
-        r = itemRect(item);
+        r = tqitemRect(item);
     }
 
     r.setX(header()->sectionPos(1));
@@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item)
         m_currentEditLayout->addWidget(editor, 0, 0);
         m_currentEditLayout->addWidget(m_undoButton, 0, 1);
         m_currentEditArea->resize(r.size());
-//        m_currentEditLayout->invalidate();
+//        m_currentEditLayout->tqinvalidate();
         moveChild(m_currentEditArea, r.x(), r.y());
         m_currentEditWidget = editor;
     }
@@ -447,7 +447,7 @@ Machine *PropertyEditor::machine(MultiProperty *property)
         m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property);
         connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)),
 		this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&)));
-        m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft());
+        m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->tqchildrenRect().topLeft());
         m_registeredForType[name]->propertyEditor->hide();
     }
     return m_registeredForType[name];
@@ -470,7 +470,7 @@ void PropertyEditor::undo()
 
     m_currentEditWidget->undo();
     m_currentEditItem->setChanged(false);
-    repaintItem(m_currentEditItem);
+    tqrepaintItem(m_currentEditItem);
 }
 
 }
diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h
index 6bdd3e32..ee868a55 100644
--- a/lib/widgets/propeditor/propertyeditor.h
+++ b/lib/widgets/propeditor/propertyeditor.h
@@ -24,8 +24,8 @@
 #include <klistview.h>
 #else
 #include <tqlistview.h>
-#define KListView QListView
-#define KListViewItem QListViewItem
+#define KListView TQListView
+#define KListViewItem TQListViewItem
 #endif
 
 #include "propertylist.h"
@@ -57,9 +57,10 @@ creation of property widgets from the machine factory.
 */
 class PropertyEditor: public KListView{
    Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructs the property editor.*/
-    PropertyEditor(TQWidget *parent = 0, const char *name = 0);
+    PropertyEditor(TQWidget *tqparent = 0, const char *name = 0);
     ~PropertyEditor();
     
     /**@return @ref Machine for given property.
@@ -102,7 +103,7 @@ protected:
     void addGroup(const TQString &name);
     void addProperty(PropertyGroupItem *group, const TQString &name);
     void addProperty(const TQString &name);
-    void addChildProperties(PropertyItem *parent);
+    void addChildProperties(PropertyItem *tqparent);
     
 private:
     PropertyList *m_list;
diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp
index 491c2ebb..20feeb43 100644
--- a/lib/widgets/propeditor/propertylist.cpp
+++ b/lib/widgets/propeditor/propertylist.cpp
@@ -41,7 +41,7 @@ PropertyList::~PropertyList()
 
 MultiProperty *PropertyList::operator[](const TQString &name)
 {
-    if (m_list.contains(name))
+    if (m_list.tqcontains(name))
         return m_list[name];
     else
         return new MultiProperty(this);
@@ -49,7 +49,7 @@ MultiProperty *PropertyList::operator[](const TQString &name)
 
 MultiProperty *PropertyList::property( const TQString &name )
 {
-	if (m_list.contains(name))
+	if (m_list.tqcontains(name))
 		return m_list[name];
 	else
 		return new MultiProperty(this);
@@ -60,7 +60,7 @@ void PropertyList::addProperty(Property *property)
     if (property == 0)
         return;
     MultiProperty *mp = 0;
-    if ( m_list.contains(property->name()) )
+    if ( m_list.tqcontains(property->name()) )
     {
         mp = m_list[property->name()];
         mp->addProperty(property);
@@ -79,7 +79,7 @@ void PropertyList::addProperty(const TQString &group, Property *property)
         return;
 
     MultiProperty *mp = 0;
-    if (m_list.contains(property->name()))
+    if (m_list.tqcontains(property->name()))
     {
         mp = m_list[property->name()];
         mp->addProperty(property);
@@ -119,7 +119,7 @@ void PropertyList::removeProperty(Property *property)
 
 void PropertyList::removeProperty(const TQString &name)
 {
-    if (m_list.contains(name))
+    if (m_list.tqcontains(name))
     {
         TQString group = m_groupOfProperty[m_list[name]];
         removeFromGroup(m_list[name]);
@@ -146,7 +146,7 @@ void PropertyList::removeProperty(const TQString &name)
     }
 }
 
-const TQValueList<QPair<TQString, TQValueList<TQString> > >& PropertyList::propertiesOfGroup() const
+const TQValueList<TQPair<TQString, TQValueList<TQString> > >& PropertyList::propertiesOfGroup() const
 {
     return m_propertiesOfGroup;
 }
@@ -162,11 +162,11 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property)
         return;
 
     //do not add same property to the group twice
-    if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group))
+    if (m_groupOfProperty.tqcontains(property) && (m_groupOfProperty[property] == group))
         return;
 
-    QPair<TQString, TQValueList<TQString> > *groupPair = 0;
-    for(TQValueList<QPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin();
+    TQPair<TQString, TQValueList<TQString> > *groupPair = 0;
+    for(TQValueList<TQPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin();
         it != m_propertiesOfGroup.end(); ++it)
     {
         if ((*it).first == group)
@@ -177,7 +177,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property)
     }
     if (groupPair == 0)
     {
-        groupPair = new QPair<TQString, TQValueList<TQString> >();
+        groupPair = new TQPair<TQString, TQValueList<TQString> >();
         groupPair->first = group;
         groupPair->second.append(property->name());
         m_propertiesOfGroup.append(*groupPair);
@@ -185,7 +185,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property)
         return;
     }
     //check if group already contains property with the same name
-    if (!groupPair->second.contains(property->name()))
+    if (!groupPair->second.tqcontains(property->name()))
         groupPair->second.append(property->name());
 
     m_groupOfProperty[property] = group;
@@ -196,7 +196,7 @@ void PropertyList::removeFromGroup(MultiProperty *property)
     TQString group = m_groupOfProperty[property];
 //    qWarning("removeFromGroup group=%s", group.ascii());
 
-    for(TQValueList<QPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin();
+    for(TQValueList<TQPair<TQString, TQValueList<TQString> > >::iterator it = m_propertiesOfGroup.begin();
         it != m_propertiesOfGroup.end(); ++it)
     {
 //        qWarning("removeFromGroup checking %s", (*it).first.ascii());
@@ -217,16 +217,16 @@ void PropertyList::clear( )
         removeProperty(it.key());
 }
 
-bool PropertyList::contains( const TQString & name )
+bool PropertyList::tqcontains( const TQString & name )
 {
-    if (m_list.contains(name))
+    if (m_list.tqcontains(name))
         return true;
     return false;
 }
 
 TQPtrList<Property> PropertyList::properties(const TQString &name)
 {
-    if (m_list.contains(name))
+    if (m_list.tqcontains(name))
         return m_list[name]->list;
     return TQPtrList<Property>();
 }
@@ -309,9 +309,9 @@ void PropertyBuffer::intersect(const PropertyList *list)
     for (TQMap<TQString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it)
     {
 //        qWarning("intersect:: for mp = %s", it.data()->name().ascii());
-        if (list->m_list.contains(it.key()))
+        if (list->m_list.tqcontains(it.key()))
         {
-/*            qWarning("intersect::     list contains %s", it.key().ascii());
+/*            qWarning("intersect::     list tqcontains %s", it.key().ascii());
             if ( (*(it.data()) == *(list->m_list[it.key()])))
                 qWarning("intersect::     equal properties");
             else
@@ -334,7 +334,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property)
 {
 //     qWarning("PropertyBuffer::intersectedValueChanged");
     TQString propertyName = property->name();
-    if (!contains(propertyName))
+    if (!tqcontains(propertyName))
         return;
 
     MultiProperty mp(property);
diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h
index 96e351fc..c549048b 100644
--- a/lib/widgets/propeditor/propertylist.h
+++ b/lib/widgets/propeditor/propertylist.h
@@ -52,9 +52,10 @@ PropertyList is also capable of grouping properties.
 You can have unsorted list of groups of properties or a plain
 alphabetically sorted list of properties or both at the same time.
 */
-class PropertyList: public QObject
+class PropertyList: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     class Iterator {
@@ -110,14 +111,14 @@ public:
     virtual void removeProperty(const TQString &name);
     
     /**@return the list of grouped properties.*/
-    virtual const TQValueList<QPair<TQString, TQValueList<TQString> > >& propertiesOfGroup() const;
+    virtual const TQValueList<TQPair<TQString, TQValueList<TQString> > >& propertiesOfGroup() const;
     /**@return the map: property - group name.*/
     virtual const TQMap<MultiProperty*, TQString>& groupOfProperty() const;
     
     /**Clears the list of properties.*/
     virtual void clear();
     /**Returns true if the list of properties contains property with given name.*/
-    virtual bool contains(const TQString &name);
+    virtual bool tqcontains(const TQString &name);
     
     /**The list of properties with given name.*/
     TQPtrList<Property> properties(const TQString &name);
@@ -146,7 +147,7 @@ private:
     
     //groups of properties:
     // list of group name: (list of property names)
-    TQValueList<QPair<TQString, TQValueList<TQString> > > m_propertiesOfGroup;
+    TQValueList<TQPair<TQString, TQValueList<TQString> > > m_propertiesOfGroup;
     // map of property: group
     TQMap<MultiProperty*, TQString> m_groupOfProperty;
 
@@ -181,6 +182,7 @@ buf->intersect(list3);
 */
 class PropertyBuffer: public PropertyList{
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructs a buffer from given property list.*/
     PropertyBuffer(PropertyList *list);
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index 613777d6..cccc3a37 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -76,7 +76,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property)
     TQString propertyName = property->name();
     TQMap<TQString, TQVariant> valueList = property->valueList();
 
-    if (m_registeredForType.contains(propertyName))
+    if (m_registeredForType.tqcontains(propertyName))
         return (*m_registeredForType[propertyName])();
 
     switch (type)
@@ -162,22 +162,22 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property)
         case Property::Cursor:
         {
             TQMap<TQString, TQVariant> spValues;
-            spValues[i18n("Arrow")] = Qt::ArrowCursor;
-            spValues[i18n("Up Arrow")] = Qt::UpArrowCursor;
-            spValues[i18n("Cross")] = Qt::CrossCursor;
-            spValues[i18n("Waiting")] = Qt::WaitCursor;
-            spValues[i18n("iBeam")] = Qt::IbeamCursor;
-            spValues[i18n("Size Vertical")] = Qt::SizeVerCursor;
-            spValues[i18n("Size Horizontal")] = Qt::SizeHorCursor;
-            spValues[i18n("Size Slash")] = Qt::SizeBDiagCursor;
-            spValues[i18n("Size Backslash")] = Qt::SizeFDiagCursor;
-            spValues[i18n("Size All")] = Qt::SizeAllCursor;
-            spValues[i18n("Blank")] = Qt::BlankCursor;
-            spValues[i18n("Split Vertical")] = Qt::SplitVCursor;
-            spValues[i18n("Split Horizontal")] = Qt::SplitHCursor;
-            spValues[i18n("Pointing Hand")] = Qt::PointingHandCursor;
-            spValues[i18n("Forbidden")] = Qt::ForbiddenCursor;
-            spValues[i18n("What's this")] = Qt::WhatsThisCursor;
+            spValues[i18n("Arrow")] = TQt::ArrowCursor;
+            spValues[i18n("Up Arrow")] = TQt::UpArrowCursor;
+            spValues[i18n("Cross")] = TQt::CrossCursor;
+            spValues[i18n("Waiting")] = TQt::WaitCursor;
+            spValues[i18n("iBeam")] = TQt::IbeamCursor;
+            spValues[i18n("SizeQt::Vertical")] = TQt::SizeVerCursor;
+            spValues[i18n("SizeQt::Horizontal")] = TQt::SizeHorCursor;
+            spValues[i18n("Size Slash")] = TQt::SizeBDiagCursor;
+            spValues[i18n("Size Backslash")] = TQt::SizeFDiagCursor;
+            spValues[i18n("Size All")] = TQt::SizeAllCursor;
+            spValues[i18n("Blank")] = TQt::BlankCursor;
+            spValues[i18n("SplitQt::Vertical")] = TQt::SplitVCursor;
+            spValues[i18n("SplitQt::Horizontal")] = TQt::SplitHCursor;
+            spValues[i18n("Pointing Hand")] = TQt::PointingHandCursor;
+            spValues[i18n("Forbidden")] = TQt::ForbiddenCursor;
+            spValues[i18n("What's this")] = TQt::WhatsThisCursor;
             Machine *mach = new Machine(new PCursorEdit(property, spValues));
             return mach;
         }
diff --git a/lib/widgets/propeditor/propertymachinefactory.h b/lib/widgets/propeditor/propertymachinefactory.h
index fae5569f..84da3e71 100644
--- a/lib/widgets/propeditor/propertymachinefactory.h
+++ b/lib/widgets/propeditor/propertymachinefactory.h
@@ -74,7 +74,7 @@ public:
     void registerEditor(int type, createMachine creator);
 
     /**Creates and returns the editor for given property type.
-    Warning: editor and viewer widgets won't have parent widget. %Property editor
+    Warning: editor and viewer widgets won't have tqparent widget. %Property editor
     cares about reparenting and deletion of returned widgets in machines.*/
     Machine *machineForProperty(MultiProperty *property);
     bool hasDetailedEditors(int type);
diff --git a/lib/widgets/propeditor/propertywidget.cpp b/lib/widgets/propeditor/propertywidget.cpp
index dad296c5..df0df75a 100644
--- a/lib/widgets/propeditor/propertywidget.cpp
+++ b/lib/widgets/propeditor/propertywidget.cpp
@@ -23,8 +23,8 @@
 
 namespace PropertyLib{
 
-PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *parent, const char *name)
-    :TQWidget(parent, name), m_property(property)
+PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :TQWidget(tqparent, name), m_property(property)
 {
 }
 
@@ -40,10 +40,10 @@ void PropertyWidget::setProperty(MultiProperty *property)
 
 void PropertyWidget::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toString());
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toString());
 }
 
 void PropertyWidget::setValueList(const TQMap<TQString, TQVariant> &// valueList
diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h
index edbdf6f3..d5a22777 100644
--- a/lib/widgets/propeditor/propertywidget.h
+++ b/lib/widgets/propeditor/propertywidget.h
@@ -40,17 +40,18 @@ Descendants should implement value() and setValue() methods.
 
 Hint: in case you want to implement your property editor widget using
 existing widgets like TQLineEdit, TQComboBox, etc. you can't use multiple
-inheritance from two TQObject descendants due to Qt library restriction.
+inheritance from two TQObject descendants due to TQt library restriction.
 Therefore use line edits and combo boxes as child widgets.
 
 A set of predefined widgets for predefined property types are available
 in the library.
 */
-class PropertyWidget: public QWidget{
+class PropertyWidget: public TQWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructs widget for property with name "propertyName".*/
-    PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PropertyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
     virtual ~PropertyWidget() {}
 
     /**@return the value currently entered in the editor widget.*/
diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp
index 813708ca..27f2a49c 100644
--- a/lib/widgets/propeditor/propertywidgetproxy.cpp
+++ b/lib/widgets/propeditor/propertywidgetproxy.cpp
@@ -26,8 +26,8 @@
 
 namespace PropertyLib{
 
-PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *parent, const char *name)
-    :TQWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0)
+PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *tqparent, const char *name)
+    :TQWidget(tqparent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0)
 {
     p = new Property();
     m_layout = new TQHBoxLayout(this, 0, 0);
diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h
index 43ef3311..04a2503a 100644
--- a/lib/widgets/propeditor/propertywidgetproxy.h
+++ b/lib/widgets/propeditor/propertywidgetproxy.h
@@ -39,13 +39,14 @@ It is sometimes useful to create single property editor widgets instead of havin
 all in the property editor. Proxy creates an empty widget and shows the property editor
 depending on the property type.
 */
-class PropertyWidgetProxy: public QWidget
+class PropertyWidgetProxy: public TQWidget
 {
 Q_OBJECT
-Q_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true )
-Q_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false )
+  TQ_OBJECT
+TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true )
+TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false )
 public:
-    PropertyWidgetProxy(TQWidget *parent = 0, const char *name = 0);
+    PropertyWidgetProxy(TQWidget *tqparent = 0, const char *name = 0);
     ~PropertyWidgetProxy();
     
     /**Sets the type of a property editor to appear.*/
diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp
index 90208304..4ce6561c 100644
--- a/lib/widgets/propeditor/psizeedit.cpp
+++ b/lib/widgets/propeditor/psizeedit.cpp
@@ -25,12 +25,12 @@
 
 namespace PropertyLib{
 
-PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
@@ -43,16 +43,16 @@ TQVariant PSizeEdit::value() const
 
 void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 }
 
 void PSizeEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+    m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h
index 38f29132..5fbd6d6d 100644
--- a/lib/widgets/propeditor/psizeedit.h
+++ b/lib/widgets/propeditor/psizeedit.h
@@ -34,8 +34,9 @@ namespace PropertyLib{
 class PSizeEdit: public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PSizeEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp
index 9447a4bc..9c417005 100644
--- a/lib/widgets/propeditor/psizepolicyedit.cpp
+++ b/lib/widgets/propeditor/psizepolicyedit.cpp
@@ -26,12 +26,12 @@
 
 namespace PropertyLib{
 
-PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name), m_spValues(spValues)
+PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name), m_spValues(spValues)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     m_edit->setReadOnly(true);
@@ -44,16 +44,16 @@ TQVariant PSizePolicyEdit::value() const
 
 void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
 }
 
 void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
+    m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h
index 36c26d1b..613c65ea 100644
--- a/lib/widgets/propeditor/psizepolicyedit.h
+++ b/lib/widgets/propeditor/psizepolicyedit.h
@@ -34,8 +34,9 @@ namespace PropertyLib{
 class PSizePolicyEdit : public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent=0, const char* name=0);
+    PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent=0, const char* name=0);
     
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp
index 755041c1..48b36324 100644
--- a/lib/widgets/propeditor/pspinbox.cpp
+++ b/lib/widgets/propeditor/pspinbox.cpp
@@ -26,19 +26,19 @@
 
 namespace PropertyLib{
 
-PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PSpinBox::PSpinBox(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
     connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
 }
 
-PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQSpinBox(minValue, maxValue, step, this);
diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h
index d4486cae..28d34ef2 100644
--- a/lib/widgets/propeditor/pspinbox.h
+++ b/lib/widgets/propeditor/pspinbox.h
@@ -31,9 +31,10 @@ namespace PropertyLib{
 */
 class PSpinBox: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
-    PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *parent = 0, const char *name = 0);
+    PSpinBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
+    PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp
index f6803304..e4eeeccf 100644
--- a/lib/widgets/propeditor/pstringlistedit.cpp
+++ b/lib/widgets/propeditor/pstringlistedit.cpp
@@ -29,24 +29,24 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #else
-#include "qeditlistbox.h"
+#include "tqeditlistbox.h"
 #include <tqpushbutton.h>
 #include "compat_tools.h"
 #endif
 
 namespace PropertyLib{
 
-PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, const char *name)
-     :PropertyWidget(property, parent, name)
+PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *tqparent, const char *name)
+     :PropertyWidget(property, tqparent, name)
 {
     l = new TQHBoxLayout(this);
 
     edit = new KLineEdit(this);
     edit->setReadOnly(true);
-    edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(edit);
     pbSelect = new TQPushButton("...", this);
-    pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+    pbSelect->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     l->addWidget(pbSelect);
 
     connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor()));
@@ -71,7 +71,7 @@ void PStringListEdit::showEditor()
     TQVBoxLayout *dv = new TQVBoxLayout(dia, 2);
 
 #ifdef PURE_QT
-    QEditListBox *select = new QEditListBox(dia, "select_char");
+    TQEditListBox *select = new TQEditListBox(dia, "select_char");
 #else
     KEditListBox *select = new KEditListBox(dia, "select_char");
 #endif
@@ -108,10 +108,10 @@ void PStringListEdit::showEditor()
 
 void PStringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, value.toStringList().join(", "));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toStringList().join(", "));
 }
 
 }
diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h
index e1b076ca..45aa0e4e 100644
--- a/lib/widgets/propeditor/pstringlistedit.h
+++ b/lib/widgets/propeditor/pstringlistedit.h
@@ -35,8 +35,9 @@ namespace PropertyLib{
 class PStringListEdit: public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PStringListEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index 24f4259c..087f7a8d 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -35,16 +35,16 @@
 
 namespace PropertyLib{
 
-PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char *name)
-    :PropertyWidget(property, parent, name)
+PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *tqparent, const char *name)
+    :PropertyWidget(property, tqparent, name)
 {
     l = new TQHBoxLayout(this);
     m_edit = new KLineEdit(this);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     m_edit->setMaxLength(1);
     l->addWidget(m_edit);
     m_select = new TQPushButton("...", this);
-    m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+    m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_select);
 
 #ifdef PURE_QT
@@ -58,18 +58,14 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char
 TQVariant PSymbolCombo::value() const
 {
     if (!(m_edit->text().isNull()))
-        return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode()));
+        return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode()));
     else
         return TQVariant(0);
 }
 
 void PSymbolCombo::setValue(const TQVariant &value, bool emitChange)
 {
-#if QT_VERSION >= 0x030100
     if (!(value.isNull()))
-#else
-    if (value.canCast(TQVariant::Int))
-#endif
     {
         disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
         m_edit->setText(TQChar(value.toInt()));
@@ -113,15 +109,15 @@ void PSymbolCombo::selectChar()
 
 void PSymbolCombo::updateProperty(const TQString& val)
 {
-    emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode())));
+    emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode())));
 }
 
 void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
     p->setBrush(cg.background());
-    p->setPen(Qt::NoPen);
+    p->setPen(TQt::NoPen);
     p->drawRect(r);
-    p->drawText(r, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, TQChar(value.toInt()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQChar(value.toInt()));
 }
 
 }
diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h
index b9682023..9c559844 100644
--- a/lib/widgets/propeditor/psymbolcombo.h
+++ b/lib/widgets/propeditor/psymbolcombo.h
@@ -34,8 +34,9 @@ namespace PropertyLib{
 */
 class PSymbolCombo: public PropertyWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0);
+    PSymbolCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0);
 
     /**@return the value currently entered in the editor widget.*/
     virtual TQVariant value() const;
diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp
index 64e4d0c7..d27a0552 100644
--- a/lib/widgets/propeditor/purledit.cpp
+++ b/lib/widgets/propeditor/purledit.cpp
@@ -30,8 +30,8 @@
 
 namespace PropertyLib{
 
-PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name)
+PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
@@ -47,7 +47,7 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c
     m_mode = mode;
     connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select()));
 #endif
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 }
 
 TQVariant PUrlEdit::value() const
@@ -84,7 +84,7 @@ void PUrlEdit::select()
     if( m_mode == Directory )
 	m_url = TQFileDialog::getExistingDirectory( m_url,this);
     else
-        m_url = TQFileDialog::getOpenFileName(m_url, TQString::null, this);
+        m_url = TQFileDialog::getOpenFileName(m_url, TQString(), this);
     updateProperty(m_url);
     m_edit->setText(m_url);
 #endif
diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h
index d54dc3d2..4aff51b8 100644
--- a/lib/widgets/propeditor/purledit.h
+++ b/lib/widgets/propeditor/purledit.h
@@ -39,6 +39,7 @@ namespace PropertyLib{
 class PUrlEdit : public PropertyWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 #ifndef PURE_QT
     enum Mode {File = KFile::File,Directory = KFile::Directory};
@@ -46,7 +47,7 @@ public:
     enum Mode {File,Directory};
 #endif
 
-    PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent=0, const char* name=0);
+    PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent=0, const char* name=0);
 
     virtual TQVariant value() const;
     virtual void setValue(const TQVariant& value, bool emitChange);
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index 308570be..9448d672 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -31,13 +31,13 @@
 
 namespace PropertyLib{
 
-PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char* name)
-    :PropertyWidget(property, parent, name)
+PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* tqparent, const char* name)
+    :PropertyWidget(property, tqparent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
     m_edit = new TQPushButton(this);
     m_edit->setToggleButton(true);
-    m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
     connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h
index 408dec4b..efe33584 100644
--- a/lib/widgets/propeditor/pyesnobutton.h
+++ b/lib/widgets/propeditor/pyesnobutton.h
@@ -32,8 +32,9 @@ namespace PropertyLib{
 class PYesNoButton : public PropertyWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0);
+    PYesNoButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0);
 
     virtual TQVariant value() const;
     virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value);
diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp
index db40e8e7..565786f0 100644
--- a/lib/widgets/propeditor/qeditlistbox.cpp
+++ b/lib/widgets/propeditor/qeditlistbox.cpp
@@ -46,24 +46,24 @@ public:
     int buttons;
 };
 
-QEditListBox::QEditListBox(TQWidget *parent, const char *name,
+QEditListBox::QEditListBox(TQWidget *tqparent, const char *name,
 			   bool checkAtEntering, int buttons )
-    :TQGroupBox(parent, name )
+    :TQGroupBox(tqparent, name )
 {
     init( checkAtEntering, buttons );
 }
 
-QEditListBox::QEditListBox(const TQString& title, TQWidget *parent,
+QEditListBox::QEditListBox(const TQString& title, TQWidget *tqparent,
 			   const char *name, bool checkAtEntering, int buttons)
-    :TQGroupBox(title, parent, name )
+    :TQGroupBox(title, tqparent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 QEditListBox::QEditListBox(const TQString& title, const CustomEditor& custom,
-                           TQWidget *parent, const char *name,
+                           TQWidget *tqparent, const char *name,
                            bool checkAtEntering, int buttons)
-    :TQGroupBox(title, parent, name )
+    :TQGroupBox(title, tqparent, name )
 {
     m_lineEdit = custom.lineEdit();
     init( checkAtEntering, buttons, custom.representationWidget() );
@@ -92,7 +92,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
 
 
     servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
-    setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
                               TQSizePolicy::MinimumExpanding));
 
     TQWidget * gb = this;
@@ -185,7 +185,7 @@ void QEditListBox::typedSomething(const TQString& text)
         else
         {
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
-            bool enable = (m_listBox->findItem( text, mode ) == 0L);
+            bool enable = (m_listBox->tqfindItem( text, mode ) == 0L);
             servNewButton->setEnabled( enable );
         }
     }
@@ -256,7 +256,7 @@ void QEditListBox::addItem()
         else
         {
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
-            alreadyInList =(m_listBox->findItem(currentTextLE, mode) != 0);
+            alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) != 0);
         }
     }
 
@@ -298,7 +298,7 @@ void QEditListBox::removeItem()
 
         m_listBox->removeItem( selected );
         if ( count() > 0 )
-            m_listBox->setSelected( QMIN( selected, count() - 1 ), true );
+            m_listBox->setSelected( TQMIN( selected, count() - 1 ), true );
 
         emit changed();
 	emit removed( removedText );
diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h
index 7a4a34a2..78a61bfc 100644
--- a/lib/widgets/propeditor/qeditlistbox.h
+++ b/lib/widgets/propeditor/qeditlistbox.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef QEDITLISTBOX_H
-#define QEDITLISTBOX_H
+#ifndef TQEDITLISTBOX_H
+#define TQEDITLISTBOX_H
 
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
@@ -42,11 +42,12 @@ class TQPushButton;
 
 class QEditListBoxPrivate;
 
-class QEditListBox : public QGroupBox
+class QEditListBox : public TQGroupBox
 {
    Q_OBJECT
+  TQ_OBJECT
 
-   Q_PROPERTY( TQStringList items READ items WRITE setItems )
+   TQ_PROPERTY( TQStringList items READ items WRITE setItems )
 
 public:
     // @since 3.1
@@ -100,7 +101,7 @@ public:
        * it will be checked if you press the Add-button. It is not
        * possible to enter items twice into the listbox.
        */
-      QEditListBox(TQWidget *parent = 0, const char *name = 0,
+      QEditListBox(TQWidget *tqparent = 0, const char *name = 0,
 		   bool checkAtEntering=false, int buttons = All );
       /**
        * Create an editable listbox.
@@ -108,7 +109,7 @@ public:
        * The same as the other constructor, additionally it takes
        * @p title, which will be the title of the frame around the listbox.
        */
-      QEditListBox(const TQString& title, TQWidget *parent = 0,
+      QEditListBox(const TQString& title, TQWidget *tqparent = 0,
 		   const char *name = 0, bool checkAtEntering=false,
 		   int buttons = All );
 
@@ -126,7 +127,7 @@ public:
        */
       QEditListBox( const TQString& title,
                     const CustomEditor &customEditor,
-                    TQWidget *parent = 0, const char *name = 0,
+                    TQWidget *tqparent = 0, const char *name = 0,
                     bool checkAtEntering = false, int buttons = All );
 
       virtual ~QEditListBox();
diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp
index a8522105..d14ea9c7 100644
--- a/lib/widgets/propeditor/qfloatinput.cpp
+++ b/lib/widgets/propeditor/qfloatinput.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "qfloatinput.h"
+#include "tqfloatinput.h"
 
 #include <math.h>
 
-QFloatInput::QFloatInput( int min, int max, float step, int digits,
-                            TQWidget *parent, const char *name )
+TQFloatInput::TQFloatInput( int min, int max, float step, int digits,
+                            TQWidget *tqparent, const char *name )
     : TQSpinBox( (int) (min*pow(digits,10)),
                 (int) (max*pow(digits,10)),
-                (int) (step*pow(digits,10)), parent, name ),
+                (int) (step*pow(digits,10)), tqparent, name ),
       m_digits( digits )
 {
     setValue( (int) (min*pow(digits,10)) );
@@ -36,14 +36,14 @@ QFloatInput::QFloatInput( int min, int max, float step, int digits,
     setValidator( validator );
 }
 
-TQString QFloatInput::mapValueToText( int value )
+TQString TQFloatInput::mapValueToText( int value )
 {
-    TQString format = TQString("%.%1f").arg( m_digits );
+    TQString format = TQString("%.%1f").tqarg( m_digits );
     return TQString().sprintf(format.latin1(),
                              (value/(float)pow(m_digits,10)) );
 }
 
-int QFloatInput::mapTextToValue( bool* ok )
+int TQFloatInput::mapTextToValue( bool* ok )
 {
     return int(cleanText().toFloat(ok)*pow(m_digits,10));
 }
diff --git a/lib/widgets/propeditor/qfloatinput.h b/lib/widgets/propeditor/qfloatinput.h
index 4bbe63e6..dececcbf 100644
--- a/lib/widgets/propeditor/qfloatinput.h
+++ b/lib/widgets/propeditor/qfloatinput.h
@@ -18,18 +18,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#ifndef QFLOATINPUT_H
-#define QFLOATINPUT_H
+#ifndef TQFLOATINPUT_H
+#define TQFLOATINPUT_H
 
 #include <tqapplication.h>
 #include <tqspinbox.h>
 #include <tqvalidator.h>
 
-class QFloatInput : public QSpinBox
+class TQFloatInput : public TQSpinBox
 {
 public:
-    QFloatInput( int min, int max, float step, int digits,
-                  TQWidget *parent, const char *name = 0 );
+    TQFloatInput( int min, int max, float step, int digits,
+                  TQWidget *tqparent, const char *name = 0 );
 
     virtual TQString  mapValueToText( int value );
 
diff --git a/lib/widgets/propeditor/test.cpp b/lib/widgets/propeditor/test.cpp
index 82665f98..a55a496b 100644
--- a/lib/widgets/propeditor/test.cpp
+++ b/lib/widgets/propeditor/test.cpp
@@ -38,7 +38,7 @@ int main( int argc, char **argv )
                      "Sample description", "value" ) );
     currentList->addProperty(
         new Property(Property::Color, "Color",
-                     "Sample color description", Qt::red ) );
+                     "Sample color description", TQt::red ) );
     currentList->addProperty(
         new Property( Property::Pixmap, "Pixmap",
                       "sample pixmap description" ) );
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index 800eec47..eea88588 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -15,7 +15,7 @@
 
 #include "qcomboview.h"
 #include <kdeversion.h>
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 #include "tqpopupmenu.h"
 #include "tqlistview.h"
 #include "tqpainter.h"
@@ -26,7 +26,7 @@
 #include "tqapplication.h"
 #include "tqlineedit.h"
 #include "tqbitmap.h"
-#include "private/qeffects_p.h"
+#include "private/tqeffects_p.h"
 #include "tqstringlist.h"
 #include "tqcombobox.h"
 #include "tqstyle.h"
@@ -39,7 +39,7 @@ public:
     QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb )
     {
         duplicatesEnabled = TRUE;
-        cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+        cb->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
     }
 
     inline TQListView * listView() { return lView; }
@@ -68,7 +68,7 @@ public:
     TQLineEdit * ed;  // /bin/ed rules!
     TQTimer *completionTimer;
 
-    TQSize sizeHint;
+    TQSize tqsizeHint;
 
 private:
     bool	usinglView;
@@ -81,14 +81,14 @@ void QComboViewData::updateLinedGeometry()
 {
     if ( !ed || !combo )
         return;
-    TQRect r = TQStyle::visualRect( combo->style().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
+    TQRect r = TQStyle::tqvisualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
                                         TQStyle::SC_ComboBoxEditField), combo );
 
 //    qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1);
     const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0;
     if ( pix && pix->width() < r.width() )
         r.setLeft( r.left() + pix->width() + 4 );
-    if ( r != ed->geometry() )
+    if ( r != ed->tqgeometry() )
         ed->setGeometry( r );
 }
 
@@ -96,7 +96,7 @@ static inline bool checkInsertIndex( const char *method, const char * name,
 				     int count, int *index)
 {
     bool range_err = (*index > count);
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
     if ( range_err )
 	qWarning( "QComboView::%s: (%s) Index %d out of range",
 		 method, name ? name : "<no name>", *index );
@@ -114,7 +114,7 @@ static inline bool checkIndex( const char *method, const char * name,
 			       int count, int index )
 {
     bool range_err = (index >= count);
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
     if ( range_err )
 	qWarning( "QComboView::%s: (%s) Index %i out of range",
 		 method, name ? name : "<no name>", index );
@@ -133,13 +133,13 @@ static inline bool checkIndex( const char *method, const char * name,
     The input field can be edited if \a rw is TRUE, otherwise the user
     may only choose one of the items in the combobox.
 
-    The \a parent and \a name arguments are passed on to the QWidget
+    The \a tqparent and \a name arguments are passed on to the TQWidget
     constructor.
 */
 
 
-QComboView::QComboView( bool rw, TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WResizeNoErase )
+QComboView::QComboView( bool rw, TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WResizeNoErase )
 {
     d = new QComboViewData( this );
     setUpListView();
@@ -158,7 +158,7 @@ QComboView::QComboView( bool rw, TQWidget *parent, const char *name )
     d->completeNow = FALSE;
     d->completionTimer = new TQTimer( this );
 
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 
     d->ed = 0;
     if ( rw )
@@ -204,7 +204,7 @@ void QComboView::clear()
 
     d->current = 0;
     if ( d->ed ) {
-        d->ed->setText( TQString::fromLatin1("") );
+        d->ed->setText( TQString::tqfromLatin1("") );
         d->updateLinedGeometry();
     }
     currentChanged();
@@ -269,20 +269,20 @@ void QComboView::setAutoResize( bool enable )
     reimp
 
     This implementation caches the size hint to avoid resizing when
-    the contents change dynamically. To invalidate the cached value
+    the contents change dynamically. To tqinvalidate the cached value
     call setFont().
 */
-TQSize QComboView::sizeHint() const
+TQSize QComboView::tqsizeHint() const
 {
-    if ( isVisible() && d->sizeHint.isValid() )
-        return d->sizeHint;
+    if ( isVisible() && d->tqsizeHint.isValid() )
+        return d->tqsizeHint;
 
     constPolish();
 //    int i, w;
     TQFontMetrics fm = fontMetrics();
 
     int maxW = childCount() ? 18 : 7 * fm.width(TQChar('x')) + 18;
-    int maxH = QMAX( fm.lineSpacing(), 14 ) + 2;
+    int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
 
 /*    for( i = 0; i < count(); i++ ) {
         w = d->listView()->item( i )->width( d->listView() );
@@ -290,10 +290,10 @@ TQSize QComboView::sizeHint() const
             maxW = w;
     }
 */
-    d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this,
+    d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
         TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()));
 
-    return d->sizeHint;
+    return d->tqsizeHint;
 }
 
 
@@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette )
 
 void QComboView::setFont( const TQFont &font )
 {
-    d->sizeHint = TQSize();      // invalidate size hint
+    d->tqsizeHint = TQSize();      // tqinvalidate size hint
     TQWidget::setFont( font );
     d->listView()->setFont( font );
     if (d->ed)
@@ -412,7 +412,7 @@ void QComboView::resizeEvent( TQResizeEvent * e )
 void QComboView::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
-    const TQColorGroup & g = colorGroup();
+    const TQColorGroup & g = tqcolorGroup();
     p.setPen(g.text());
 
     TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -428,31 +428,31 @@ void QComboView::paintEvent( TQPaintEvent * )
     }
 
 //    bool reverse = TQApplication::reverseLayout();
-    style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+    tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
                     flags, TQStyle::SC_All,
                     (d->arrowDown ?
                     TQStyle::SC_ComboBoxArrow :
                     TQStyle::SC_None ));
 
-    TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
                         TQStyle::SC_ComboBoxEditField );
-    re = TQStyle::visualRect(re, this);
+    re = TQStyle::tqvisualRect(re, this);
     p.setClipRect( re );
 
     if ( !d->ed ) {
         TQListViewItem * item = d->current;
         if ( item ) {
-            // we calculate the QListBoxTexts height (ignoring strut)
+            // we calculate the TQListBoxTexts height (ignoring strut)
             int itemh = d->listView()->fontMetrics().lineSpacing() + 2;
             p.translate( re.x(), re.y() + (re.height() - itemh)/2  );
-            item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter );
+            item->paintCell( &p, d->listView()->tqcolorGroup(), 0, width(), AlignLeft | AlignVCenter );
         }
     } else if ( d->listView() && d->listView()->currentItem( ) && d->current ) {
         TQListViewItem * item = d->current ;
         const TQPixmap *pix = item->pixmap(0);
         if ( pix ) {
             p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(),
-                    colorGroup().brush( TQColorGroup::Base ) );
+                    tqcolorGroup().brush( TQColorGroup::Base ) );
             p.drawPixmap( re.x() + 2, re.y() +
                     ( re.height() - pix->height() ) / 2, *pix );
         }
@@ -466,30 +466,30 @@ void QComboView::paintEvent( TQPaintEvent * )
 
 void QComboView::mousePressEvent( TQMouseEvent *e )
 {
-    if ( e->button() != LeftButton )
+    if ( e->button() != Qt::LeftButton )
         return;
     if ( d->discardNextMousePress ) {
         d->discardNextMousePress = FALSE;
         return;
     }
-    TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
                                 TQStyle::SC_ComboBoxArrow);
-    arrowRect = TQStyle::visualRect(arrowRect, this);
+    arrowRect = TQStyle::tqvisualRect(arrowRect, this);
 
     // Correction for motif style, where arrow is smaller
     // and thus has a rect that doesn't fit the button.
-    arrowRect.setHeight( QMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
+    arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
-    if ( childCount() && ( !editable() || arrowRect.contains( e->pos() ) ) ) {
+    if ( childCount() && ( !editable() || arrowRect.tqcontains( e->pos() ) ) ) {
         d->arrowPressed = FALSE;
         listView()->blockSignals( TRUE );
-        qApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll
+        tqApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll
         listView()->blockSignals( FALSE );
         popup();
-        if ( arrowRect.contains( e->pos() ) ) {
+        if ( arrowRect.tqcontains( e->pos() ) ) {
             d->arrowPressed = TRUE;
             d->arrowDown    = TRUE;
-            repaint( FALSE );
+            tqrepaint( FALSE );
         }
         TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
         d->shortClick = TRUE;
@@ -604,7 +604,7 @@ TQString QComboView::currentText() const
     else if ( d->current )
         return currentItem()->text(0);
     else
-        return TQString::null;
+        return TQString();
 }
 
 /*!reimp
@@ -689,23 +689,23 @@ int childCount(TQListView *lv)
 static int listHeight( TQListView *l, int /*sl*/ )
 {
 /*    if ( l->childCount() > 0 )
-        return QMIN( l->childCount(), (uint)sl) * l->firstChild()->height();
+        return TQMIN( l->childCount(), (uint)sl) * l->firstChild()->height();
     else*/
 
     int prefH = 0;
     int ch = childCount(l);
-    ch = QMIN(ch, 10);
+    ch = TQMIN(ch, 10);
     if (l->firstChild())
     {
         prefH = ch * l->firstChild()->height();
     }
     else
-        prefH = l->sizeHint().height();
+        prefH = l->tqsizeHint().height();
 
     if (l->header()->isVisible())
-        prefH += l->header()->sizeHint().height();
+        prefH += l->header()->tqsizeHint().height();
 
-//    return prefH < l->sizeHint().height() ? prefH : l->sizeHint().height();
+//    return prefH < l->tqsizeHint().height() ? prefH : l->tqsizeHint().height();
 
     return prefH+2;
 }
@@ -727,7 +727,7 @@ void QComboView::popup()
     lb->installEventFilter( this );
     lb->viewport()->installEventFilter( this );
     d->mouseWasInsidePopup = FALSE;
-//    int w = lb->variableWidth() ? lb->sizeHint().width() : width();
+//    int w = lb->variableWidth() ? lb->tqsizeHint().width() : width();
     int w = width();
     int h = listHeight( lb, d->sizeLimit );
     TQRect screen = TQApplication::desktop()->availableGeometry( const_cast<QComboView*>(this) );
@@ -737,7 +737,7 @@ void QComboView::popup()
     int sw = screen.width();    // screen width
     int sh = screen.height();   // screen height
     TQPoint pos = mapToGlobal( TQPoint(0,height()) );
-    // ## Similar code is in QPopupMenu
+    // ## Similar code is in TQPopupMenu
     int x = pos.x();
     int y = pos.y();
 
@@ -749,7 +749,7 @@ void QComboView::popup()
     if (y + h > sy+sh && y - h - height() >= 0 )
         y = y - h - height();
     TQRect rect =
-    style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
                     TQStyle::SC_ComboBoxListBoxPopup,
                     TQStyleOption( x, y, w, h ) );
     if ( rect.isNull() )
@@ -767,10 +767,10 @@ void QComboView::popup()
     lb->blockSignals( block );
     lb->setVScrollBarMode(TQScrollView::Auto);
 
-//#ifndef QT_NO_EFFECTS
+//#ifndef TQT_NO_EFFECTS
 /*    if ( TQApplication::isEffectEnabled( UI_AnimateCombo ) ) {
         if ( lb->y() < mapToGlobal(TQPoint(0,0)).y() )
-        qScrollEffect( lb, QEffects::UpScroll );
+        qScrollEffect( lb, TQEffects::UpScroll );
         else
         qScrollEffect( lb );
     } else*/
@@ -790,7 +790,7 @@ void QComboView::updateMask()
 
     {
         TQPainter p( &bm, this );
-        style().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
+        tqstyle().tqdrawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
     }
 
     setMask( bm );
@@ -808,7 +808,7 @@ void QComboView::popDownListView()
     d->listView()->setCurrentItem( d->current );
     if ( d->arrowDown ) {
         d->arrowDown = FALSE;
-        repaint( FALSE );
+        tqrepaint( FALSE );
     }
     d->poppedUp = FALSE;
 }
@@ -850,7 +850,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
 {
     if ( !event )
         return TRUE;
-    else if ( object == d->ed ) {
+    else if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->ed) ) {
         if ( event->type() == TQEvent::KeyPress ) {
             bool isAccepted = ( (TQKeyEvent*)event )->isAccepted();
             keyPressEvent( (TQKeyEvent *)event );
@@ -887,38 +887,38 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
                 }
             }
         }
-    } else if ( ( object == d->listView() ||
-                        object == d->listView()->viewport() )) {
+    } else if ( ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()) ||
+                        TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()->viewport()) )) {
         TQMouseEvent *e = (TQMouseEvent*)event;
         switch( event->type() ) {
         case TQEvent::MouseMove:
             if ( !d->mouseWasInsidePopup  ) {
 //                qWarning("!d->mouseWasInsidePopup");
                 TQPoint pos = e->pos();
-                if ( d->listView()->rect().contains( pos ) )
+                if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( pos ) )
                     d->mouseWasInsidePopup = TRUE;
                 // Check if arrow button should toggle
                 if ( d->arrowPressed ) {
                     TQPoint comboPos;
                     comboPos = mapFromGlobal( d->listView()->mapToGlobal(pos) );
                     TQRect arrowRect =
-                    style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+                    tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
                                     TQStyle::SC_ComboBoxArrow);
-                    arrowRect = TQStyle::visualRect(arrowRect, this);
-                    if ( arrowRect.contains( comboPos ) ) {
+                    arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+                    if ( arrowRect.tqcontains( comboPos ) ) {
                         if ( !d->arrowDown  ) {
                             d->arrowDown = TRUE;
-                            repaint( FALSE );
+                            tqrepaint( FALSE );
                         }
                         } else {
                         if ( d->arrowDown  ) {
                             d->arrowDown = FALSE;
-                            repaint( FALSE );
+                            tqrepaint( FALSE );
                         }
                     }
                 }
-            } else if ((e->state() & ( RightButton | LeftButton | MidButton ) ) == 0 &&
-                style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
+            } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 &&
+                tqstyle().tqstyleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
 //                qWarning("event filter:: emu");
                 TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE );
 //                if ( mouseW == d->listView()->viewport() ) { //###
@@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
 
             break;
         case TQEvent::MouseButtonRelease:
-            if ( d->listView()->rect().contains( e->pos() ) ) {
+            if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) {
                 TQMouseEvent tmp( TQEvent::MouseButtonDblClick,
                         e->pos(), e->button(), e->state() ) ;
                 // will hide popup
@@ -948,14 +948,14 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
                     d->arrowPressed = FALSE;
                     if ( d->arrowDown  ) {
                         d->arrowDown = FALSE;
-                        repaint( FALSE );
+                        tqrepaint( FALSE );
                     }
                 }
             }
             break;
         case TQEvent::MouseButtonDblClick:
         case TQEvent::MouseButtonPress:
-            if ( !d->listView()->rect().contains( e->pos() ) ) {
+            if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) {
                 TQPoint globalPos = d->listView()->mapToGlobal(e->pos());
                 if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) {
                     d->discardNextMousePress = TRUE;
@@ -980,7 +980,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
                 break;
                 case Key_Enter:
                 case Key_Return:
-                    // work around QDialog's enter handling
+                    // work around TQDialog's enter handling
                     return FALSE;
                 default:
                 break;
@@ -1085,7 +1085,7 @@ void QComboView::returnPressed()
     TQListViewItem *c = 0;
     bool doInsert = TRUE;
     if ( !d->duplicatesEnabled ) {
-        c = listView()->findItem(s, 0);
+        c = listView()->tqfindItem(s, 0);
         if ( c )
             doInsert = FALSE;
     }
@@ -1161,7 +1161,7 @@ void QComboView::setEnabled( bool enable )
 
     This function does nothing if the combobox is not editable.
 
-    \sa validator() clearValidator() QValidator
+    \sa validator() clearValidator() TQValidator
 */
 
 void QComboView::setValidator( const TQValidator * v )
@@ -1175,7 +1175,7 @@ void QComboView::setValidator( const TQValidator * v )
     Returns the validator which constrains editing for this combobox
     if there is one; otherwise returns 0.
 
-    \sa setValidator() clearValidator() QValidator
+    \sa setValidator() clearValidator() TQValidator
 */
 
 const TQValidator * QComboView::validator() const
@@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const
  */
 void QComboView::styleChange( TQStyle& s )
 {
-    d->sizeHint = TQSize();		// invalidate size hint...
+    d->tqsizeHint = TQSize();		// tqinvalidate size hint...
     if ( d->ed )
         d->updateLinedGeometry();
     TQWidget::styleChange( s );
@@ -1359,7 +1359,7 @@ void QComboView::setEditable( bool y )
         d->ed = 0;
     }
 
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
     updateGeometry();
     update();
 }
@@ -1412,7 +1412,7 @@ void QComboView::setUpLineEdit()
 void QComboView::setLineEdit( TQLineEdit *edit )
 {
     if ( !edit ) {
-#if defined(QT_CHECK_NULL)
+#if defined(TQT_CHECK_NULL)
         Q_ASSERT( edit != 0 );
 #endif
         return;
@@ -1430,7 +1430,7 @@ void QComboView::setLineEdit( TQLineEdit *edit )
 
     d->ed = edit;
 
-    if ( edit->parent() != this ) {
+    if ( TQT_BASE_OBJECT(edit->tqparent()) != TQT_BASE_OBJECT(this) ) {
         edit->reparent( this, TQPoint(0,0), FALSE );
         edit->setFont( font() );
     }
@@ -1443,7 +1443,7 @@ void QComboView::setLineEdit( TQLineEdit *edit )
     d->updateLinedGeometry();
     edit->installEventFilter( this );
     setFocusProxy( edit );
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 
     setUpListView();
 
@@ -1457,7 +1457,7 @@ void QComboView::setLineEdit( TQLineEdit *edit )
 void QComboView::setCurrentText( const TQString& txt )
 {
     TQListViewItem *i;
-    i = listView()->findItem(txt, 0);
+    i = listView()->tqfindItem(txt, 0);
     if ( i )
         setCurrentItem( i );
     else if ( d->ed )
@@ -1501,5 +1501,5 @@ void QComboView::setCurrentActiveItem( TQListViewItem * item )
 
 #include "qcomboview.moc"
 
-#endif // QT_NO_COMBOBOX
+#endif // TQT_NO_COMBOBOX
 
diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h
index 1fc87e14..213c278f 100644
--- a/lib/widgets/qcomboview.h
+++ b/lib/widgets/qcomboview.h
@@ -13,14 +13,14 @@
 **
 **********************************************************************/
 
-#ifndef QCOMBOVIEW_H
-#define QCOMBOVIEW_H
+#ifndef TQCOMBOVIEW_H
+#define TQCOMBOVIEW_H
 
-#ifndef QT_H
+#ifndef TQT_H
 #include "tqwidget.h"
-#endif // QT_H
+#endif // TQT_H
 
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 
 /**
 @file qcomboview.h
@@ -40,25 +40,26 @@ QComboView - a combo with a TQListView as a popup widget.
 This means that you can have a treeview inside of a combo. Otherwise it works
 in the same way as TQComboBox and have similar API.
 */
-class Q_EXPORT QComboView : public QWidget
+class TQ_EXPORT QComboView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
     Q_ENUMS( Policy )
-    Q_PROPERTY( bool editable READ editable WRITE setEditable )
-//    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
-//    Q_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem )
-    Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
-    Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
-//    Q_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
-    Q_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy )
-    Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
-    Q_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled )
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_PROPERTY( bool editable READ editable WRITE setEditable )
+//    TQ_PROPERTY( int count READ count )
+    TQ_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
+//    TQ_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem )
+    TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
+    TQ_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
+//    TQ_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
+    TQ_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy )
+    TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
+    TQ_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
-//    QComboView( TQWidget* parent=0, const char* name=0 );
-    QComboView( bool rw, TQWidget* parent=0, const char* name=0 );
+//    QComboView( TQWidget* tqparent=0, const char* name=0 );
+    QComboView( bool rw, TQWidget* tqparent=0, const char* name=0 );
     ~QComboView();
 
     int childCount() const;
@@ -69,7 +70,7 @@ public:
 
     bool	autoResize()	const;
     virtual void setAutoResize( bool );
-    QSize	sizeHint() const;
+    TQSize	tqsizeHint() const;
 
     void	setPalette( const TQPalette & );
     void	setFont( const TQFont & );
@@ -160,13 +161,13 @@ private:
     QComboViewData	*d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     QComboView( const QComboView & );
     QComboView &operator=( const QComboView & );
 #endif
 };
 
 
-#endif // QT_NO_COMBOBOX
+#endif // TQT_NO_COMBOBOX
 
-#endif // QCOMBOVIEW_H
+#endif // TQCOMBOVIEW_H
diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp
index 6ca7e239..eeeba8d0 100644
--- a/lib/widgets/resizablecombo.cpp
+++ b/lib/widgets/resizablecombo.cpp
@@ -51,8 +51,8 @@ static const char * resize_xpm[] = {
 "    .    ",
 "         "};
 
-ResizableCombo::ResizableCombo(KComboView *view, TQWidget *parent, const char *name):
-    TQWidget(parent, name), m_sizer(0), m_combo(view)
+ResizableCombo::ResizableCombo(KComboView *view, TQWidget *tqparent, const char *name):
+    TQWidget(tqparent, name), m_sizer(0), m_combo(view)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this);
     view->reparent(this, TQPoint(0,0));
@@ -86,10 +86,10 @@ void MyPushButton::mouseMoveEvent( TQMouseEvent * e )
     TQPushButton::mouseMoveEvent(e);
 }
 
-MyPushButton::MyPushButton( ResizableCombo * parent, const char * name )
-    :TQPushButton(parent, name), m_resizing(false), m_combo(parent)
+MyPushButton::MyPushButton( ResizableCombo * tqparent, const char * name )
+    :TQPushButton(tqparent, name), m_resizing(false), m_combo(tqparent)
 {
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setFlat(true);
     m_width = m_combo->m_combo->width();
 }
diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h
index 9301ddea..bafefe33 100644
--- a/lib/widgets/resizablecombo.h
+++ b/lib/widgets/resizablecombo.h
@@ -35,10 +35,11 @@ Resizable combo box.
 Resizable combo box.
 Used to place resizable KComboBox onto toolbars.
 */
-class ResizableCombo: public QWidget{
+class ResizableCombo: public TQWidget{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0);
+    ResizableCombo(KComboView *view, TQWidget *tqparent = 0, const char *name = 0);
 
 private:
     MyPushButton *m_sizer;
@@ -47,10 +48,10 @@ private:
 friend class MyPushButton;
 };
 
-class MyPushButton: public QPushButton
+class MyPushButton: public TQPushButton
 {
 public:
-    MyPushButton(ResizableCombo *parent = 0, const char *name = 0 );
+    MyPushButton(ResizableCombo *tqparent = 0, const char *name = 0 );
 
     TQPoint pressedPos()
     {
diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp
index 6e174603..675145b5 100644
--- a/parts/abbrev/abbrevconfigwidget.cpp
+++ b/parts/abbrev/abbrevconfigwidget.cpp
@@ -25,8 +25,8 @@
 #include "addtemplatedlg.h"
 #include "abbrevpart.h"
 
-AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const char *name)
-    : AbbrevConfigWidgetBase(parent, name)
+AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *tqparent, const char *name)
+    : AbbrevConfigWidgetBase(tqparent, name)
 {
     m_part = part;
 
diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h
index 818aa3ba..514c53c4 100644
--- a/parts/abbrev/abbrevconfigwidget.h
+++ b/parts/abbrev/abbrevconfigwidget.h
@@ -23,9 +23,10 @@
 class AbbrevConfigWidget : public AbbrevConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent=0, const char *name=0);
+    AbbrevConfigWidget(AbbrevPart *part, TQWidget *tqparent=0, const char *name=0);
     ~AbbrevConfigWidget();
 
 public slots:
diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui
index fd432a3e..15bf9940 100644
--- a/parts/abbrev/abbrevconfigwidgetbase.ui
+++ b/parts/abbrev/abbrevconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AbbrevConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>abbrev_config_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -30,12 +30,12 @@
                 <cstring>editCode</cstring>
             </property>
         </widget>
-        <widget class="QMultiLineEdit" row="3" column="0">
+        <widget class="TQMultiLineEdit" row="3" column="0">
             <property name="name">
                 <cstring>editCode</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="0" column="0">
+        <widget class="TQCheckBox" row="0" column="0">
             <property name="name">
                 <cstring>checkWordCompletion</cstring>
             </property>
@@ -43,15 +43,15 @@
                 <string>&amp;Enable automatic word completion</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>buttonRemoveTemplate</cstring>
                     </property>
@@ -59,7 +59,7 @@
                         <string>&amp;Remove</string>
                     </property>
                 </widget>
-                <widget class="QListView" row="1" column="0" rowspan="3" colspan="1">
+                <widget class="TQListView" row="1" column="0" rowspan="3" colspan="1">
                     <column>
                         <property name="text">
                             <string>Template</string>
@@ -103,7 +103,7 @@
                         <enum>AllColumns</enum>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>buttonAddTemplate</cstring>
                     </property>
@@ -111,7 +111,7 @@
                         <string>&amp;Add...</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -179,12 +179,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">addTemplate()</slot>
     <slot access="protected">codeChanged()</slot>
     <slot access="protected">removeTemplate()</slot>
     <slot access="protected">selectionChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index a86d98f8..33660069 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -65,8 +65,8 @@ public:
 
 K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory )
 
-AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "AbbrevPart")
+AbbrevPart::AbbrevPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "AbbrevPart")
 {
     setInstance(AbbrevFactory::instance());
     setXMLFile("kdevabbrev.rc");
@@ -158,17 +158,17 @@ void AbbrevPart::load()
     if (TQFileInfo(localTemplatesFile).exists())
         files << localTemplatesFile;
     else
-        files = dirs->findAllResources("codetemplates", TQString::null, false, true);
+        files = dirs->findAllResources("codetemplates", TQString(), false, true);
 
     TQString localSourcesFile = locateLocal("sources", "sources", AbbrevFactory::instance());
     TQStringList sourceFiles;
     if (TQFileInfo(localSourcesFile).exists())
         sourceFiles << localSourcesFile;
     else
-        sourceFiles = dirs->findAllResources("sources", TQString::null, false, true);
+        sourceFiles = dirs->findAllResources("sources", TQString(), false, true);
     kdDebug(9028) << "=========> sourceFiles: " << sourceFiles.join(" ") << endl;
 
-    this->m_completionFile = TQString::null;
+    this->m_completionFile = TQString();
     for( TQStringList::Iterator it=sourceFiles.begin(); it!=sourceFiles.end(); ++it ) {
         TQString fn = *it;
 	kdDebug(9028) << "===> load file: " << fn << endl;
@@ -284,7 +284,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin
     }
 
     TQString suffix = part->url().url();
-    int pos = suffix.findRev('.');
+    int pos = suffix.tqfindRev('.');
     if (pos != -1)
         suffix.remove(0, pos+1);
     kdDebug(9028) << "AbbrevPart::findAllWords with suffix " << suffix << endl;
@@ -298,7 +298,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin
     while ( (pos = rx.search(text, idx)) != -1 ) {
 	len = rx.matchedLength();
 	TQString word = text.mid(pos, len);
-        if (map.find(word) == map.end()) {
+        if (map.tqfind(word) == map.end()) {
             KTextEditor::CompletionEntry e;
             e.text = word;
             entries << e;
@@ -313,7 +313,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin
     while ( (pos = rx.search(m_completionFile, idx)) != -1 ) {
 	len = rx.matchedLength();
 	TQString word = m_completionFile.mid(pos, len);
-        if (map.find(word) == map.end()) {
+        if (map.tqfind(word) == map.end()) {
             KTextEditor::CompletionEntry e;
             e.text = word;
             entries << e;
@@ -345,7 +345,7 @@ void AbbrevPart::slotExpandAbbrev()
     }
 
     TQString suffix = part->url().url();
-    int pos = suffix.findRev('.');
+    int pos = suffix.tqfindRev('.');
     if (pos != -1)
         suffix.remove(0, pos+1);
 
@@ -374,7 +374,7 @@ void AbbrevPart::slotExpandAbbrev()
         cursoriface->cursorPositionReal(&line, &col);
 
         TQString linestr = editIface->textLine(line);
-        int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 );
+        int startPos = TQMAX( TQMIN( (int)col, (int)linestr.length()-1 ), 0 );
         int endPos = startPos;
         startPos--;
         while (startPos >= 0 && ( linestr[startPos].isLetterOrNumber() || linestr[startPos] == '_' || linestr[startPos] == '~') )
@@ -417,7 +417,7 @@ void AbbrevPart::insertChars( const TQString &chars )
 		currentCol += spaces.length();
 	}
 
-        int idx = lineText.find( '|' );
+        int idx = lineText.tqfind( '|' );
         if( idx != -1 ){
             stream << lineText.left( idx ) << lineText.mid( idx+1 );
 	    if( !foundPipe ){
@@ -562,7 +562,7 @@ void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, TQ
     }
 
     TQString suffix = part->url().url();
-    int pos = suffix.findRev('.');
+    int pos = suffix.tqfindRev('.');
     if (pos != -1)
         suffix.remove(0, pos+1);
     kdDebug(9028) << "AbbrevPart::slotFilterInsertString with suffix " << suffix << endl;
@@ -621,9 +621,9 @@ TQMap< TQString, CodeTemplate * > CodeTemplateList::operator [ ]( TQString suffi
     for (TQMap<TQString, TQMap<TQString, CodeTemplate* > >::const_iterator it = templates.begin(); it != templates.end(); ++it)
     {
         kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << endl;
-        if (TQStringList::split(",", it.key()).contains(suffix))
+        if (TQStringList::split(",", it.key()).tqcontains(suffix))
         {
-            kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " contains " << suffix << endl;
+            kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " tqcontains " << suffix << endl;
 
             TQMap<TQString, CodeTemplate* > m = it.data();
             for (TQMap<TQString, CodeTemplate* >::const_iterator itt = m.begin(); itt != m.end(); ++itt)
@@ -640,18 +640,18 @@ void CodeTemplateList::insert( TQString name, TQString description, TQString cod
 {
     TQString origSuffixes = suffixes;
 //    TQStringList suffixList;
-    int pos = suffixes.find('(');
+    int pos = suffixes.tqfind('(');
     if (pos == -1)
         return;
     suffixes.remove(0, pos+1);
-    pos = suffixes.find(')');
+    pos = suffixes.tqfind(')');
     if (pos == -1)
         return;
     suffixes.remove(pos, suffixes.length()-pos);
 //    suffixList = TQStringList::split(",", suffixes);
 
     CodeTemplate *t;
-    if (templates.contains(suffixes) && templates[suffixes].contains(name))
+    if (templates.tqcontains(suffixes) && templates[suffixes].tqcontains(name))
     {
         kdDebug(9028) << "found template for suffixes " << suffixes << " and name " << name << endl;
         t = templates[suffixes][name];
@@ -667,7 +667,7 @@ void CodeTemplateList::insert( TQString name, TQString description, TQString cod
     t->description = description;
     t->code = code;
     t->suffixes = origSuffixes;
-    if (!m_suffixes.contains(origSuffixes))
+    if (!m_suffixes.tqcontains(origSuffixes))
         m_suffixes.append(origSuffixes);
 }
 
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index d1c1bc7c..566e7896 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -63,9 +63,10 @@ private:
 class AbbrevPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AbbrevPart( TQObject *parent, const char *name, const TQStringList & );
+    AbbrevPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~AbbrevPart();
 
     bool autoWordCompletionEnabled() const;
diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp
index a837c08a..6be8c703 100644
--- a/parts/abbrev/addtemplatedlg.cpp
+++ b/parts/abbrev/addtemplatedlg.cpp
@@ -22,8 +22,8 @@
 #include <klineedit.h>
 #include <tqpushbutton.h>
 
-AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *parent, const char *name )
-    : AddTemplateDialogBase( parent, name )
+AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *tqparent, const char *name )
+    : AddTemplateDialogBase( tqparent, name )
 {
     setFocusProxy( editTemplate );
     comboSuffixes->insertStringList(suffixesList);
diff --git a/parts/abbrev/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h
index 64bcc24e..04298214 100644
--- a/parts/abbrev/addtemplatedlg.h
+++ b/parts/abbrev/addtemplatedlg.h
@@ -26,9 +26,10 @@
 class AddTemplateDialog: public AddTemplateDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    AddTemplateDialog( TQStringList suffixesList, TQWidget *parent=0, const char *name=0 );
+    AddTemplateDialog( TQStringList suffixesList, TQWidget *tqparent=0, const char *name=0 );
     virtual ~AddTemplateDialog();
 
     TQString templ() const;
diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui
index bfe5f0bb..93e72d4b 100644
--- a/parts/abbrev/addtemplatedlgbase.ui
+++ b/parts/abbrev/addtemplatedlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddTemplateDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddTemplateDialog</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -43,14 +43,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -64,7 +64,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -77,7 +77,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <cstring>editTemplate</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -119,19 +119,19 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>10</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QComboBox" row="2" column="1">
+        <widget class="TQComboBox" row="2" column="1">
             <property name="name">
                 <cstring>comboSuffixes</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>labelSuffixes</cstring>
             </property>
@@ -168,8 +168,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/abbrev/cpp_keywords b/parts/abbrev/cpp_keywords
index 72d96901..e84d0cf1 100644
--- a/parts/abbrev/cpp_keywords
+++ b/parts/abbrev/cpp_keywords
@@ -1,9 +1,9 @@
 K_DCOP
 k_dcop
-k_dcop_signals
+k_dcop_Q_SIGNALS
 Q_OBJECT
-signals
-slots
+Q_SIGNALS
+Q_SLOTS
 emit
 __int64
 __asm__
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 3d854ba0..4a54d195 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -90,8 +90,8 @@
 #include "propeditor/propertylist.h"
 #include "propeditor/propertyeditor.h"
 
-AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const char *name)
-    : AppWizardDialogBase(parent, name,true), m_pCurrentAppInfo(0),
+AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *tqparent, const char *name)
+    : AppWizardDialogBase(tqparent, name,true), m_pCurrentAppInfo(0),
 	m_profileSupport(new ProfileSupport(part))
 {
 	kdDebug( 9010 ) << "  ** AppWizardDialog::AppWizardDialog()" << endl;
@@ -125,7 +125,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 
     KStandardDirs *dirs = AppWizardFactory::instance()->dirs();
-    TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString::null, false, true);
+    TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString(), false, true);
 
     kdDebug(9010) << "Templates: " << endl;
     TQStringList categories;
@@ -148,7 +148,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
         info->fileTemplates = templateConfig.readEntry("FileTemplates");
         info->openFilesAfterGeneration = templateConfig.readListEntry("ShowFilesAfterGeneration");
         TQString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir);
-        destDir.replace(TQRegExp("HOMEDIR"), TQDir::homeDirPath());
+        destDir.tqreplace(TQRegExp("HOMEDIR"), TQDir::homeDirPath());
         info->defaultDestDir = destDir;
         TQString category = templateConfig.readEntry("Category");
         // format category to a unique status
@@ -266,7 +266,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     // Insert items into list view
     TQPtrListIterator<ApplicationInfo> ait(m_appsInfo);
     for (; ait.current(); ++ait) {
-        TQListViewItem *item = m_categoryMap.find(ait.current()->category);
+        TQListViewItem *item = m_categoryMap.tqfind(ait.current()->category);
         if (item)
 		{
             item = new KListViewItem(item, ait.current()->name);
@@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     // How about names like "__" or "123" for project name? Are they legal?
     TQRegExpValidator *appname_edit_validator;
     appname_edit_validator = new TQRegExpValidator (appname_regexp,
-                                                   appname_edit,
+                                                   TQT_TQOBJECT(appname_edit),
                                                    "AppNameValidator");
     appname_edit->setValidator(appname_edit_validator);
 
@@ -415,7 +415,7 @@ void AppWizardDialog::licenseChanged()
 		for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it)
 		{
 			TQMultiLineEdit *edit = (*it).edit;
-			edit->setText( TQString::null );
+			edit->setText( TQString() );
 		}
 	} else {
 		KDevLicense* lic = licenses()[ license_combo->currentText() ];
@@ -486,7 +486,7 @@ void AppWizardDialog::accept()
 	}
 	else
 	{
-		KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
+		KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
 		templateArchive.close();
 		return;
 	}
@@ -509,7 +509,7 @@ void AppWizardDialog::accept()
 	m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() );
 	m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text());
 	m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" );
-	m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) );
+	m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().year() ) );
 
 	// This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE}
 	// and unsurprisingly, KAboutData doesn't cover every imaginable case.
@@ -517,7 +517,7 @@ void AppWizardDialog::accept()
 	TQString license = license_combo->currentText();
 	if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"||
 		license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || 
-		license == "QPL" || license == "QPL_V1_0" )
+		license == "TQPL" || license == "TQPL_V1_0" )
 	{
 		m_pCurrentAppInfo->subMap.insert("LICENSE", license );
 	}
@@ -543,7 +543,7 @@ void AppWizardDialog::accept()
 
 	// This is too silly for words, but it's either this or reimplementing FileTemplate
 	TQString tempProjectDomSource = "<!DOCTYPE kdevelop><kdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></kdevelop>";
-	tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() );
+	tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() );
 	TQDomDocument tempProjectDom;
 	tempProjectDom.setContent( tempProjectDomSource );
 
@@ -559,13 +559,13 @@ void AppWizardDialog::accept()
 		temps.setEncoding(TQTextStream::UnicodeUTF8);
 		temps << templateText;
 		f.flush();
-		TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() );
+		TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() );
 		cleanUpSubstMap << templateName;
 		m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap)  );
 
 		installFile file;
 		file.source = tempFile->name();
-		file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix );
+		file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix );
 		file.process = true;
 		file.isXML = false;
 		m_pCurrentAppInfo->fileList.append( file );
@@ -585,8 +585,8 @@ void AppWizardDialog::accept()
 			for( ; it != files.end(); ++it )
 			{
 				installFile file;
-				file.source = TQString( "%{kdevelop}/template-common/%1" ).arg( *it );
-				file.dest = TQString("%{dest}/%1").arg( *it );
+				file.source = TQString( "%{kdevelop}/template-common/%1" ).tqarg( *it );
+				file.dest = TQString("%{dest}/%1").tqarg( *it );
 				file.process = true;
 				file.isXML = false;
 				m_pCurrentAppInfo->fileList.append( file );
@@ -630,9 +630,9 @@ void AppWizardDialog::accept()
 	for( ; mapIt != m_pCurrentAppInfo->subMap.end(); ++mapIt )
 	{
 		TQString escaped( mapIt.data() );
-		escaped.replace( "&", "&amp;" );
-		escaped.replace( "<", "&lt;" );
-		escaped.replace( ">", "&gt;" );
+		escaped.tqreplace( "&", "&amp;" );
+		escaped.tqreplace( "<", "&lt;" );
+		escaped.tqreplace( ">", "&gt;" );
 		m_pCurrentAppInfo->subMapXML.insert( mapIt.key(), escaped );
 	}
 
@@ -645,7 +645,7 @@ void AppWizardDialog::accept()
 		{
 			if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) )
 			{
-				KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) );
+				KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) );
 				return;
 			}
 		}
@@ -664,7 +664,7 @@ void AppWizardDialog::accept()
 			}
 			else
 			{
-				KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) );
+				KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) );
 				archive.close();
 				return;
 			}
@@ -682,7 +682,7 @@ void AppWizardDialog::accept()
 		{
 			if( !copyFile( *fileIt ) )
 			{
-				KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) );
+				KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) );
 				return;
 			}
 			setPermissions(*fileIt);
@@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin
 				// ( where should we currently get that info from? )
 				if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) )
 				{
-					KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) );
+					KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) );
 					return;
 				}
 				setPermissions(file, dest + "/" + file->name());
@@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item)
             if (it == l.end())
                 m_lastPage = edit;
             fileTemplate.edit = edit;
-            addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix));
+            addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix));
             m_fileTemplates.append(fileTemplate);
         }
         licenseChanged();	// to populate the template views
@@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir)
         TQDir newDir (dir);
         kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl;
         if (defPrjDir != newDir) {
-            if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ),
+            if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ),
                                            i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes)
             {
                 config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/");
@@ -968,7 +968,7 @@ void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategor
     TQStringList::ConstIterator it;
     for (it = categories.begin(); it != categories.end(); ++it) {
         category = category + "/" + *it;
-        TQListViewItem *item = m_categoryMap.find(category);
+        TQListViewItem *item = m_categoryMap.tqfind(category);
         if (!item) { // not found, create it
             if (!pParentItem)
                 pParentItem = new KListViewItem(templates_listview,*it);
@@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration()
 	{
 		KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
 				"XML error in line %1, column %2:\n%3")
-				.arg(errorLine).arg(errorCol).arg(errorMsg));
+				.tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
 		return;
 	}
 
@@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration()
 	DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
 
 	//save the selected vcs
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
+	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText()));
 	if (offers.count() == 1)
 	{
 		KService::Ptr service = offers.first();
@@ -1283,14 +1283,14 @@ void AppWizardDialog::loadLicenses()
 	// kdDebug(9010) << "======================== Entering loadLicenses" << endl;
 	KStandardDirs* dirs = KGlobal::dirs();
 	dirs->addResourceType( "licenses", KStandardDirs::kde_default( "data" ) + "kdevelop/licenses/" );
-	TQStringList licNames = dirs->findAllResources( "licenses", TQString::null, false, true );
+	TQStringList licNames = dirs->findAllResources( "licenses", TQString(), false, true );
 
 	TQStringList::Iterator it;
 	for (it = licNames.begin(); it != licNames.end(); ++it)
 	{
 		TQString licPath( dirs->findResource( "licenses", *it ) );
 		kdDebug(9010) << "Loading license file: " << licPath << endl;
-		TQString licName = licPath.mid( licPath.findRev('/') + 1 );
+		TQString licName = licPath.mid( licPath.tqfindRev('/') + 1 );
 		KDevLicense* lic = new KDevLicense( licName, licPath );
 		m_licenses.insert( licName, lic );
 	}
@@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all)
 		TQDictIterator<TQListViewItem> dit(m_categoryMap);
 		for (; dit.current(); ++dit)
 		{
-			//checking whether all children are not visible
+			//checking whether all tqchildren are not visible
 			kdDebug(9010) << "check: " << dit.current()->text(0) << endl;
 			bool visible = false;
 			TQListViewItemIterator it(dit.current());
@@ -1342,7 +1342,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view)
 	TQListViewItem *item = view->firstChild();
 	while (item)
 	{
-		if (!m_categoryItems.contains(item))
+		if (!m_categoryItems.tqcontains(item))
 			continue;
 		checkAndHideItems(item);
 		item = item->nextSibling();
@@ -1351,7 +1351,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view)
 
 bool AppWizardDialog::checkAndHideItems(TQListViewItem *item)
 {
-	if (!m_categoryItems.contains(item))
+	if (!m_categoryItems.tqcontains(item))
 		return !item->isVisible();
 	TQListViewItem *child = item->firstChild();
 	bool hide = true;
@@ -1371,4 +1371,4 @@ bool AppWizardDialog::checkAndHideItems(TQListViewItem *item)
 
 #include "appwizarddlg.moc"
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index a08206da..c63f66e1 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -121,9 +121,10 @@ struct AppWizardFileTemplate
 class AppWizardDialog : public AppWizardDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AppWizardDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 );
+    AppWizardDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 );
     ~AppWizardDialog();
     TQString getProjectName() { return appname_edit->text(); }
     TQString getProjectLocation() { return finalLoc_label->text(); }
@@ -206,4 +207,4 @@ public slots:
 
 #endif
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index f6d1fa49..ab8f7af0 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AppWizardDialogBase</class>
-<widget class="QWizard">
+<widget class="TQWizard">
     <property name="name">
         <cstring>AppWizardDialogBase</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Create New Project</string>
     </property>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>generalPage</cstring>
         </property>
@@ -26,11 +26,11 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QTabWidget" row="0" column="0" rowspan="2" colspan="1">
+            <widget class="TQTabWidget" row="0" column="0" rowspan="2" colspan="1">
                 <property name="name">
                     <cstring>templates_tabwidget</cstring>
                 </property>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>m_allProjectsPage</cstring>
                     </property>
@@ -86,7 +86,7 @@
                                 <string></string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="0">
+                        <widget class="TQCheckBox" row="1" column="0">
                             <property name="name">
                                 <cstring>showAll_box</cstring>
                             </property>
@@ -99,7 +99,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>m_favouritesPage</cstring>
                     </property>
@@ -127,7 +127,7 @@
                     </grid>
                 </widget>
             </widget>
-            <widget class="QLabel" row="0" column="1">
+            <widget class="TQLabel" row="0" column="1">
                 <property name="name">
                     <cstring>icon_label</cstring>
                 </property>
@@ -139,13 +139,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>250</width>
                         <height>180</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>250</width>
                         <height>180</height>
@@ -160,13 +160,13 @@
                 <property name="scaledContents">
                     <bool>true</bool>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>AlignCenter</set>
                 </property>
                 <property name="hAlign" stdset="0">
                 </property>
             </widget>
-            <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+            <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
                 <property name="name">
                     <cstring>GroupBox1</cstring>
                 </property>
@@ -177,15 +177,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout2</cstring>
+                            <cstring>tqlayout2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>appname_label</cstring>
                                 </property>
@@ -196,7 +196,7 @@
                                     <cstring>appname_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>location_label</cstring>
                                 </property>
@@ -207,7 +207,7 @@
                                     <cstring>dest_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel3</cstring>
                                 </property>
@@ -217,9 +217,9 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout1</cstring>
+                            <cstring>tqlayout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -251,7 +251,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>finalLoc_label</cstring>
                                 </property>
@@ -271,7 +271,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QMultiLineEdit" row="1" column="1">
+            <widget class="TQMultiLineEdit" row="1" column="1">
                 <property name="name">
                     <cstring>desc_textview</cstring>
                 </property>
@@ -286,13 +286,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>250</width>
                         <height>0</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>250</width>
                         <height>32767</height>
@@ -313,7 +313,7 @@
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>WizardPage</cstring>
         </property>
@@ -324,7 +324,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>projectOptions</cstring>
                 </property>
@@ -343,15 +343,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout6</cstring>
+                            <cstring>tqlayout6</cstring>
                         </property>
                         <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>author_label</cstring>
                                 </property>
@@ -362,7 +362,7 @@
                                     <cstring>author_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>email_label</cstring>
                                 </property>
@@ -373,7 +373,7 @@
                                     <cstring>email_edit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>version_label</cstring>
                                 </property>
@@ -386,9 +386,9 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -420,9 +420,9 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout7</cstring>
+                                    <cstring>tqlayout7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -444,7 +444,7 @@
                                             <string>0.1</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>license_label</cstring>
                                         </property>
@@ -455,7 +455,7 @@
                                             <cstring>license_combo</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QComboBox">
+                                    <widget class="TQComboBox">
                                         <item>
                                             <property name="text">
                                                 <string>Custom</string>
@@ -479,7 +479,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>optionsGroup</cstring>
                 </property>
@@ -491,7 +491,7 @@
                         <verstretch>1</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>550</width>
                         <height>270</height>
@@ -510,7 +510,7 @@
                     <property name="spacing">
                         <number>0</number>
                     </property>
-                    <widget class="QFrame" row="0" column="0">
+                    <widget class="TQFrame" row="0" column="0">
                         <property name="name">
                             <cstring>custom_options</cstring>
                         </property>
@@ -542,69 +542,69 @@
 <connections>
     <connection>
         <sender>templates_listview</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>AppWizardDialogBase</receiver>
-        <slot>templatesTreeViewClicked(QListViewItem*)</slot>
+        <slot>templatesTreeViewClicked(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>author_edit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
         <slot>textChanged()</slot>
     </connection>
     <connection>
         <sender>version_edit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
         <slot>textChanged()</slot>
     </connection>
     <connection>
         <sender>appname_edit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
         <slot>textChanged()</slot>
     </connection>
     <connection>
         <sender>appname_edit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
         <slot>projectLocationChanged()</slot>
     </connection>
     <connection>
         <sender>dest_edit</sender>
-        <signal>urlSelected(const QString&amp;)</signal>
+        <signal>urlSelected(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
-        <slot>destButtonClicked(const QString&amp;)</slot>
+        <slot>destButtonClicked(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>dest_edit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
         <slot>projectLocationChanged()</slot>
     </connection>
     <connection>
         <sender>favourites_iconview</sender>
-        <signal>selectionChanged(QIconViewItem*)</signal>
+        <signal>selectionChanged(TQIconViewItem*)</signal>
         <receiver>AppWizardDialogBase</receiver>
-        <slot>favouritesIconViewClicked(QIconViewItem*)</slot>
+        <slot>favouritesIconViewClicked(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>templates_listview</sender>
-        <signal>contextMenuRequested(QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>contextMenuRequested(TQListViewItem*,const TQPoint&amp;,int)</signal>
         <receiver>AppWizardDialogBase</receiver>
-        <slot>templatesContextMenu(QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>templatesContextMenu(TQListViewItem*,const TQPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>favourites_iconview</sender>
-        <signal>contextMenuRequested(QIconViewItem*,const QPoint&amp;)</signal>
+        <signal>contextMenuRequested(TQIconViewItem*,const TQPoint&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
-        <slot>favouritesContextMenu(QIconViewItem*,const QPoint&amp;)</slot>
+        <slot>favouritesContextMenu(TQIconViewItem*,const TQPoint&amp;)</slot>
     </connection>
     <connection>
         <sender>favourites_iconview</sender>
-        <signal>contextMenuRequested(QIconViewItem*,const QPoint&amp;)</signal>
+        <signal>contextMenuRequested(TQIconViewItem*,const TQPoint&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
-        <slot>favouritesContextMenu(QIconViewItem*,const QPoint&amp;)</slot>
+        <slot>favouritesContextMenu(TQIconViewItem*,const TQPoint&amp;)</slot>
     </connection>
     <connection>
         <sender>showAll_box</sender>
@@ -614,7 +614,7 @@
     </connection>
     <connection>
         <sender>dest_edit</sender>
-        <signal>returnPressed(const QString&amp;)</signal>
+        <signal>returnPressed(const TQString&amp;)</signal>
         <receiver>AppWizardDialogBase</receiver>
         <slot>projectLocationChanged()</slot>
     </connection>
@@ -636,20 +636,20 @@
     <include location="global" impldecl="in implementation">kiconview.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">licenseChanged()</slot>
-    <slot access="protected">destButtonClicked( const QString &amp; )</slot>
+    <slot access="protected">destButtonClicked( const TQString &amp; )</slot>
     <slot access="protected">projectLocationChanged()</slot>
     <slot access="protected">projectNameChanged()</slot>
     <slot access="protected">textChanged()</slot>
-    <slot access="protected">templatesTreeViewClicked( QListViewItem * )</slot>
-    <slot access="protected">favouritesIconViewClicked( QIconViewItem * )</slot>
-    <slot access="protected">templatesContextMenu( QListViewItem *, const QPoint &amp;, int )</slot>
-    <slot access="protected">favouritesContextMenu( QIconViewItem *, const QPoint &amp; )</slot>
+    <slot access="protected">templatesTreeViewClicked( TQListViewItem * )</slot>
+    <slot access="protected">favouritesIconViewClicked( TQIconViewItem * )</slot>
+    <slot access="protected">templatesContextMenu( TQListViewItem *, const TQPoint &amp;, int )</slot>
+    <slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint &amp; )</slot>
     <slot>showTemplates(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kiconview.h</includehint>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index 6b57b320..5e324b8a 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -34,8 +34,8 @@
 #include <kdevcore.h>
 #include <codemodel.h>
 
-AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
+AppWizardPart::AppWizardPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(AppWizardFactory::info(), tqparent, name ? name : "AppWizardPart")
 {
     setInstance(AppWizardFactory::instance());
     setXMLFile("kdevappwizard.rc");
@@ -95,4 +95,4 @@ void AppWizardPart::openFilesAfterGeneration()
 
 #include "appwizardpart.moc"
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h
index 5b434ebf..66894790 100644
--- a/parts/appwizard/appwizardpart.h
+++ b/parts/appwizard/appwizardpart.h
@@ -24,9 +24,10 @@ class AppWizardDialog;
 class AppWizardPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AppWizardPart( TQObject *parent, const char *name, const TQStringList & );
+    AppWizardPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~AppWizardPart();
 
     void openFilesAfterGeneration(const KURL::List urlsToOpen);
diff --git a/parts/appwizard/common/COPYING.LIB b/parts/appwizard/common/COPYING.LIB
index 789c31ee..271a81c9 100644
--- a/parts/appwizard/common/COPYING.LIB
+++ b/parts/appwizard/common/COPYING.LIB
@@ -123,7 +123,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
+all the source code for all modules it tqcontains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
@@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
+structure tqlayouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
diff --git a/parts/appwizard/common/gnome/macros/autogen.sh b/parts/appwizard/common/gnome/macros/autogen.sh
index 70273913..33acff24 100644
--- a/parts/appwizard/common/gnome/macros/autogen.sh
+++ b/parts/appwizard/common/gnome/macros/autogen.sh
@@ -79,7 +79,7 @@ xlc )
   am_opt=--include-deps;;
 esac
 
-for coin in `find $srcdir -name configure.in -print`
+for coin in `tqfind $srcdir -name configure.in -print`
 do 
   dr=`dirname $coin`
   if test -f $dr/NO-AUTO-GEN; then
diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4
index 3dd4ffaa..21d90b01 100644
--- a/parts/appwizard/common/gnome/macros/curses.m4
+++ b/parts/appwizard/common/gnome/macros/curses.m4
@@ -11,7 +11,7 @@ dnl   @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
 dnl   Makefile.in's
 dnl - Modify the following configure variables (these are the only
 dnl   curses.m4 variables you can access from within configure.in)
-dnl   CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
+dnl   CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if
 dnl                       an ncurses.h that's been renamed to curses.h
 dnl                       is found.
 dnl   CURSES_LIBS       - sets -L and -l's appropriately
diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4
index 7c11a785..5c9f976f 100644
--- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4
+++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4
@@ -38,7 +38,7 @@ fi
 list_mounted_fs=
 
 # If the getmntent function is available but not in the standard library,
-# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
+# make sure LIBS tqcontains -lsun (on Irix4) or -lseq (on PTX).
 AC_FUNC_GETMNTENT
 
 # This test must precede the ones for getmntent because Unicos-9 is
diff --git a/parts/appwizard/common/gnome2/macros/autogen.sh b/parts/appwizard/common/gnome2/macros/autogen.sh
index ac9e0b68..9cd3c7fe 100755
--- a/parts/appwizard/common/gnome2/macros/autogen.sh
+++ b/parts/appwizard/common/gnome2/macros/autogen.sh
@@ -216,7 +216,7 @@ want_intltool=false
 want_pkg_config=false
 want_gtk_doc=false
 
-configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`"
+configure_files="`tqfind $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`"
 for configure_ac in $configure_files; do
     if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null; then
 	want_libtool=true
diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4
index 5307e13d..d7beb9bf 100644
--- a/parts/appwizard/common/gnome2/macros/curses.m4
+++ b/parts/appwizard/common/gnome2/macros/curses.m4
@@ -11,7 +11,7 @@ dnl   @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
 dnl   Makefile.in's
 dnl - Modify the following configure variables (these are the only
 dnl   curses.m4 variables you can access from within configure.in)
-dnl   CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
+dnl   CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if
 dnl                       an ncurses.h that's been renamed to curses.h
 dnl                       is found.
 dnl   CURSES_LIBS       - sets -L and -l's appropriately
diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess
index 1d9f4294..494d04c6 100755
--- a/parts/appwizard/common/incadmin/config.guess
+++ b/parts/appwizard/common/incadmin/config.guess
@@ -247,7 +247,7 @@ main:
 	.prologue 1
 	.long 0x47e03d80 # implver \$0
 	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
+	.long 0x47e20c21 # atqmask \$2,\$1
 	lda \$16,\$Lformat
 	mov \$0,\$17
 	not \$1,\$18
@@ -1135,7 +1135,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to tqfind `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit 0 ;;
diff --git a/parts/appwizard/common/incadmin/install-sh b/parts/appwizard/common/incadmin/install-sh
index 36f96f3e..f811e309 100755
--- a/parts/appwizard/common/incadmin/install-sh
+++ b/parts/appwizard/common/incadmin/install-sh
@@ -126,7 +126,7 @@ else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+# if $src (and thus $dsttmp) tqcontains '*'.
 
 	if [ -f "$src" ] || [ -d "$src" ]
 	then
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 3506ead3..8f29b4b9 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -1306,7 +1306,7 @@ func_mode_compile ()
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
 	$ECHO "\
-*** ERROR, $lockfile exists and contains:
+*** ERROR, $lockfile exists and tqcontains:
 `cat $lockfile 2>/dev/null`
 
 This indicates that another process is trying to use the same
@@ -1358,7 +1358,7 @@ compiler."
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
-*** ERROR, $lockfile contains:
+*** ERROR, $lockfile tqcontains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
@@ -1407,7 +1407,7 @@ compiler."
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
-*** ERROR, $lockfile contains:
+*** ERROR, $lockfile tqcontains:
 `cat $lockfile 2>/dev/null`
 
 but it should contain:
@@ -1674,7 +1674,7 @@ func_mode_execute ()
 	  dir="$dir/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -2062,7 +2062,7 @@ func_mode_install ()
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
 	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # the symlink we tqreplace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
@@ -2684,7 +2684,7 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`tqfind $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
@@ -3400,7 +3400,7 @@ EOF
   newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
+    lt_fatal ("Couldn't tqfind %s", argv[0]);
   LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
 			  tmp_pathspec));
 
@@ -4565,7 +4565,7 @@ func_mode_link ()
 	continue
 	;;
 
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
       -model|-arch|-isysroot)
@@ -7843,7 +7843,7 @@ EOF
 	    func_emit_cwrapperexe_src > $cwrappersource
 
 	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
+	    # because it tqcontains $host paths and files. If cross-
 	    # compiling, it, like the target executable, must be
 	    # executed on the $host or under an emulation environment.
 	    $opt_dry_run || {
@@ -8339,7 +8339,7 @@ func_mode_uninstall ()
 	      func_source $dir/$noexename
 	    fi
 
-	    # note $name still contains .exe if it was in $file originally
+	    # note $name still tqcontains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
 	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
diff --git a/parts/appwizard/common/incadmin/missing b/parts/appwizard/common/incadmin/missing
index 2c025eb6..a311c33a 100755
--- a/parts/appwizard/common/incadmin/missing
+++ b/parts/appwizard/common/incadmin/missing
@@ -150,7 +150,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
+    tqfind . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
     ;;
diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook
index 036d8dba..b84a9430 100644
--- a/parts/appwizard/common/kde-index.docbook
+++ b/parts/appwizard/common/kde-index.docbook
@@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex
 should consult the docbook reference for further details. The example below was
 taken from that reference and shortened a bit for readability. -->
 
-<refentry id="re-1007-unmanagechildren-1">
+<refentry id="re-1007-unmanagetqchildren-1">
 <refmeta>
 <refentrytitle>XtUnmanageChildren</refentrytitle>
 <refmiscinfo>Xt - Geometry Management</refmiscinfo>
@@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. -->
 <refnamediv>
 <refname>XtUnmanageChildren
 </refname>
-<refpurpose>remove a list of children from a parent widget's managed
+<refpurpose>remove a list of tqchildren from a tqparent widget's managed
 list.
-<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
-<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm> 
+<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
+<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> 
 </refpurpose>
 
 </refnamediv>
@@ -277,16 +277,16 @@ list.
 <date>4 March 1996</date>
 </refsynopsisdivinfo>
 <synopsis>
-void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
-    WidgetList <replaceable class="parameter">children</replaceable>;
-    Cardinal <replaceable class="parameter">num_children</replaceable>;
+void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>)
+    WidgetList <replaceable class="parameter">tqchildren</replaceable>;
+    Cardinal <replaceable class="parameter">num_tqchildren</replaceable>;
 </synopsis>
 
-<refsect2 id="r2-1007-unmanagechildren-1">
+<refsect2 id="r2-1007-unmanagetqchildren-1">
 <title>Inputs</title>
 <variablelist>
 <varlistentry>
-<term><replaceable class="parameter">children</replaceable>
+<term><replaceable class="parameter">tqchildren</replaceable>
 </term>
 <listitem>
 <para>Specifies an array of child widgets. Each child must be of
@@ -295,40 +295,40 @@ class RectObj or any subclass thereof.
 </listitem>
 </varlistentry>
 <varlistentry>
-<term><replaceable class="parameter">num_children</replaceable>
+<term><replaceable class="parameter">num_tqchildren</replaceable>
 </term>
 <listitem>
-<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
+<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>.
 </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </refsect2></refsynopsisdiv>
 
-<refsect1 id="r1-1007-unmanagechildren-1">
+<refsect1 id="r1-1007-unmanagetqchildren-1">
 <title>Description
 </title>
 <para><function>XtUnmanageChildren()</function> unmaps the specified widgets
-and removes them from their parent's geometry management.
+and removes them from their tqparent's tqgeometry management.
 The widgets will disappear from the screen, and (depending
-on its parent) may no longer have screen space allocated for
+on its tqparent) may no longer have screen space allocated for
 them.
 </para>
-<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
-the same parent.
+<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have
+the same tqparent.
 </para>
 <para>See the &ldquo;Algorithm&rdquo; section below for full details of the
 widget unmanagement procedure.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-2">
+<refsect1 id="r1-1007-unmanagetqchildren-2">
 <title>Usage</title>
 <para>Unmanaging widgets is the usual method for temporarily
 making them invisible.  They can be re-managed with
 <function>XtManageChildren()</function>.
 </para>
-<para>You can unmap a widget, but leave it under geometry
+<para>You can unmap a widget, but leave it under tqgeometry
 management by calling <function>XtUnmapWidget()</function>.  You can
 destroy a widget's window without destroying the widget by
 calling <function>XtUnrealizeWidget()</function>.  You can destroy a
@@ -340,12 +340,12 @@ often more convenient to call <function>XtUnmanageChild()</function>
 several times than it is to declare and initialize an array
 of widgets to pass to <function>XtUnmanageChildren()</function>.  Calling
 <function>XtUnmanageChildren()</function> is more efficient, however,
-because it only calls the parent's <function>change_managed()</function>
+because it only calls the tqparent's <function>change_managed()</function>
 method once.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-3">
+<refsect1 id="r1-1007-unmanagetqchildren-3">
 <title>Algorithm
 </title>
 <para><function>XtUnmanageChildren()</function> performs the following:
@@ -374,11 +374,11 @@ by unmapping it.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-4">
+<refsect1 id="r1-1007-unmanagetqchildren-4">
 <title>Structures</title>
 <para>The <type>WidgetList</type> type is simply an array of widgets:
 </para>
-<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
+<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList;
 </screen>
 </refsect1>
 </refentry>
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index bea63d4e..b0e51997 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -81,7 +81,7 @@ def detect_kde(env):
 			env.Exit(1)
 	env['QTDIR'] = qtdir.strip()
 
-	## Find the necessary programs uic and moc
+	## Find the necessary programs uic and tqmoc
 	print "Checking for uic                  : ",
 	uic = qtdir + "/bin/uic"
 	if os.path.isfile(uic):
@@ -99,33 +99,33 @@ def detect_kde(env):
 				env.Exit(1)
 	env['QT_UIC'] = uic
 
-	print "Checking for moc                  : ",
-	moc = qtdir + "/bin/moc"
-	if os.path.isfile(moc):
-		print GREEN + "moc was found as " + moc + NORMAL
+	print "Checking for tqmoc                  : ",
+	tqmoc = qtdir + "/bin/tqmoc"
+	if os.path.isfile(tqmoc):
+		print GREEN + "tqmoc was found as " + tqmoc + NORMAL
 	else:
-		moc = os.popen("which moc 2>/dev/null").read().strip()
-		if len(moc):
-			print YELLOW + "moc was found as " + moc + NORMAL
-		elif os.path.isfile("/usr/share/qt3/bin/moc"):
-			moc = "/usr/share/qt3/bin/moc"
-			print YELLOW + "moc was found as " + moc + NORMAL
+		tqmoc = os.popen("which tqmoc 2>/dev/null").read().strip()
+		if len(tqmoc):
+			print YELLOW + "tqmoc was found as " + tqmoc + NORMAL
+		elif os.path.isfile("/usr/share/qt3/bin/tqmoc"):
+			tqmoc = "/usr/share/qt3/bin/tqmoc"
+			print YELLOW + "tqmoc was found as " + tqmoc + NORMAL
 		else:
-			print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL
+			print RED + "tqmoc was not found - set QTDIR or put it in your PATH ?" + NORMAL
 			env.Exit(1)
-	env['QT_MOC'] = moc
+	env['QT_TQMOC'] = tqmoc
 
 	## check for the qt and kde includes
 	print "Checking for the qt includes      : ",
-	if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"):
+	if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"):
 		# The user told where to look for and it looks valid
 		print GREEN + "ok " + qtincludes + NORMAL
 	else:
-		if os.path.isfile(qtdir + "/include/qlayout.h"):
+		if os.path.isfile(qtdir + "/include/qtqlayout.h"):
 			# Automatic detection
 			print GREEN + "ok " + qtdir + "/include/ " + NORMAL
 			qtincludes = qtdir + "/include/"
-		elif os.path.isfile("/usr/include/qt3/qlayout.h"):
+		elif os.path.isfile("/usr/include/qt3/qtqlayout.h"):
 			# Debian probably
 			print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL
 			qtincludes = "/usr/include/qt3"
@@ -157,8 +157,8 @@ def detect_kde(env):
 		if not libdir:
 			libdir=execprefix+"/lib"+libsuffix
 
-		subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir)
-		debian_fix = lambda x: x.replace('/usr/share', '${datadir}')
+		subst_vars = lambda x: x.tqreplace('${exec_prefix}', execprefix).tqreplace('${datadir}',datadir).tqreplace('${libdir}', libdir)
+		debian_fix = lambda x: x.tqreplace('/usr/share', '${datadir}')
 		env['KDEBIN']   = subst_vars(os.popen('kde-config --install exe').read().strip())
 		env['KDEAPPS']  = subst_vars(os.popen('kde-config --install apps').read().strip())		
 		env['KDEDATA']  = subst_vars(os.popen('kde-config --install data').read().strip())
@@ -204,7 +204,7 @@ def detect_kde(env):
 	env['QTLIBPATH']=qtlibs
 
 def generate(env):
-	""""Set up the qt and kde environment and builders - the moc part is difficult to understand """
+	""""Set up the qt and kde environment and builders - the tqmoc part is difficult to understand """
 	if env['HELP']:
 		print """
 """+BOLD+"""*** KDE options ***
@@ -270,7 +270,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			# The following is kind of hacky to get builders working properly (FIXME) ??
 			objBuilderEnv = objBuilder.env
 			objBuilder.env = env
-			mocBuilderEnv = env.Moc.env
+			tqmocBuilderEnv = env.Moc.env
 			env.Moc.env = env
 
 			# make a deep copy for the result; MocH objects will be appended
@@ -323,22 +323,22 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 				if not h and qtdebug:
 					print "scons: qt: no header for '%s'." % (str(cpp))
 				if h and q_object_search.search(h_contents):
-					# h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file
-					moc_cpp = None
+					# h file with the Q_OBJECT macro found -> add .tqmoc or _tqmoc.cpp file
+					tqmoc_cpp = None
 
-					if env.has_key('NOMOCSCAN'):
-						moc_cpp = env.Moc(h)
+					if env.has_key('NOTQMOCSCAN'):
+						tqmoc_cpp = env.Moc(h)
 					else:
-						reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)'
+						reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.tqmoc("|>)'
 						meta_object_search = re.compile(reg)
 						if meta_object_search.search(cpp_contents):
-							moc_cpp = env.Moc(h)
+							tqmoc_cpp = env.Moc(h)
 						else:
-							moc_cpp = env.Moccpp(h)
-							moc_o = objBuilder(moc_cpp)
-							out_sources.append(moc_o)
+							tqmoc_cpp = env.Moccpp(h)
+							tqmoc_o = objBuilder(tqmoc_cpp)
+							out_sources.append(tqmoc_o)
 					if qtdebug:
-						print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0]))
+						print "scons: qt: found Q_OBJECT macro in '%s', tqmoc'ing to '%s'" % (str(h), str(tqmoc_cpp[0]))
 	
 				if cpp and q_object_search.search(cpp_contents):
 					print "error, bksys cannot handle cpp files with Q_OBJECT classes"
@@ -347,7 +347,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 
 			# restore the original env attributes (FIXME)
 			objBuilder.env = objBuilderEnv
-			env.Moc.env = mocBuilderEnv
+			env.Moc.env = tqmocBuilderEnv
 
 			return (target, out_sources)
 	
@@ -368,8 +368,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		('QTDIR', 'root of qt directory'),
 		('QTLIBPATH', 'path to the qt libraries'),
 		('QTINCLUDEPATH', 'path to the qt includes'),
-		('QT_UIC', 'moc directory'),
-		('QT_MOC', 'moc executable command'),
+		('QT_UIC', 'tqmoc directory'),
+		('QT_TQMOC', 'tqmoc executable command'),
 		('QTPLUGINS', 'uic executable command'),
 		('KDEDIR', 'root of kde directory'),
 		('KDELIBPATH', 'path to the kde libs'),
@@ -412,8 +412,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	env['QT_UICIMPLPREFIX'] = ''
 	env['QT_UICIMPLSUFFIX'] = '.cpp'
 
-	env['QT_MOCHPREFIX']    = ''
-	env['QT_MOCHSUFFIX']    = '.moc'
+	env['QT_TQMOCHPREFIX']    = ''
+	env['QT_TQMOCHSUFFIX']    = '.tqmoc'
 	env['KDE_KCFG_IMPLPREFIX'] = ''
 	env['KDE_KCFG_IMPL_HSUFFIX'] = '.h'
 	env['KDE_KCFG_IMPL_CSUFFIX'] = '.cpp'
@@ -424,10 +424,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	## ui file processing
 	def uic_processing(target, source, env):
 		inc_kde  = '#include <klocale.h>\n#include <kdialog.h>\n'
-		inc_moc  = '#include "%s"\n' % target[2].name
+		inc_tqmoc  = '#include "%s"\n' % target[2].name
 		comp_h   = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path)
 		comp_c   = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path)
-		comp_moc = '$QT_MOC -o %s %s' % (target[2].path, target[0].path)
+		comp_tqmoc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path)
 		
 		ret = env.Execute(comp_h)
 		if ret:
@@ -442,10 +442,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			return ret
 
 		dest = open( target[1].path, "a" )
-		dest.write(inc_moc)
+		dest.write(inc_tqmoc)
 		dest.close()
 
-		ret = env.Execute( comp_moc )
+		ret = env.Execute( comp_tqmoc )
 		return ret
 	
 	def uicEmitter(target, source, env):
@@ -459,10 +459,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 				env.subst('$QT_UICIMPLPREFIX'),
 				env.subst('$QT_UICIMPLSUFFIX')))
 		if len(target) < 3:
-			# third target is .moc file
+			# third target is .tqmoc file
 			target.append(adjustixes(bs,
-				env.subst('$QT_MOCHPREFIX'),
-				env.subst('$QT_MOCHSUFFIX')))
+				env.subst('$QT_TQMOCHPREFIX'),
+				env.subst('$QT_TQMOCHSUFFIX')))
 		return target, source
 	
 	UIC_BUILDER = Builder(
@@ -471,17 +471,17 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		suffix     = '.h',
 		src_suffix = '.ui')
 	
-	## moc file processing
-	env['QT_MOCCOM'] = ('$QT_MOC -o ${TARGETS[0]} $SOURCE')
+	## tqmoc file processing
+	env['QT_TQMOCCOM'] = ('$QT_TQMOC -o ${TARGETS[0]} $SOURCE')
 	
-	MOC_BUILDER = Builder(
-		action     = '$QT_MOCCOM',
-		suffix     = '.moc',
+	TQMOC_BUILDER = Builder(
+		action     = '$QT_TQMOCCOM',
+		suffix     = '.tqmoc',
 		src_suffix = '.h')
 	
-	MOCCPP_BUILDER = Builder(
-		action     = '$QT_MOCCOM',
-		suffix     = '_moc.cpp',
+	TQMOCCPP_BUILDER = Builder(
+		action     = '$QT_TQMOCCOM',
+		suffix     = '_tqmoc.cpp',
 		src_suffix = '.h')
 	
 	## kcfg file processing
@@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	def dcopGenerator(target, source, env, for_signature):
 		act=[]
 		act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)')
-		act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path)
+		act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path)
 		return act
 
 	def dcopEmitter(target, source, env):
@@ -576,8 +576,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	
 	## register the builders
 	env['BUILDERS']['Uic']       = UIC_BUILDER
-	env['BUILDERS']['Moc']       = MOC_BUILDER
-	env['BUILDERS']['Moccpp']    = MOCCPP_BUILDER
+	env['BUILDERS']['Moc']       = TQMOC_BUILDER
+	env['BUILDERS']['Moccpp']    = TQMOCCPP_BUILDER
 	env['BUILDERS']['Dcop']      = DCOP_BUILDER
 	env['BUILDERS']['Kcfg']      = KCFG_BUILDER
 	env['BUILDERS']['LaFile']    = LA_BUILDER
@@ -596,7 +596,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	static_obj.src_builder.append('Transfiles')
 	shared_obj.src_builder.append('Transfiles')
 
-	## Find the files to moc, dcop, and link against kde and qt
+	## Find the files to tqmoc, dcop, and link against kde and qt
 	env.AppendUnique(PROGEMITTER = [MetasourcesStatic], SHLIBEMITTER=[MetasourcesShared], LIBEMITTER =[MetasourcesStatic])
 
 	## Handy helpers for building kde programs
@@ -631,9 +631,9 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			if ext in skel_ext:
 				lenv.Dcop(bs+'.h')
 				src.append(bs+'_skel.cpp')
-			elif ext == ".moch":
+			elif ext == ".tqmoch":
 				lenv.Moccpp(bs+'.h')
-				src.append(bs+'_moc.cpp')
+				src.append(bs+'_tqmoc.cpp')
 			else:
 				src.append(file)
 
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index e7436d04..1ec0b6df 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -7,11 +7,11 @@
 #include <tqmultilineedit.h>
 
 /* 
- *  Constructs a FilePropsPage which is a child of 'parent', with the 
+ *  Constructs a FilePropsPage which is a child of 'tqparent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-FilePropsPage::FilePropsPage( TQWidget* parent,  const char* name, WFlags fl )
-    : FilePropsPageBase( parent, name, fl ){
+FilePropsPage::FilePropsPage( TQWidget* tqparent,  const char* name, WFlags fl )
+    : FilePropsPageBase( tqparent, name, fl ){
   m_props = new TQPtrList<ClassFileProp>;
   m_current_class = 9999; // no current  
 }
@@ -21,7 +21,7 @@ FilePropsPage::FilePropsPage( TQWidget* parent,  const char* name, WFlags fl )
  */
 FilePropsPage::~FilePropsPage()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /* 
diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h
index a0c923ed..adb8f758 100644
--- a/parts/appwizard/filepropspage.h
+++ b/parts/appwizard/filepropspage.h
@@ -20,9 +20,10 @@ class ClassFileProp {
 class FilePropsPage : public FilePropsPageBase
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FilePropsPage( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    FilePropsPage( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~FilePropsPage();
     void setClassFileProps(TQPtrList<ClassFileProp> props,bool different_header_impl=true);
     TQPtrList<ClassFileProp> getClassFileProps();
diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui
index 2137d685..844e889f 100644
--- a/parts/appwizard/filepropspagebase.ui
+++ b/parts/appwizard/filepropspagebase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FilePropsPageBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>GroupBox7</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         <cstring>classname_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <cstring>headerfile_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="1">
+                <widget class="TQLabel" row="2" column="1">
                     <property name="name">
                         <cstring>implfile_label</cstring>
                     </property>
@@ -66,7 +66,7 @@
                         <string>Implementation file:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>headerfile_label</cstring>
                     </property>
@@ -81,7 +81,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -89,7 +89,7 @@
                 <string>Classes:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="TQLabel" row="0" column="1">
             <property name="name">
                 <cstring>TextLabel6</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>Description:</string>
             </property>
         </widget>
-        <widget class="QListBox" row="1" column="0">
+        <widget class="TQListBox" row="1" column="0">
             <property name="name">
                 <cstring>classes_listbox</cstring>
             </property>
@@ -110,7 +110,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QMultiLineEdit" row="1" column="1">
+        <widget class="TQMultiLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>desc_textview</cstring>
             </property>
@@ -153,12 +153,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotSelectionChanged()</slot>
     <slot>slotClassnameChanged(const QString&amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 9cb9838a..b2beb660 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -51,8 +51,8 @@
 #include "misc.h"
 
 
-ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *name)
-    : ImportDialogBase(parent, name, true), m_part(part)
+ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *tqparent, const char *name)
+    : ImportDialogBase(tqparent, name, true), m_part(part)
 {
     TQString author, email;
     AppWizardUtil::guessAuthorAndEmail(&author, &email);
@@ -62,7 +62,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na
     urlinput_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 
     KStandardDirs *dirs = AppWizardFactory::instance()->dirs();
-    importNames = dirs->findAllResources("appimports", TQString::null, false, true);
+    importNames = dirs->findAllResources("appimports", TQString(), false, true);
     importNames.sort();
 
     TQStringList::ConstIterator it;
@@ -101,7 +101,7 @@ ImportDialog::~ImportDialog()
 
 void ImportDialog::slotProjectNameChanged( const TQString &_text )
 {
-    ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( TQRegExp("\\s") ) );
+    ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().tqcontains( TQRegExp("\\s") ) );
 }
 
 void ImportDialog::accept()
@@ -151,7 +151,7 @@ void ImportDialog::accept()
     {
         KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
                 "XML error in line %1, column %2:\n%3")
-                .arg(errorLine).arg(errorCol).arg(errorMsg));
+                .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
         return;
     }
 
@@ -204,9 +204,9 @@ void ImportDialog::accept()
 //
 //     while (!srcstream.atEnd()) {
 //         TQString line = srcstream.readLine();
-//         line.replace(TQRegExp("\\$APPNAMELC\\$"), projectName);
-//         line.replace(TQRegExp("\\$AUTHOR\\$"), author);
-//         line.replace(TQRegExp("\\$EMAIL\\$"), email);
+//         line.tqreplace(TQRegExp("\\$APPNAMELC\\$"), projectName);
+//         line.tqreplace(TQRegExp("\\$AUTHOR\\$"), author);
+//         line.tqreplace(TQRegExp("\\$EMAIL\\$"), email);
 //         deststream << line << endl;
 //     }
 //
@@ -260,7 +260,7 @@ void ImportDialog::dirChanged()
     if (!dir.exists())
         return;
 
-    if ( dirName.contains( TQRegExp("\\s") ) )
+    if ( dirName.tqcontains( TQRegExp("\\s") ) )
     {
         ok_button->setEnabled( false );
         return;
@@ -290,12 +290,12 @@ void ImportDialog::dirChanged()
     }
 
     // Remove any characters from the dirName that would be invalid in a project name
-    TQString projectName(dir.dirName().replace(TQRegExp("[^a-zA-Z0-9_]"), "_"));
+    TQString projectName(dir.dirName().tqreplace(TQRegExp("[^a-zA-Z0-9_]"), "_"));
 
     // Set the project name
     name_edit->setText(projectName);
 
-    // QMake based?
+    // TQMake based?
     files = dir.entryList("*.pro");
     if (!files.isEmpty()) {
         setProjectType("qtqmake");
@@ -339,7 +339,7 @@ void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName)
     name_edit->setText(config.readEntry("project_name"));
 
     TQString legacyType = config.readEntry("project_type");
-    if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType))
+    if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").tqcontains(legacyType))
         setProjectType("kde");
     else if (legacyType == "normal_gnome")
         setProjectType("gnome");
@@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName)
     TQFile configIn(dirName+"/configure.in");
     TQFile configAc(dirName+"/configure.ac");
     if (configInIn.open(IO_ReadOnly)){
-        cstream.setDevice(&configInIn);
+        cstream.setDevice(TQT_TQIODEVICE(&configInIn));
         while (!cstream.atEnd()) {
             TQString line = cstream.readLine();
             if ( ac_init.search(line) >= 0){
@@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName)
     }
 
     if (configIn.open(IO_ReadOnly)){
-        cstream.setDevice(&configIn);
+        cstream.setDevice(TQT_TQIODEVICE(&configIn));
     }
     else{
         if (configAc.open(IO_ReadOnly)){
-            cstream.setDevice(&configAc);
+            cstream.setDevice(TQT_TQIODEVICE(&configAc));
         }
         else{
             return;
@@ -564,7 +564,7 @@ void ImportDialog::createProjectInfrastructure( )
     TQDir dir (urlinput_edit->url());
     TQStringList files = dir.entryList(cmd.existingPattern);
     if (!files.isEmpty()) {
-        if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), TQString::null, i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No)
+        if (KMessageBox::questionYesNo(this, i18n("Project infrastrucure already exists in target directory.\nGenerate new project infrastructure and overwrite old?"), TQString(), i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No)
             return;
     }
 
diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h
index 35772133..aa7721e3 100644
--- a/parts/appwizard/importdlg.h
+++ b/parts/appwizard/importdlg.h
@@ -28,9 +28,10 @@ struct InfrastructureCmd{
 class ImportDialog : public ImportDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ImportDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 );
+    ImportDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 );
     ~ImportDialog();
 
 protected:
diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui
index 101c8c58..134d7c51 100644
--- a/parts/appwizard/importdlgbase.ui
+++ b/parts/appwizard/importdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ImportDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>import_dialog</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>dir_label</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <cstring>urlinput_edit</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>vcsCombo</cstring>
             </property>
@@ -46,7 +46,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>fetchModuleButton</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -82,7 +82,7 @@
                 <cstring>vcsCombo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>name_label</cstring>
             </property>
@@ -106,7 +106,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="10" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="10" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -127,14 +127,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ok_button</cstring>
                     </property>
@@ -145,7 +145,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancel_button</cstring>
                     </property>
@@ -155,7 +155,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QComboBox" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>project_combo</cstring>
             </property>
@@ -168,7 +168,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>project_label</cstring>
             </property>
@@ -208,14 +208,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="7" column="0">
+        <widget class="TQLabel" row="7" column="0">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -276,14 +276,14 @@ will be the author, everything between
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>author_label</cstring>
             </property>
@@ -294,7 +294,7 @@ will be the author, everything between
                 <cstring>author_edit</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="1" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>infrastructureBox</cstring>
             </property>
@@ -349,14 +349,14 @@ will be the author, everything between
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">dirButtonClicked()</slot>
     <slot>dirChanged()</slot>
     <slot access="protected">projectTypeChanged(const QString &amp;)</slot>
     <slot access="protected">projectTypeChanged(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index 5e189422..688c3177 100644
--- a/parts/appwizard/kdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
 		strFill + " *   $EMAIL$   *\n" +
 		strFill + " *                                                                         *\n";
 	
-//	str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67);
+//	str = str.tqarg(TQDate::tqcurrentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67);
 	
 	TQStringList::Iterator it;
 	for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it )
 	{
-		str += TQString( "%1 *   %2 *\n").arg( strFill ).arg( *it, -69 );
+		str += TQString( "%1 *   %2 *\n").tqarg( strFill ).tqarg( *it, -69 );
 	}
 	
 	str += strFill + " ***************************************************************************/\n";
@@ -87,28 +87,28 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
 			return str;
 			
 		case KDevFile::PascalStyle:
-			str.replace(TQRegExp("/\\**\n \\*"), "{\n  ");
-			str.replace(TQRegExp("\\*\n \\*"), " \n  ");
-			str.replace(TQRegExp(" *\\**/\n"), "}\n");
+			str.tqreplace(TQRegExp("/\\**\n \\*"), "{\n  ");
+			str.tqreplace(TQRegExp("\\*\n \\*"), " \n  ");
+			str.tqreplace(TQRegExp(" *\\**/\n"), "}\n");
 			return str;
 			
 		case KDevFile::AdaStyle:
-			str.replace(TQRegExp("/\\*"), "--");
-			str.replace(TQRegExp(" \\*"), "--");
-			str.replace(TQRegExp("\\*/"), "*");
+			str.tqreplace(TQRegExp("/\\*"), "--");
+			str.tqreplace(TQRegExp(" \\*"), "--");
+			str.tqreplace(TQRegExp("\\*/"), "*");
 			return str;
 			
 		case KDevFile::BashStyle:
-			str.replace(TQRegExp("\\*|/"), "#");
-			str.replace(TQRegExp("\n ##"), "\n##");
-			str.replace(TQRegExp("\n #"), "\n# ");
+			str.tqreplace(TQRegExp("\\*|/"), "#");
+			str.tqreplace(TQRegExp("\n ##"), "\n##");
+			str.tqreplace(TQRegExp("\n #"), "\n# ");
 			return str;
 
 		case KDevFile::XMLStyle:
-			str.replace(TQRegExp("/\\*"), "<!--");
-			str.replace(TQRegExp("\n \\*"), "\n<!--");
-			str.replace(TQRegExp("\\*/?\n"), "-->\n");
-			str.replace(TQRegExp("\\*"), "_");
+			str.tqreplace(TQRegExp("/\\*"), "<!--");
+			str.tqreplace(TQRegExp("\n \\*"), "\n<!--");
+			str.tqreplace(TQRegExp("\\*/?\n"), "-->\n");
+			str.tqreplace(TQRegExp("\\*"), "_");
 			return str;
 	}
 
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index 084156f5..8ae4d85e 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -26,9 +26,9 @@
 
 #include <kdevplugincontroller.h>
 
-ProfileSupport::ProfileSupport(KDevPlugin *parent)
+ProfileSupport::ProfileSupport(KDevPlugin *tqparent)
 {
-    KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard");
+    KURL::List resources = tqparent->pluginController()->profileResourcesRecursive("*.appwizard");
     
     for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it)
     {
@@ -40,5 +40,5 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent)
 
 bool ProfileSupport::isInTemplateList(const TQString &templateUrl)
 {
-    return m_templateList.contains(TQFileInfo(templateUrl).baseName());
+    return m_templateList.tqcontains(TQFileInfo(templateUrl).baseName());
 }
diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h
index b18a9620..bc98d981 100644
--- a/parts/appwizard/profilesupport.h
+++ b/parts/appwizard/profilesupport.h
@@ -24,7 +24,7 @@
 
 class ProfileSupport{
 public:
-    ProfileSupport(KDevPlugin *parent);
+    ProfileSupport(KDevPlugin *tqparent);
     bool isInTemplateList(const TQString &templateUrl);
     
 private:
diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui
index 27075a88..a8433bbf 100644
--- a/parts/appwizard/vcs_form.ui
+++ b/parts/appwizard/vcs_form.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>VcsForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VcsForm</cstring>
     </property>
@@ -19,11 +19,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QWidgetStack" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQWidgetStack" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>stack</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>page</cstring>
                 </property>
@@ -32,7 +32,7 @@
                 </attribute>
             </widget>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -43,7 +43,7 @@
                 <cstring>combo</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>combo</cstring>
             </property>
@@ -58,7 +58,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>
@@ -76,9 +76,9 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">qwidgetstack.h</include>
+    <include location="global" impldecl="in declaration">tqwidgetstack.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index f89c2b95..de7153c1 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -36,15 +36,15 @@
 static const KDevPluginInfo data("kdevastyle");
 
 namespace {
-    const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
+    const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.tqmoc,*.patch,*.tlh,*.xpm";
 }
 
 
 typedef KDevGenericFactory<AStylePart> AStyleFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
 
-AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
+AStylePart::AStylePart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevSourceFormatter(&data, tqparent, name ? name : "AStylePart")
 {
   setInstance(AStyleFactory::instance());
 
@@ -193,21 +193,21 @@ void AStylePart::beautifySource()
 	if (m_project["Fill"].toString() == "Tabs")
 	{
 		// tabs and wsCount spaces to be a tab
-		TQString replace;
+		TQString tqreplace;
 		for (int i =0;i<wsCount;i++)
-			replace+=' ';
+			tqreplace+=' ';
 
-		indentWith=indentWith.replace(replace, TQChar('\t'));
+		indentWith=indentWith.tqreplace(tqreplace, TQChar('\t'));
 		indentWith=indentWith.remove(' ');
 	} else
 	{
 		if ( m_project["FillForce"].toBool()){
 			//convert tabs to spaces
-			TQString replace;
+			TQString tqreplace;
 			for (int i =0;i<wsCount;i++)
-				replace+=' ';
+				tqreplace+=' ';
 
-			indentWith=indentWith.replace(TQChar('\t'),replace);
+			indentWith=indentWith.tqreplace(TQChar('\t'),tqreplace);
 		}
 	}
   }
@@ -323,14 +323,14 @@ void AStylePart::activePartChanged ( KParts::Part *part )
 		if ( iface )
 		{
 			// check for the everything case..
-			if ( m_searchExtensions.find ( "*" ) == m_searchExtensions.end() )
+			if ( m_searchExtensions.tqfind ( "*" ) == m_searchExtensions.end() )
 			{
 				TQString extension = rw_part->url().path();
-				int pos = extension.findRev ( '.' );
+				int pos = extension.tqfindRev ( '.' );
 				if ( pos >= 0 )
 				{
 					extension = extension.mid ( pos );
-					enabled = ( m_searchExtensions.find ( extension ) != m_searchExtensions.end() );
+					enabled = ( m_searchExtensions.tqfind ( extension ) != m_searchExtensions.end() );
 				}
 			}
 			else
@@ -400,7 +400,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context)
 	{
 		popup->insertSeparator();
 		int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) );
-		popup->setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible"));
+		popup->TQMenuData::setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible"));
 	}
 	else if ( context->hasType( Context::FileContext )){
 		const FileContext *ctx = static_cast<const FileContext*>(context);
@@ -408,7 +408,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
 		popup->insertSeparator();
 		int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) );
-		popup->setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible"));
+		popup->TQMenuData::setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible"));
 
 	}
 }
@@ -436,7 +436,7 @@ void AStylePart::restorePartialProjectSession(const TQDomElement * el)
 		if ( ext.isEmpty()){
             ext=defaultFormatExtensions;
 		}
-		setExtensions(ext.replace(TQChar(','), TQChar('\n')),false);
+		setExtensions(ext.tqreplace(TQChar(','), TQChar('\n')),false);
 	}
 }
 
@@ -464,7 +464,7 @@ void AStylePart::savePartialProjectSession(TQDomElement * el)
 
 void AStylePart::formatFilesSelect(){
 	m_urls.clear();
-	TQStringList filenames = KFileDialog::getOpenFileNames (  TQString::null, getProjectExtensions(),0,"Select files to format" );
+	TQStringList filenames = KFileDialog::getOpenFileNames (  TQString(), getProjectExtensions(),0,"Select files to format" );
 
 	for(TQStringList::Iterator it = filenames.begin(); it != filenames.end();it++){
 		m_urls << *it;
@@ -531,7 +531,7 @@ void AStylePart::formatFiles()
 	}
 	if ( processed != 0 )
 	{
-		KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).arg ( processed ).arg(getProjectExtensions().stripWhiteSpace()) );
+		KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).tqarg ( processed ).tqarg(getProjectExtensions().stripWhiteSpace()) );
 	}
 	m_urls.clear();
 
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index 0711a338..b805b0b2 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -23,10 +23,11 @@ class ConfigWidgetProxy;
 class AStylePart : public KDevSourceFormatter
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  AStylePart(TQObject *parent, const char *name, const TQStringList &);
+  AStylePart(TQObject *tqparent, const char *name, const TQStringList &);
   ~AStylePart();
 
   TQString formatSource(const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options);
diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp
index 0cb26abb..49177eb2 100644
--- a/parts/astyle/astyle_widget.cpp
+++ b/parts/astyle/astyle_widget.cpp
@@ -13,8 +13,8 @@
 #include <kdevcore.h>
 
 
-AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name)
-    : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global)
+AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *tqparent, const char *name)
+    : AStyleConfig(tqparent, name), m_part(part), isGlobalWidget(global)
 {
   // which style changed - disable the other pages.
   connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h
index 0d379fc0..2a6bf85e 100644
--- a/parts/astyle/astyle_widget.h
+++ b/parts/astyle/astyle_widget.h
@@ -10,10 +10,11 @@ class KDevPart;
 class AStyleWidget : public AStyleConfig
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  AStyleWidget( AStylePart * part, bool global, TQWidget *parent=0, const char *name=0 );
+  AStyleWidget( AStylePart * part, bool global, TQWidget *tqparent=0, const char *name=0 );
   ~AStyleWidget();
 
 
diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index 38063bb6..64788d4a 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AStyleConfig</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AStyleConfig</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>ConfigTabs</cstring>
             </property>
@@ -39,7 +39,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -50,7 +50,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>StyleGroup</cstring>
                         </property>
@@ -62,13 +62,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>350</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -81,7 +81,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_UserDefined</cstring>
                                 </property>
@@ -98,7 +98,7 @@
                                     <string>Select options from other tabs.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_ANSI</cstring>
                                 </property>
@@ -118,7 +118,7 @@ Indent Switch=false
 Indent NameSpace=false</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_KR</cstring>
                                 </property>
@@ -138,7 +138,7 @@ Indent Namespaces=false
 </string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_Linux</cstring>
                                 </property>
@@ -158,7 +158,7 @@ Indent Switch=false
 Indent NameSpace=false</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_GNU</cstring>
                                 </property>
@@ -179,7 +179,7 @@ Indent Switch=false
 Indent NameSpace=false</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_JAVA</cstring>
                                 </property>
@@ -198,7 +198,7 @@ Indent Bracket=false
 Indent Switch=false</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>Style_Global</cstring>
                                 </property>
@@ -215,7 +215,7 @@ Settings/Configure Kdevelop/Formatting.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>FrameFilesFormat</cstring>
                         </property>
@@ -234,7 +234,7 @@ Settings/Configure Kdevelop/Formatting.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTextEdit">
+                            <widget class="TQTextEdit">
                                 <property name="name">
                                     <cstring>GeneralExtension</cstring>
                                 </property>
@@ -254,7 +254,7 @@ Settings/Configure Kdevelop/Formatting.</string>
 *.cc *.hh 
 *.c++ *.h++
 *.inl *.tlh
-*.moc *.xpm
+*.tqmoc *.xpm
 *.diff *.patch
 *.java</string>
                                 </property>
@@ -278,7 +278,7 @@ Can use * on its own for any file.</string>
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -289,11 +289,11 @@ Can use * on its own for any file.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="0">
+                    <widget class="TQButtonGroup" row="0" column="0">
                         <property name="name">
                             <cstring>FillingGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -309,7 +309,7 @@ Can use * on its own for any file.</string>
                             <property name="spacing">
                                 <number>20</number>
                             </property>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>Fill_EmptyLines</cstring>
                                 </property>
@@ -320,15 +320,15 @@ Can use * on its own for any file.</string>
                                     <string>Fill empty lines with the white space of their previous lines.</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="0" column="0">
+                            <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout2</cstring>
+                                    <cstring>tqlayout2</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton" row="0" column="0">
+                                    <widget class="TQRadioButton" row="0" column="0">
                                         <property name="name">
                                             <cstring>Fill_Tabs</cstring>
                                         </property>
@@ -339,7 +339,7 @@ Can use * on its own for any file.</string>
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox" row="1" column="2">
+                                    <widget class="TQSpinBox" row="1" column="2">
                                         <property name="name">
                                             <cstring>Fill_SpaceCount</cstring>
                                         </property>
@@ -356,7 +356,7 @@ Can use * on its own for any file.</string>
                                             <string>Number of spaces to use per indent.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="4">
+                                    <widget class="TQCheckBox" row="1" column="4">
                                         <property name="name">
                                             <cstring>Fill_ConvertTabs</cstring>
                                         </property>
@@ -380,14 +380,14 @@ Can use * on its own for any file.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>34</width>
                                                 <height>21</height>
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QRadioButton" row="1" column="0">
+                                    <widget class="TQRadioButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>Fill_Spaces</cstring>
                                         </property>
@@ -398,7 +398,7 @@ Can use * on its own for any file.</string>
                                             <string>&amp;Use spaces:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox" row="0" column="2">
+                                    <widget class="TQSpinBox" row="0" column="2">
                                         <property name="name">
                                             <cstring>Fill_TabCount</cstring>
                                         </property>
@@ -416,7 +416,7 @@ Can use * on its own for any file.</string>
 The number of spaces per tab is controled by the editor.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="0" column="4">
+                                    <widget class="TQCheckBox" row="0" column="4">
                                         <property name="name">
                                             <cstring>Fill_ForceTabs</cstring>
                                         </property>
@@ -440,7 +440,7 @@ The number of spaces per tab is controled by the editor.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -451,11 +451,11 @@ The number of spaces per tab is controled by the editor.</string>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup" row="1" column="0">
+                    <widget class="TQButtonGroup" row="1" column="0">
                         <property name="name">
                             <cstring>BracketGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -471,15 +471,15 @@ The number of spaces per tab is controled by the editor.</string>
                             <property name="spacing">
                                 <number>20</number>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout2</cstring>
+                                    <cstring>tqlayout2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>Brackets_None</cstring>
                                         </property>
@@ -493,7 +493,7 @@ The number of spaces per tab is controled by the editor.</string>
                                             <string>The brackets will not be changed.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>Brackets_Break</cstring>
                                         </property>
@@ -507,7 +507,7 @@ The number of spaces per tab is controled by the editor.</string>
                                             <string>Break brackets from pre-block code (i.e. ANSI C/C++ style).</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>Brackets_Attach</cstring>
                                         </property>
@@ -519,7 +519,7 @@ The number of spaces per tab is controled by the editor.</string>
 See also Formatting/Blocks/Break if-else</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>Brackets_Linux</cstring>
                                         </property>
@@ -533,7 +533,7 @@ but attach brackets to pre-block command statements.</string>
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Brackets_CloseHeaders</cstring>
                                 </property>
@@ -552,7 +552,7 @@ from their immediately preceding closing brackets.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -563,11 +563,11 @@ from their immediately preceding closing brackets.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>ContinueationGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -580,7 +580,7 @@ from their immediately preceding closing brackets.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QSpinBox" row="0" column="1">
+                            <widget class="TQSpinBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>Continue_MaxStatement</cstring>
                                 </property>
@@ -592,7 +592,7 @@ from their immediately preceding closing brackets.</string>
 relative to the previous line.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -604,7 +604,7 @@ relative to the previous line.</string>
 relative to the previous line.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel3</cstring>
                                 </property>
@@ -616,7 +616,7 @@ relative to the previous line.</string>
 belonging to a conditional header.</string>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="1" column="1">
+                            <widget class="TQSpinBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>Continue_MinConditional</cstring>
                                 </property>
@@ -636,11 +636,11 @@ belonging to a conditional header.</string>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>IndentGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -653,7 +653,7 @@ belonging to a conditional header.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Switches</cstring>
                                 </property>
@@ -665,7 +665,7 @@ belonging to a conditional header.</string>
 headers are indented in relation to the switch block.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Cases</cstring>
                                 </property>
@@ -677,7 +677,7 @@ headers are indented in relation to the switch block.</string>
 Case statements not enclosed in blocks are NOT indented.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Classes</cstring>
                                 </property>
@@ -690,7 +690,7 @@ Case statements not enclosed in blocks are NOT indented.</string>
 relation to the class block.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Brackets</cstring>
                                 </property>
@@ -701,7 +701,7 @@ relation to the class block.</string>
                                     <string>Add extra indentation to '{' and '}' block brackets.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Namespaces</cstring>
                                 </property>
@@ -712,7 +712,7 @@ relation to the class block.</string>
                                     <string>Indent the contents of namespace blocks.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Labels</cstring>
                                 </property>
@@ -728,7 +728,7 @@ the current indentation level, rather than being
 flushed completely to the left (which is the default).</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Blocks</cstring>
                                 </property>
@@ -739,7 +739,7 @@ flushed completely to the left (which is the default).</string>
                                     <string>Add extra indentation entire blocks (including brackets).</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Indent_Preprocessors</cstring>
                                 </property>
@@ -757,7 +757,7 @@ flushed completely to the left (which is the default).</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -768,11 +768,11 @@ flushed completely to the left (which is the default).</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="0">
+                    <widget class="TQButtonGroup" row="0" column="0">
                         <property name="name">
                             <cstring>BlockGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -785,7 +785,7 @@ flushed completely to the left (which is the default).</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>Block_Break</cstring>
                                 </property>
@@ -805,7 +805,7 @@ correctly.
 </string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>Block_BreakAll</cstring>
                                 </property>
@@ -827,7 +827,7 @@ correctly.
 </string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>Block_IfElse</cstring>
                                 </property>
@@ -840,11 +840,11 @@ correctly.
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup" row="1" column="0">
+                    <widget class="TQButtonGroup" row="1" column="0">
                         <property name="name">
                             <cstring>PaddingGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -857,40 +857,40 @@ correctly.
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Pad_ParenthesesIn</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Add spa&amp;ces inside parentheses</string>
+                                    <string>Add spa&amp;ces inside tqparentheses</string>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>Insert space padding around parenthesis on the inside only.</string>
+                                    <string>Insert space padding around tqparenthesis on the inside only.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Pad_ParenthesesOut</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>A&amp;dd spaces outside parentheses</string>
+                                    <string>A&amp;dd spaces outside tqparentheses</string>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>Insert space padding around parenthesis on the outside only.</string>
+                                    <string>Insert space padding around tqparenthesis on the outside only.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Pad_ParenthesesUn</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Remove &amp;unnecessary spaces around parentheses</string>
+                                    <string>Remove &amp;unnecessary spaces around tqparentheses</string>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>Remove unnecessary space padding around parenthesis.</string>
+                                    <string>Remove unnecessary space padding around tqparenthesis.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Pad_Operators</cstring>
                                 </property>
@@ -905,11 +905,11 @@ There is no unpad operator option.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>OneLinersGroup</cstring>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>400</width>
                                 <height>32767</height>
@@ -922,7 +922,7 @@ There is no unpad operator option.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Keep_Statements</cstring>
                                 </property>
@@ -934,7 +934,7 @@ There is no unpad operator option.</string>
 multiple single-statement lines.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>Keep_Blocks</cstring>
                                 </property>
@@ -950,7 +950,7 @@ multiple single-statement lines.</string>
                 </grid>
             </widget>
         </widget>
-        <widget class="QGroupBox" row="0" column="1">
+        <widget class="TQGroupBox" row="0" column="1">
             <property name="name">
                 <cstring>GroupBox4</cstring>
             </property>
@@ -969,7 +969,7 @@ multiple single-statement lines.</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QMultiLineEdit" row="0" column="0">
+                <widget class="TQMultiLineEdit" row="0" column="0">
                     <property name="name">
                         <cstring>StyleExample</cstring>
                     </property>
@@ -1324,9 +1324,9 @@ multiple single-statement lines.</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>allFiles()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 50830723..7646cc76 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -44,8 +44,8 @@ typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
 static const KDevPluginInfo data("kdevbookmarks");
 K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
 
-BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-	: KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
+BookmarksPart::BookmarksPart(TQObject *tqparent, const char *name, const TQStringList& )
+	: KDevPlugin(&data, tqparent, name ? name : "BookmarksPart" )
 {
 	setInstance(BookmarksFactory::instance());
 
@@ -105,7 +105,7 @@ void BookmarksPart::partAdded( KParts::Part * part )
 		if ( setBookmarksForURL( ro_part ) )
 		{
 			updateContextStringForURL( ro_part );
-			if ( EditorData * data = _editorMap.find( ro_part->url().path() ) )
+			if ( EditorData * data = _editorMap.tqfind( ro_part->url().path() ) )
 			{
 				_widget->updateURL( data );
 			}
@@ -124,7 +124,7 @@ void BookmarksPart::reload()
 {
 	//kdDebug(0) << "BookmarksPart::reload()" << endl;
 
-	TQObject * senderobj = const_cast<TQObject*>( sender() );
+	TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
 	if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ) )
 	{
 		if ( partIsSane( ro_part ) )
@@ -140,10 +140,10 @@ void BookmarksPart::marksEvent()
 
 	if ( ! _settingMarks )
 	{
-		TQObject * senderobj = const_cast<TQObject*>( sender() );
+		TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
 		KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj );
 
-		if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) )
+		if ( partIsSane( ro_part ) && !_dirtyParts.tqcontains( ro_part ) )
 		{
 			_dirtyParts.push_back( ro_part );
 			_marksChangeTimer->start( 1000, true );
@@ -192,7 +192,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el )
 	while ( ! bookmark.isNull() )
 	{
 		TQString path = bookmark.attribute( "url" );
-		if ( path != TQString::null )
+		if ( path != TQString() )
 		{
 			EditorData * data = new EditorData;
 			data->url.setPath( path );
@@ -201,9 +201,9 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el )
 			while ( ! mark.isNull() )
 			{
 				TQString line = mark.attribute( "line" );
-				if ( line != TQString::null )
+				if ( line != TQString() )
 				{
-					data->marks.append( qMakePair( line.toInt(), TQString() ) );
+					data->marks.append( tqMakePair( line.toInt(), TQString() ) );
 				}
 				mark = mark.nextSibling().toElement();
 			}
@@ -242,7 +242,7 @@ void BookmarksPart::savePartialProjectSession( TQDomElement * el )
 		bookmark.setAttribute( "url", it.current()->url.path() );
 		bookmarksList.appendChild( bookmark );
 
-		TQValueListIterator< QPair<int,TQString> > it2 = it.current()->marks.begin();
+		TQValueListIterator< TQPair<int,TQString> > it2 = it.current()->marks.begin();
 		while ( it2 != it.current()->marks.end() )
 		{
 			TQDomElement line = domDoc.createElement( "mark" );
@@ -273,9 +273,9 @@ void BookmarksPart::removeBookmarkForURL( KURL const & url, int line )
 {
 	//kdDebug(0) << "BookmarksPart::removeBookmarkForURL()" << endl;
 
-	if ( EditorData * data = _editorMap.find( url.path() ) )
+	if ( EditorData * data = _editorMap.tqfind( url.path() ) )
 	{
-		TQValueListIterator< QPair<int,TQString> > it = data->marks.begin();
+		TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin();
 		while ( it != data->marks.end() )
 		{
 			if ( (*it).first == line )
@@ -305,11 +305,11 @@ void BookmarksPart::updateContextStringForURL( KParts::ReadOnlyPart * ro_part )
 	KTextEditor::EditInterface * ed =
 		dynamic_cast<KTextEditor::EditInterface *>( ro_part );
 
-	EditorData * data = _editorMap.find( ro_part->url().path() );
+	EditorData * data = _editorMap.tqfind( ro_part->url().path() );
 
 	if ( ! ( data && ed ) ) return;
 
-	TQValueListIterator< QPair<int,TQString> > it = data->marks.begin();
+	TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin();
 	while ( it != data->marks.end() )
 	{
 		(*it).second = ed->textLine( (*it).first );
@@ -343,11 +343,11 @@ bool BookmarksPart::setBookmarksForURL( KParts::ReadOnlyPart * ro_part )
 
 		_settingMarks = true;
 
-		if ( EditorData * data = _editorMap.find( ro_part->url().path() ) )
+		if ( EditorData * data = _editorMap.tqfind( ro_part->url().path() ) )
 		{
 			// we've seen this one before, apply stored bookmarks
 
-			TQValueListIterator< QPair<int,TQString> > it = data->marks.begin();
+			TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin();
 			while ( it != data->marks.end() )
 			{
 				mi->addMark( (*it).first, KTextEditor::MarkInterface::markType01 );
@@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part
 			if ( it.current()->type & KTextEditor::MarkInterface::markType01 )
 			{
 			    int line = it.current()->line;
-				data->marks.append( qMakePair( line, TQString() ) );
+				data->marks.append( tqMakePair( line, TQString() ) );
 			}
 			++it;
 		}
@@ -479,7 +479,7 @@ KParts::ReadOnlyPart * BookmarksPart::partForURL( KURL const & url )
 bool BookmarksPart::partIsSane( KParts::ReadOnlyPart * ro_part )
 {
 	return ( ro_part != 0 ) &&
-			partController()->parts()->contains( ro_part) &&
+			partController()->parts()->tqcontains( ro_part) &&
 			!ro_part->url().path().isEmpty();
 }
 
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index 3f1973ca..850e1aef 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -32,7 +32,7 @@ class ConfigWidgetProxy;
 struct EditorData
 {
 	KURL url;
-	TQValueList< QPair<int,TQString> > marks;
+	TQValueList< TQPair<int,TQString> > marks;
 };
 
 class BookmarksWidget;
@@ -41,10 +41,11 @@ class TQDomElement;
 class BookmarksPart : public KDevPlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-	BookmarksPart(TQObject *parent, const char *name, const TQStringList &);
+	BookmarksPart(TQObject *tqparent, const char *name, const TQStringList &);
 	~BookmarksPart();
 
 	// reimplemented from KDevPlugin
diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp
index 58369d92..5fecbc4e 100644
--- a/parts/bookmarks/bookmarks_settings.cpp
+++ b/parts/bookmarks/bookmarks_settings.cpp
@@ -19,8 +19,8 @@
 #include "bookmarks_settings.h"
 
 
-BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* parent, const char* name, WFlags fl )
-: BookmarkSettingsBase( parent, name, fl ), m_part( part )
+BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* tqparent, const char* name, WFlags fl )
+: BookmarkSettingsBase( tqparent, name, fl ), m_part( part )
 {
 	m_part->config()->readConfig();
 	
diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h
index 699941ca..aa517db1 100644
--- a/parts/bookmarks/bookmarks_settings.h
+++ b/parts/bookmarks/bookmarks_settings.h
@@ -19,9 +19,10 @@ class BookmarksPart;
 class BookmarkSettings : public BookmarkSettingsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  BookmarkSettings( BookmarksPart * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  BookmarkSettings( BookmarksPart * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~BookmarkSettings();
 
 public slots:
diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui
index 2d7ab1a2..3e3c1cad 100644
--- a/parts/bookmarks/bookmarks_settings_base.ui
+++ b/parts/bookmarks/bookmarks_settings_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>BookmarkSettingsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>BookmarkSettingsBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBox1</cstring>
                     </property>
@@ -47,15 +47,15 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -69,7 +69,7 @@
                                 <string></string>
                             </property>
                         </widget>
-                        <widget class="QSpinBox">
+                        <widget class="TQSpinBox">
                             <property name="name">
                                 <cstring>spinBox1</cstring>
                             </property>
@@ -96,7 +96,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>121</width>
                                     <height>20</height>
@@ -107,7 +107,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -121,7 +121,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioButton1</cstring>
                     </property>
@@ -135,15 +135,15 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>radioButton2</cstring>
                             </property>
@@ -172,7 +172,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>71</width>
                                     <height>20</height>
@@ -181,7 +181,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioButton3</cstring>
                     </property>
@@ -204,7 +204,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>240</height>
@@ -233,7 +233,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index 20ab2cd9..9ae51f19 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -56,16 +56,16 @@ static const char* const bookmark_xpm[]={
 
 }
 
-class BookmarkItem : public QListViewItem
+class BookmarkItem : public TQListViewItem
 {
 public:
-	BookmarkItem( TQListView * parent, KURL const & url )
-			: TQListViewItem( parent, url.fileName() ),
+	BookmarkItem( TQListView * tqparent, KURL const & url )
+			: TQListViewItem( tqparent, url.fileName() ),
 			_url( url ), _line( -1 ), _isBookmark( false )
 	{}
 
-	BookmarkItem( TQListViewItem * parent, KURL const & url, QPair<int,TQString> mark )
-			: TQListViewItem( parent, TQString::number( mark.first +1 ).rightJustify( 5 ) ),
+	BookmarkItem( TQListViewItem * tqparent, KURL const & url, TQPair<int,TQString> mark )
+			: TQListViewItem( tqparent, TQString::number( mark.first +1 ).rightJustify( 5 ) ),
 			_url( url ), _line( mark.first ), _isBookmark( true ) 
 	{
 		BookmarksWidget * lv = static_cast<BookmarksWidget*>( listView() );
@@ -143,7 +143,7 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part)
 		_part( part )
 
 {
-	addColumn( TQString::null );
+	addColumn( TQString() );
 	header()->hide();
 	setRootIsDecorated( true );
 	setResizeMode( TQListView::LastColumn );
@@ -167,7 +167,7 @@ void BookmarksWidget::maybeTip(const TQPoint &p)
 	if ( ! _part->config()->toolTip() ) return;
 
 	BookmarkItem * item = dynamic_cast<BookmarkItem*>( itemAt( p ) );
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if ( item && r.isValid() )
 	{
@@ -196,7 +196,7 @@ void BookmarksWidget::updateURL( EditorData * data )
 {
 //	kdDebug(0) << "BookmarksWidget::updateURL()" << endl;
 
-	// remove the node that contains 'data'
+	// remove the node that tqcontains 'data'
 	removeURL( data->url );
 
 	// create it again with new data
@@ -213,7 +213,7 @@ void BookmarksWidget::createURL( EditorData * data )
 		file->setOpen( true );
 		file->setPixmap( 0, SmallIcon( "document" ) );
 
-		TQValueListIterator< QPair<int,TQString> > it = data->marks.begin();
+		TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin();
 		while ( it != data->marks.end() )
 		{
 			TQListViewItem * item = new BookmarkItem( file, data->url, *it );
diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h
index 6af0b563..43752d1a 100644
--- a/parts/bookmarks/bookmarks_widget.h
+++ b/parts/bookmarks/bookmarks_widget.h
@@ -26,9 +26,10 @@ class BookmarksPart;
 class BookmarkItem;
 class BookmarksConfig;
 
-class BookmarksWidget : public KListView, public QToolTip
+class BookmarksWidget : public KListView, public TQToolTip
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	BookmarksWidget( BookmarksPart * );
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index df51f6f4..70e26439 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -38,40 +38,40 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
 
     TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
 
-    parents_button = new TQToolButton(this);
-    parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
-    parents_button->setToggleButton(true);
-    parents_button->setFixedSize(parents_button->sizeHint());
-    TQToolTip::add(parents_button, i18n("Show parents"));
-
-    children_button = new TQToolButton(this);
-    children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
-    children_button->setToggleButton(true);
-    children_button->setFixedSize(children_button->sizeHint());
-    TQToolTip::add(children_button, i18n("Show children"));
+    tqparents_button = new TQToolButton(this);
+    tqparents_button->setPixmap( UserIcon("CTtqparents", KIcon::DefaultState, ClassViewFactory::instance()) );
+    tqparents_button->setToggleButton(true);
+    tqparents_button->setFixedSize(tqparents_button->tqsizeHint());
+    TQToolTip::add(tqparents_button, i18n("Show tqparents"));
+
+    tqchildren_button = new TQToolButton(this);
+    tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
+    tqchildren_button->setToggleButton(true);
+    tqchildren_button->setFixedSize(tqchildren_button->tqsizeHint());
+    TQToolTip::add(tqchildren_button, i18n("Show tqchildren"));
 
     clients_button = new TQToolButton(this);
     clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
     clients_button->setToggleButton(true);
-    clients_button->setFixedSize(clients_button->sizeHint());
+    clients_button->setFixedSize(clients_button->tqsizeHint());
     TQToolTip::add(clients_button, i18n("Show clients"));
 
     suppliers_button = new TQToolButton(this);
     suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) );
     suppliers_button->setToggleButton(true);
-    suppliers_button->setFixedSize(suppliers_button->sizeHint());
+    suppliers_button->setFixedSize(suppliers_button->tqsizeHint());
     TQToolTip::add(suppliers_button, i18n("Show suppliers"));
 
     methods_button = new TQToolButton(this);
     methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) );
     methods_button->setToggleButton(true);
-    methods_button->setFixedSize(methods_button->sizeHint());
+    methods_button->setFixedSize(methods_button->tqsizeHint());
     TQToolTip::add(methods_button, i18n("Show methods"));
 
     attributes_button = new TQToolButton(this);
     attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) );
     attributes_button->setToggleButton(true);
-    attributes_button->setFixedSize(attributes_button->sizeHint());
+    attributes_button->setFixedSize(attributes_button->tqsizeHint());
     TQToolTip::add(attributes_button, i18n("Show attributes"));
 
     access_combo = new TQComboBox(false, this, "access combo");
@@ -86,17 +86,17 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     class_tree = new ClassToolWidget(part, this);
     //    classTree->setMinimumSize( 500, 400 );
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
     TQHBoxLayout *firstrowLayout = new TQHBoxLayout();
     TQHBoxLayout *secondrowLayout = new TQHBoxLayout();
-    layout->addLayout(firstrowLayout);
-    layout->addLayout(secondrowLayout);
+    tqlayout->addLayout(firstrowLayout);
+    tqlayout->addLayout(secondrowLayout);
 
     firstrowLayout->addWidget(class_combo, 1);
     firstrowLayout->addWidget(close_button, 0);
 
-    secondrowLayout->addWidget(parents_button);
-    secondrowLayout->addWidget(children_button);
+    secondrowLayout->addWidget(tqparents_button);
+    secondrowLayout->addWidget(tqchildren_button);
     secondrowLayout->addWidget(clients_button);
     secondrowLayout->addWidget(suppliers_button);
     secondrowLayout->addStretch();
@@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     secondrowLayout->addWidget(attributes_button);
     secondrowLayout->addWidget(access_combo);
 
-    layout->addWidget(class_tree, 10);
+    tqlayout->addWidget(class_tree, 10);
 
     connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
              this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
@@ -112,8 +112,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
              this, TQT_SLOT(slotClose()) );
     connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
              this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
-    connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
-    connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
+    connect( tqparents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
+    connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
     connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
     connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
     connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
@@ -170,7 +170,7 @@ void ClassToolDialog::viewNone()
 }
 
 
-/** View the parents of the current class. */
+/** View the tqparents of the current class. */
 void ClassToolDialog::viewParents()
 {
     currentOperation = ViewParents;
@@ -178,7 +178,7 @@ void ClassToolDialog::viewParents()
 }
 
 
-/** View the children of the current class. */
+/** View the tqchildren of the current class. */
 void ClassToolDialog::viewChildren()
 {
     currentOperation = ViewChildren;
@@ -202,7 +202,7 @@ void ClassToolDialog::viewSuppliers()
 }
 
 
-/** View methods in this class and parents. */
+/** View methods in this class and tqparents. */
 void ClassToolDialog::viewMethods()
 {
     currentOperation = ViewMethods;
@@ -210,7 +210,7 @@ void ClassToolDialog::viewMethods()
 }
 
 
-/** View attributes in this class and parents. */
+/** View attributes in this class and tqparents. */
 void ClassToolDialog::viewAttributes()
 {
     currentOperation = ViewAttributes;
@@ -283,11 +283,11 @@ void ClassToolDialog::updateCaptionAndButtons()
     switch (currentOperation)
         {
         case ViewParents:
-            button = parents_button;
+            button = tqparents_button;
             caption = i18n("Parents");
             break;
         case ViewChildren:
-            button = children_button;
+            button = tqchildren_button;
             caption = i18n("Children");
             break;
         case ViewClients:
@@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons()
             break;
         case ViewMethods:
             button = methods_button;
-            caption = i18n("%1 Methods").arg(access_combo->currentText());
+            caption = i18n("%1 Methods").tqarg(access_combo->currentText());
             break;
         case ViewAttributes:
             button = attributes_button;
-            caption = i18n("%1 Attributes").arg(access_combo->currentText());
+            caption = i18n("%1 Attributes").tqarg(access_combo->currentText());
             break;
         default:
             button = 0;
@@ -312,8 +312,8 @@ void ClassToolDialog::updateCaptionAndButtons()
             break;
         }
 
-    parents_button->setOn(false);
-    children_button->setOn(false);
+    tqparents_button->setOn(false);
+    tqchildren_button->setOn(false);
     clients_button->setOn(false);
     suppliers_button->setOn(false);
     methods_button->setOn(false);
@@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons()
 
     if (button) {
         button->setOn(true);
-        setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name()));
+        setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name()));
     } else
         setCaption(caption);
 }
@@ -339,7 +339,7 @@ void ClassToolDialog::buildTree()
     switch (currentOperation)
         {
         case ViewParents:
-            class_tree->insertClassAndClasses(currentClass, currentClass->parents);
+            class_tree->insertClassAndClasses(currentClass, currentClass->tqparents);
             break;
         case ViewChildren:
             {
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index 01c86f3b..a33c7f2b 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -27,9 +27,10 @@ class ClassStore;
 class ParsedClass;
 
 
-class ClassToolDialog : public QWidget
+class ClassToolDialog : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Operations { ViewParents, ViewChildren, ViewClients, ViewSuppliers,
@@ -44,17 +45,17 @@ public slots:
 
     /** View nothing. */
     void viewNone();
-    /** View the parents of the current class. */
+    /** View the tqparents of the current class. */
     void viewParents();
-    /** View the children of the current class. */
+    /** View the tqchildren of the current class. */
     void viewChildren();
     /** View all classes that has this class as an attribute. */
     void viewClients();
     /** View all classes that this class has as attributes. */
     void viewSuppliers();
-    /** View methods in this class and parents. */
+    /** View methods in this class and tqparents. */
     void viewMethods();
-    /** View attributes in this class and parents. */
+    /** View attributes in this class and tqparents. */
     void viewAttributes();
 
 private slots:
@@ -74,8 +75,8 @@ private:
     ClassToolWidget *class_tree;
     TQComboBox *class_combo;
     
-    TQToolButton *parents_button;
-    TQToolButton *children_button;
+    TQToolButton *tqparents_button;
+    TQToolButton *tqchildren_button;
     TQToolButton *clients_button;
     TQToolButton *suppliers_button;
     TQToolButton *methods_button;
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 5aefe6e5..59e744f1 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -20,8 +20,8 @@
 #include "classstore.h"
 
 
-ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *parent)
-    : ClassTreeBase(part, parent, "class tool widget")
+ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *tqparent)
+    : ClassTreeBase(part, tqparent, "class tool widget")
 {}
 
 
@@ -60,16 +60,16 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueLis
 }
 
 
-void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList)
+void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &tqparentList)
 {
     ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass);
     
     ClassTreeItem *lastItem = 0;
 
-    TQPtrListIterator<ParsedParent> it(parentList);
+    TQPtrListIterator<ParsedParent> it(tqparentList);
     for (; it.current(); ++it) {
-        ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name());
-        lastItem = new ClassTreeClassItem(root, lastItem, parentClass);
+        ParsedClass *tqparentClass = m_part->classStore()->getClassByName((*it)->name());
+        lastItem = new ClassTreeClassItem(root, lastItem, tqparentClass);
         lastItem->setExpandable(false);
     }
     
@@ -124,14 +124,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f
 {
     ClassTreeItem *lastItem = 0;
     
-    // First treat all parents.
-    for ( ParsedParent *pParent = parsedClass->parents.first();
+    // First treat all tqparents.
+    for ( ParsedParent *pParent = parsedClass->tqparents.first();
           pParent != 0;
-          pParent = parsedClass->parents.next() )
+          pParent = parsedClass->tqparents.next() )
         {
-            ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name());
-            if (parentClass)
-                addClassAndMethods(parentClass, filter, &lastItem);
+            ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name());
+            if (tqparentClass)
+                addClassAndMethods(tqparentClass, filter, &lastItem);
         }
     
     // Add the current class
@@ -142,14 +142,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f
 void ClassToolWidget::insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter)
 {
     ClassTreeItem *lastItem = 0;
-    // First treat all parents.
-    for ( ParsedParent *pParent = parsedClass->parents.first();
+    // First treat all tqparents.
+    for ( ParsedParent *pParent = parsedClass->tqparents.first();
           pParent != 0;
-          pParent = parsedClass->parents.next() )
+          pParent = parsedClass->tqparents.next() )
         {
-            ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name());
-            if (parentClass)
-                addClassAndAttributes(parentClass, filter, &lastItem);
+            ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name());
+            if (tqparentClass)
+                addClassAndAttributes(tqparentClass, filter, &lastItem);
         }
     
     // Add the current class
diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h
index 4d7d8036..740d5545 100644
--- a/parts/classview/classtoolwidget.h
+++ b/parts/classview/classtoolwidget.h
@@ -20,13 +20,14 @@
 class ClassToolWidget : public ClassTreeBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    ClassToolWidget(ClassViewPart *part, TQWidget *parent=0);
+    ClassToolWidget(ClassViewPart *part, TQWidget *tqparent=0);
     ~ClassToolWidget();
 
     void insertClassAndClasses(ParsedClass *parsedClass, TQValueList<ParsedClass*> classList);
-    void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList);
+    void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &tqparentList);
     void insertAllClassMethods(ParsedClass *parsedClass, PIAccess filter);
     void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter);
 
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index c6d2770e..00a5a87a 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -95,7 +95,7 @@ TQString ClassTreeItem::scopedText() const
     if (m_item)
         return m_item->path();
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -121,7 +121,7 @@ TQString ClassTreeItem::text( int ) const
 {
     if (m_item)
         return m_item->asString();
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -149,7 +149,7 @@ void ClassTreeScopeItem::init()
 TQString ClassTreeScopeItem::text( int col ) const
 {
     if (!m_item)
-        return TQString::null;
+        return TQString();
     if (m_item->name().isEmpty())
         return i18n("Global");
     return ClassTreeItem::text( col );
@@ -272,9 +272,9 @@ void ClassTreeClassItem::setOpen(bool o)
     ClassTreeItem::setOpen(o);
 }
 
-ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *lastSibling,
+ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                                          ParsedMethod *parsedMethod)
-    : ClassTreeItem(parent, lastSibling, parsedMethod)
+    : ClassTreeItem(tqparent, lastSibling, parsedMethod)
 {
     TQString icon;
 
@@ -310,7 +310,7 @@ TQString ClassTreeMethodItem::text( int ) const
     TQString str;
 
     if ( !m_item )
-        return TQString::null;
+        return TQString();
  
     ParsedMethod* method = static_cast<ParsedMethod*>(m_item);
 
@@ -336,9 +336,9 @@ TQString ClassTreeMethodItem::text( int ) const
 }
 
 
-ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastSibling,
+ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                                      ParsedAttribute *parsedAttr)
-    : ClassTreeItem(parent, lastSibling, parsedAttr)
+    : ClassTreeItem(tqparent, lastSibling, parsedAttr)
 {
     TQString icon;
     
@@ -363,13 +363,13 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS
 TQString ClassTreeAttrItem::text( int ) const
 {
     if ( !m_item )
-        return TQString::null;
+        return TQString();
     return m_item->name();
 }
 
-ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *lastSibling,
+ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                                      ParsedScript *parsedScript)
-    : ClassTreeItem(parent, lastSibling, parsedScript)
+    : ClassTreeItem(tqparent, lastSibling, parsedScript)
 {
     TQString icon;
 
@@ -387,7 +387,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l
 TQString ClassTreeScriptItem::text( int ) const
 {
     if ( !m_item )
-        return TQString::null;
+        return TQString();
     return m_item->name();
 }
 
@@ -419,11 +419,11 @@ void ClassTreeScriptItem::setOpen(bool o)
 }
 
 
-class ClassToolTip : public QToolTip
+class ClassToolTip : public TQToolTip
 {
 public:
-    ClassToolTip( TQWidget *parent )
-        : TQToolTip(parent)
+    ClassToolTip( TQWidget *tqparent )
+        : TQToolTip(tqparent)
         {}
 
 protected:
@@ -433,10 +433,10 @@ protected:
 
 void ClassToolTip::maybeTip(const TQPoint &p)
 {
-    ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
+    ClassTreeBase *ctw = static_cast<ClassTreeBase*>(tqparentWidget());
 
     TQListViewItem *item = ctw->itemAt(p);
-    TQRect r = ctw->itemRect(item);
+    TQRect r = ctw->tqitemRect(item);
 
     if (item && r.isValid()) {
         ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item);
@@ -447,15 +447,15 @@ void ClassToolTip::maybeTip(const TQPoint &p)
 }
 
 
-ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name)
-    : KListView(parent, name)
+ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
 {
     setFocusPolicy(ClickFocus);
     setRootIsDecorated(true);
     setResizeMode(TQListView::LastColumn);
     setSorting(-1);
     header()->hide();
-    addColumn(TQString::null);
+    addColumn(TQString());
 
     (void) new ClassToolTip(this);
     
@@ -488,7 +488,7 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const
             TQListViewItem *item = it.current();
             while (item) {
                 path.prepend(item->text(0));
-                item = item->parent();
+                item = item->tqparent();
             }
             state.append(path);
         }
@@ -507,7 +507,7 @@ void ClassTreeBase::setTreeState(TreeState state)
             TQListViewItem *item = it.current();
             while (item) {
                 path.prepend(item->text(0));
-                item = item->parent();
+                item = item->tqparent();
             }
             if (*tsit == path) {
                 it.current()->setOpen(true);
@@ -525,7 +525,7 @@ void ClassTreeBase::slotItemExecuted( TQListViewItem* item )
     if (!item)
         return;
 
-    // toggle open state for parents
+    // toggle open state for tqparents
     if (item->childCount() > 0)
         setOpen(item, !isOpen(item));
 
diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h
index 91ac8054..5274d9e8 100644
--- a/parts/classview/classtreebase.h
+++ b/parts/classview/classtreebase.h
@@ -30,9 +30,10 @@ class KPopupMenu;
 class ClassTreeBase : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public: 
-    ClassTreeBase( ClassViewPart *part, TQWidget *parent=0, const char *name=0 );
+    ClassTreeBase( ClassViewPart *part, TQWidget *tqparent=0, const char *name=0 );
     ~ClassTreeBase();
 
 protected:
@@ -66,18 +67,18 @@ protected:
 class ClassTreeItem : public TQListViewItem, public NotifyClient
 {
 public:
-    ClassTreeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem )
-        : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem)
+    ClassTreeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem )
+        : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem)
     {
         init();
     }
-    ClassTreeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem )
-        : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem)
+    ClassTreeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem )
+        : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem)
     {
         init();
     }
     ClassTreeItem( const ClassTreeItem& other )
-        : TQListViewItem( other.parent(), other.nextSibling()), NotifyClient()
+        : TQListViewItem( other.tqparent(), other.nextSibling()), NotifyClient()
     {
         m_item = other.m_item;
         init();
@@ -122,14 +123,14 @@ protected:
 class ClassTreeOrganizerItem : public ClassTreeItem
 {
 public:
-    ClassTreeOrganizerItem( ClassTreeBase *parent, ClassTreeItem *lastSibling,
+    ClassTreeOrganizerItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling,
                             const TQString &text )
-        : ClassTreeItem(parent, lastSibling, 0 )
+        : ClassTreeItem(tqparent, lastSibling, 0 )
         , m_text( text )
         { init(); }
-    ClassTreeOrganizerItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
+    ClassTreeOrganizerItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                             const TQString &text )
-        : ClassTreeItem(parent, lastSibling, 0 )
+        : ClassTreeItem(tqparent, lastSibling, 0 )
         , m_text( text )
         { init(); }
     ~ClassTreeOrganizerItem()
@@ -147,15 +148,15 @@ private:
 class ClassTreeScopeItem : public ClassTreeItem
 {
 public:
-    ClassTreeScopeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling,
+    ClassTreeScopeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling,
                         ParsedScopeContainer *parsedScope )
-        : ClassTreeItem(parent, lastSibling, parsedScope)
+        : ClassTreeItem(tqparent, lastSibling, parsedScope)
     { 
       init();
     }
-    ClassTreeScopeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
+    ClassTreeScopeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                         ParsedScopeContainer *parsedScope )
-        : ClassTreeItem(parent, lastSibling, parsedScope)
+        : ClassTreeItem(tqparent, lastSibling, parsedScope)
     { 
       init();
     }
@@ -174,15 +175,15 @@ private:
 class ClassTreeClassItem : public ClassTreeItem
 {
 public:
-    ClassTreeClassItem( ClassTreeBase *parent, ClassTreeItem *lastSibling,
+    ClassTreeClassItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling,
                         ParsedClass *parsedClass, bool isStruct=false )
-        : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct )
+        : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct )
         {
           init();
         }
-    ClassTreeClassItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
+    ClassTreeClassItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                         ParsedClass *parsedClass, bool isStruct=false )
-        : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct )
+        : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct )
         {
           init();
         }
@@ -203,7 +204,7 @@ private:
 class ClassTreeMethodItem : public ClassTreeItem
 {
 public:
-    ClassTreeMethodItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
+    ClassTreeMethodItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                          ParsedMethod *parsedMethod );
     ~ClassTreeMethodItem()
         {
@@ -216,7 +217,7 @@ public:
 class ClassTreeAttrItem : public ClassTreeItem
 {
 public:
-    ClassTreeAttrItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
+    ClassTreeAttrItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                        ParsedAttribute *parsedAttr );
     ~ClassTreeAttrItem()
         {
@@ -228,7 +229,7 @@ public:
 class ClassTreeScriptItem : public ClassTreeItem
 {
 public:
-    ClassTreeScriptItem( ClassTreeItem *parent, ClassTreeItem *lastSibling,
+    ClassTreeScriptItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling,
                        ParsedScript *parsedScript );
     ~ClassTreeScriptItem()
         {
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 24163bf4..eceb656f 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -72,13 +72,13 @@ class FunctionCompletion : public CustomCompleter {
             TQString fScope;
             int cutpos;
     
-            if((cutpos = function.find('(')) != -1) {
+            if((cutpos = function.tqfind('(')) != -1) {
                 args = function.right( function.length() - cutpos );
                 function = function.left( cutpos );
             } else {
                 return function;
             }
-            if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) {
+            if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) {
                 fScope = function.left( cutpos + 1 );
                 function = function.right( function.length() - cutpos - 1);
             }
@@ -103,7 +103,7 @@ class FunctionCompletion : public CustomCompleter {
         }
     
         virtual void removeItem ( const TQString &item ) {
-            FuncMap::iterator it = nameMap.find( item );
+            FuncMap::iterator it = nameMap.tqfind( item );
             if( it != nameMap.end() ) {
                 KCompletion::removeItem( *it );
                 revNameMap.remove( *it );
@@ -118,7 +118,7 @@ class FunctionCompletion : public CustomCompleter {
         }
     
         virtual void postProcessMatch ( TQString *match ) const  {
-            FuncMap::const_iterator it = revNameMap.find( *match );
+            FuncMap::const_iterator it = revNameMap.tqfind( *match );
             if( it != revNameMap.end() ) {
                 *match = *it;
             }
@@ -142,9 +142,9 @@ typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
 static const KDevPluginInfo data("kdevclassview");
 K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
 
-ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-    :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-    KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
+ClassViewPart::ClassViewPart(TQObject *tqparent, const char *name, const TQStringList& )
+    :/// KDevPlugin( &data, tqparent, name ? name : "ClassViewPart" ),
+    KDevCodeBrowserFrontend( &data, tqparent, name ? name : "ClassViewPart" ),
     m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
 {
     setInstance(ClassViewFactory::instance());
@@ -254,16 +254,16 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
     m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part );
     m_activeViewCursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView ) : 0;
 
-    m_activeFileName = TQString::null;
+    m_activeFileName = TQString();
 
     if (m_activeDocument)
     {
         m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() );
         navigator->refreshNavBars(m_activeFileName);
         navigator->syncFunctionNavDelayed(200);
-/*        if ( languageSupport()->mimeTypes().find(
+/*        if ( languageSupport()->mimeTypes().tqfind(
             KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() )
-            m_activeFileName = TQString::null;*/
+            m_activeFileName = TQString();*/
     }
     if( m_activeViewCursor )
     {
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index bbad40e6..65044346 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -55,8 +55,9 @@ class HierarchyDialog;
 class ClassViewPart : public Extensions::KDevCodeBrowserFrontend
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ClassViewPart(TQObject *parent, const char *name, const TQStringList &);
+    ClassViewPart(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~ClassViewPart();
 
     bool langHasFeature(KDevLanguageSupport::Features feature);
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 64079546..1eccf136 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
     m_actionViewMode->setItems( lst );
     m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view."));
 
-    m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), this, TQT_SLOT(slotNewClass()),
+    m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()),
 				    m_part->actionCollection(), "classview_new_class" );
     m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard."));
 	
-	m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), this, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
+	m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
 	
 	
-    m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, TQT_SLOT(slotAddMethod()),
+    m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()),
 				    m_part->actionCollection(), "classview_add_method" );
     m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard."));
-    m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), this, TQT_SLOT(slotAddAttribute()),
+    m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()),
 				    m_part->actionCollection(), "classview_add_attribute" );
     m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."));
 
-    m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), this, TQT_SLOT(slotOpenDeclaration()),
+    m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()),
 				    m_part->actionCollection(), "classview_open_declaration" );
     m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line."));
-    m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), this, TQT_SLOT(slotOpenImplementation()),
+    m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()),
 				    m_part->actionCollection(), "classview_open_implementation" );
     m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line."));
 
-	m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), this, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
+	m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
 
     KConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
@@ -116,7 +116,7 @@ template <class ModelType, class ListItemType>
     
     if( c ) {
         KSharedPtr<ModelType> d( c );
-        typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.find(d);
+        typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.tqfind(d);
         if( it != map.end() ) {
             ( *it )->select();
             return true;
@@ -482,13 +482,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo
     TQString current = path.front();
     path.pop_front();
 
-    FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0;
+    FolderBrowserItem* item = m_folders.tqcontains( current ) ? m_folders[ current ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new FolderBrowserItem( m_widget, this, current );
-	if( listView()->removedText.contains(current) )
+	if( listView()->removedText.tqcontains(current) )
 	    item->setOpen( true );
 	m_folders.insert( current, item );
     }
@@ -507,13 +507,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo
 
 void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 {
-    NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
+    NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new NamespaceDomBrowserItem( this, ns );
-	if( listView()->removedText.contains(ns->name()) )
+	if( listView()->removedText.tqcontains(ns->name()) )
 	    item->setOpen( true );
 	m_namespaces.insert( ns->name(), item );
     }
@@ -547,13 +547,13 @@ void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 
 void FolderBrowserItem::processClass( ClassDom klass, bool remove )
 {
-    ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0;
+    ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new ClassDomBrowserItem( this, klass );
-	if( listView()->removedText.contains(klass->name()) )
+	if( listView()->removedText.tqcontains(klass->name()) )
 	    item->setOpen( true );
 	m_classes.insert( klass, item );
     }
@@ -584,13 +584,13 @@ void FolderBrowserItem::processClass( ClassDom klass, bool remove )
 
 void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 {
-    TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
+    TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new TypeAliasDomBrowserItem( this, typeAlias );
-	if( listView()->removedText.contains(typeAlias->name()) )
+	if( listView()->removedText.tqcontains(typeAlias->name()) )
 	    item->setOpen( true );
 	m_typeAliases.insert( typeAlias, item );
     }
@@ -607,7 +607,7 @@ void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 
 void FolderBrowserItem::processFunction( FunctionDom fun, bool remove )
 {
-    FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0;
+    FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -625,7 +625,7 @@ void FolderBrowserItem::processFunction( FunctionDom fun, bool remove )
 
 void FolderBrowserItem::processVariable( VariableDom var, bool remove )
 {
-    VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0;
+    VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -679,13 +679,13 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item)
 
 void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 {
-    NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
+    NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new NamespaceDomBrowserItem( this, ns );
-	if( listView()->removedText.contains(ns->name()) )
+	if( listView()->removedText.tqcontains(ns->name()) )
 	    item->setOpen( true );
 	m_namespaces.insert( ns->name(), item );
     }
@@ -719,13 +719,13 @@ void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove )
 
 void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove )
 {
-    ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0;
+    ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new ClassDomBrowserItem( this, klass );
-	if( listView()->removedText.contains(klass->name()) )
+	if( listView()->removedText.tqcontains(klass->name()) )
 	    item->setOpen( true );
 	m_classes.insert( klass, item );
     }
@@ -756,13 +756,13 @@ void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove )
 
 void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 {
-    TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
+    TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new TypeAliasDomBrowserItem( this, typeAlias );
-	if( listView()->removedText.contains(typeAlias->name()) )
+	if( listView()->removedText.tqcontains(typeAlias->name()) )
 	    item->setOpen( true );
 	m_typeAliases.insert( typeAlias, item );
     }
@@ -779,7 +779,7 @@ void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool rem
 
 void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 {
-    FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0;
+    FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -797,7 +797,7 @@ void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 
 void NamespaceDomBrowserItem::processVariable( VariableDom var, bool remove )
 {
-    VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0;
+    VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -844,13 +844,13 @@ bool ClassDomBrowserItem::selectItem(ItemDom item)
 
 void ClassDomBrowserItem::processClass( ClassDom klass, bool remove )
 {
-    ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0;
+    ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new ClassDomBrowserItem( this, klass );
-	if( listView()->removedText.contains(klass->name()) )
+	if( listView()->removedText.tqcontains(klass->name()) )
 	    item->setOpen( true );
 	m_classes.insert( klass, item );
     }
@@ -881,13 +881,13 @@ void ClassDomBrowserItem::processClass( ClassDom klass, bool remove )
 
 void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove )
 {
-    TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
+    TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0;
     if( !item ){
 	if( remove )
 	    return;
 
 	item = new TypeAliasDomBrowserItem( this, typeAlias );
-	if( listView()->removedText.contains(typeAlias->name()) )
+	if( listView()->removedText.tqcontains(typeAlias->name()) )
 	    item->setOpen( true );
 	m_typeAliases.insert( typeAlias, item );
     }
@@ -904,7 +904,7 @@ void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove
 
 void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 {
-    FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0;
+    FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -922,7 +922,7 @@ void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove )
 
 void ClassDomBrowserItem::processVariable( VariableDom var, bool remove )
 {
-    VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0;
+    VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0;
     if( !item ){
 	if( remove )
 	    return;
@@ -1212,13 +1212,13 @@ void ClassViewWidget::maybeTip( TQPoint const & p )
 				++it;
 			}
 			
-			TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null;
-			TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString::null;
-			TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString::null;
-			TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString::null;
+			TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString();
+			TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString();
+			TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString();
+			TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString();
 			
-			TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString::null;
-			TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString::null;
+			TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString();
+			TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString();
 			
 			tooltip = access + strstatic + strsignal + strslot + strresult
 				+ fitem->dom()->scope().join("::") + "::" + fitem->dom()->name() 
@@ -1238,7 +1238,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p )
 			else if ( vitem->dom()->access() == CodeModelItem::Public )
 				access = "[public] ";
 
-			TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null;
+			TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString();
 			tooltip = access + strstatic + vitem->dom()->type() + " " + vitem->dom()->name();
 		}	
 	}
@@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p )
         
 	kdDebug(0) << tooltip << endl;
 	
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if ( item && r.isValid() && !tooltip.isEmpty() )
 	{
@@ -1277,7 +1277,7 @@ void ClassViewWidget::slotCreateAccessMethods( )
 		if (item == 0)
 			return;
 		
-		m_part->languageSupport()->createAccessMethods(static_cast<ClassModel*>(static_cast<ClassDomBrowserItem*>(item->parent())->dom()),static_cast<VariableModel*>(item->dom()));
+		m_part->languageSupport()->createAccessMethods(static_cast<ClassModel*>(static_cast<ClassDomBrowserItem*>(item->tqparent())->dom()),static_cast<VariableModel*>(item->dom()));
 	}
 }
 
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index 0ace5692..29276a31 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -43,9 +43,10 @@ class VariableDomBrowserItem;
 class KSelectAction;
 class KToggleAction;
 
-class ClassViewWidget : public KListView, public QToolTip
+class ClassViewWidget : public KListView, public TQToolTip
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum ViewMode
     {
@@ -120,10 +121,10 @@ class ClassViewItem: public FancyListViewItem
 {
     private:
 public:
-    ClassViewItem( TQListView* parent, const TQString& text=TQString::null )
-        : FancyListViewItem( static_cast<ClassViewWidget*>( parent )->m_paintStyles, parent, text ) {}
-    ClassViewItem( TQListViewItem* parent, const TQString& text=TQString::null )
-    : FancyListViewItem( static_cast<ClassViewWidget*>( parent->listView() )->m_paintStyles, parent, text ) {}
+    ClassViewItem( TQListView* tqparent, const TQString& text=TQString() )
+        : FancyListViewItem( static_cast<ClassViewWidget*>( tqparent )->m_paintStyles, tqparent, text ) {}
+    ClassViewItem( TQListViewItem* tqparent, const TQString& text=TQString() )
+    : FancyListViewItem( static_cast<ClassViewWidget*>( tqparent->listView() )->m_paintStyles, tqparent, text ) {}
     
     virtual const CodeModelItem* model() const { return 0; }
 
@@ -152,10 +153,10 @@ public:
 class FolderBrowserItem: public ClassViewItem
 {
 public:
-    FolderBrowserItem( ClassViewWidget* widget, TQListView* parent, const TQString& name=TQString::null )
-    	: ClassViewItem( parent, name ), m_widget(widget) {}
-    FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* parent, const TQString& name=TQString::null )
-    	: ClassViewItem( parent, name ), m_widget(widget) {}
+    FolderBrowserItem( ClassViewWidget* widget, TQListView* tqparent, const TQString& name=TQString() )
+    	: ClassViewItem( tqparent, name ), m_widget(widget) {}
+    FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* tqparent, const TQString& name=TQString() )
+    	: ClassViewItem( tqparent, name ), m_widget(widget) {}
 
     virtual bool isFolder() const { return true; }
 
@@ -184,10 +185,10 @@ private:
 class NamespaceDomBrowserItem: public ClassViewItem
 {
 public:
-    NamespaceDomBrowserItem( TQListView* parent, NamespaceDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    NamespaceDomBrowserItem( TQListViewItem* parent, NamespaceDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
+    NamespaceDomBrowserItem( TQListView* tqparent, NamespaceDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
+    NamespaceDomBrowserItem( TQListViewItem* tqparent, NamespaceDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
     
@@ -218,10 +219,10 @@ private:
 class ClassDomBrowserItem: public ClassViewItem
 {
 public:
-    ClassDomBrowserItem( TQListView* parent, ClassDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    ClassDomBrowserItem( TQListViewItem* parent, ClassDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
+    ClassDomBrowserItem( TQListView* tqparent, ClassDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
+    ClassDomBrowserItem( TQListViewItem* tqparent, ClassDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
     virtual bool isClass() const { return true; }
@@ -256,10 +257,10 @@ private:
 class TypeAliasDomBrowserItem: public ClassViewItem
 {
 public:
-    TypeAliasDomBrowserItem( TQListView* parent, TypeAliasDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    TypeAliasDomBrowserItem( TQListViewItem* parent, TypeAliasDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
+    TypeAliasDomBrowserItem( TQListView* tqparent, TypeAliasDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
+    TypeAliasDomBrowserItem( TQListViewItem* tqparent, TypeAliasDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
 	virtual bool isTypeAlias() const { return true; }
@@ -284,10 +285,10 @@ private:
 class FunctionDomBrowserItem: public ClassViewItem
 {
 public:
-    FunctionDomBrowserItem( TQListView* parent, FunctionDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    FunctionDomBrowserItem( TQListViewItem* parent, FunctionDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
+    FunctionDomBrowserItem( TQListView* tqparent, FunctionDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
+    FunctionDomBrowserItem( TQListViewItem* tqparent, FunctionDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
     virtual bool isFunction() const { return true; }
@@ -315,10 +316,10 @@ private:
 class VariableDomBrowserItem: public ClassViewItem
 {
 public:
-    VariableDomBrowserItem( TQListView* parent, VariableDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
-    VariableDomBrowserItem( TQListViewItem* parent, VariableDom dom )
-    	: ClassViewItem( parent, dom->name() ), m_dom( dom ) {}
+    VariableDomBrowserItem( TQListView* tqparent, VariableDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
+    VariableDomBrowserItem( TQListViewItem* tqparent, VariableDom dom )
+    	: ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {}
 
     const CodeModelItem* model() const { return m_dom; }
     virtual bool isVariable() const { return true; }
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index 8bb8e963..1e2f7dfd 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -43,8 +43,8 @@ struct DigraphEdge
 };
 
 
-DigraphView::DigraphView(TQWidget *parent, const char *name)
-    : TQScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase)
+DigraphView::DigraphView(TQWidget *tqparent, const char *name)
+    : TQScrollView(tqparent, name, WRepaintNoErase|WStaticContents|WResizeNoErase)
 {
     viewport()->setBackgroundMode(PaletteBase);
 
@@ -173,13 +173,13 @@ TQStringList DigraphView::splitLine(TQString str)
 
     while (!str.isEmpty()) {
         if (str[0] == '"') {
-            int pos = str.find('"', 1);
+            int pos = str.tqfind('"', 1);
             if (pos == -1)
                 pos = str.length();
             result << str.mid(1, pos-1);
             str.remove(0, pos+1);
         } else {
-            int pos = str.find(' ');
+            int pos = str.tqfind(' ');
             if (pos == -1)
                 pos = str.length();
             result << str.left(pos);
@@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext )
     TQTextStream &is = *ifile.textStream();
     is << "digraph G {" << endl;
     is << "rankdir=LR;" << endl;
-    is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl;
+    is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl;
     TQStringList::Iterator it;
     for (it = inputs.begin(); it != inputs.end(); ++it)
         is << (*it) << endl;
@@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in
         triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22));
         triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22));
         triangle[2] = p2;
-        p->drawPolygon(triangle, true);
+        p->tqdrawPolygon(triangle, true);
     }
 }
 
@@ -323,7 +323,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
     TQPtrListIterator<DigraphNode> it1(nodes);
     for (; it1.current(); ++it1) {
         TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
-        if (r.contains(e->pos())) {
+        if (r.tqcontains(e->pos())) {
             if (selNode) {
                 TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2,
                            selNode->w, selNode->h);
@@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
 }
 
 
-TQSize DigraphView::sizeHint() const
+TQSize DigraphView::tqsizeHint() const
 {
     if (width == -1)
         return TQSize(100, 100); // arbitrary
diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h
index b7215075..216e972e 100644
--- a/parts/classview/digraphview.h
+++ b/parts/classview/digraphview.h
@@ -21,12 +21,13 @@ class DigraphNode;
 class DigraphEdge;
 
 
-class DigraphView : public QScrollView
+class DigraphView : public TQScrollView
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    DigraphView(TQWidget *parent, const char *name);
+    DigraphView(TQWidget *tqparent, const char *name);
     ~DigraphView();
 
     void addEdge(const TQString &name1, const TQString &name2);
@@ -41,7 +42,7 @@ signals:
 protected:
     virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph);
     virtual void contentsMousePressEvent(TQMouseEvent *e);
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 private:
     int toXPixel(double x);
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index a1f2c763..2eedf64d 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -41,30 +41,30 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
     : TQDialog(0, "hierarchy dialog", false)
 {
     class_combo = new KComboView(true, 150, this);
-    class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+    class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 //    class_combo->setMinimumWidth(150);
     namespace_combo = new KComboView(true, 150, this);
-    namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+    namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 //    namespace_combo->setMinimumWidth(150);
 
     TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
     TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this);
     TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this);
 
-    TQSplitter *splitter = new TQSplitter(Vertical, this);
+    TQSplitter *splitter = new TQSplitter(Qt::Vertical, this);
     digraph = new DigraphView(splitter, "digraph view");
 //    member_tree = new ClassToolWidget(part, splitter);
 
-    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
     TQBoxLayout *combo_layout = new TQHBoxLayout();
-    layout->addLayout(combo_layout);
+    tqlayout->addLayout(combo_layout);
     combo_layout->addWidget(namespace_combo);
     combo_layout->addWidget(class_combo);
     combo_layout->addSpacing(60);
     combo_layout->addWidget(refresh_button);
     combo_layout->addWidget(save_button);
     combo_layout->addWidget(close_button);
-    layout->addWidget(splitter);
+    tqlayout->addWidget(splitter);
 
     connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
              this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );
@@ -96,7 +96,7 @@ HierarchyDialog::~HierarchyDialog()
 
 void HierarchyDialog::save()
 {
-    KURLRequesterDlg dlg(TQString::null, this, "save_inheritance");
+    KURLRequesterDlg dlg(TQString(), this, "save_inheritance");
     dlg.fileDialog()->setFilter("image/png image/jpeg image/bmp image/svg+xml");
     dlg.fileDialog()->setOperationMode( KFileDialog::Saving );
     dlg.fileDialog()->setMode( KFile::File | KFile::LocalOnly );
@@ -104,7 +104,7 @@ void HierarchyDialog::save()
     if(dlg.exec() && dlg.selectedURL().isLocalFile())
     {
 	TQFileInfo fi(dlg.selectedURL().pathOrURL());
-        TQApplication::setOverrideCursor( Qt::waitCursor );
+        TQApplication::setOverrideCursor( TQt::waitCursor );
         KDevLanguageSupport *ls = m_part->languageSupport();
         for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
         {
@@ -113,7 +113,7 @@ void HierarchyDialog::save()
             TQStringList baseClasses = it.data()->baseClassList();
             for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
             {
-                TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit);
+                TQMap<TQString, TQString>::const_iterator baseIt = uclasses.tqfind(*bit);
                 if (baseIt != uclasses.end())
                 {
                     TQString formattedParentName = ls->formatClassName(baseIt.data());
@@ -143,7 +143,7 @@ void HierarchyDialog::refresh()
         TQStringList baseClasses = it.data()->baseClassList();
         for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit)
         {
-            TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit);
+            TQMap<TQString, TQString>::const_iterator baseIt = uclasses.tqfind(*bit);
             if (baseIt != uclasses.end())
             {
                 TQString formattedParentName = ls->formatClassName(baseIt.data());
diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h
index dd5c8a36..27d5b2a4 100644
--- a/parts/classview/hierarchydlg.h
+++ b/parts/classview/hierarchydlg.h
@@ -23,9 +23,10 @@ class ClassToolWidget;
 class KComboView;
 class TQListViewItem;
 
-class HierarchyDialog : public QDialog
+class HierarchyDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     HierarchyDialog( ClassViewPart *part );
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index fa83a4ff..78415d8c 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -46,7 +46,7 @@
 namespace
 {
     template<class T>
-    TQValueList<T> QValueList_reversed ( const TQValueList<T> & list )
+    TQValueList<T> TQValueList_reversed ( const TQValueList<T> & list )
     {
         TQValueList<T> rList;
         typename TQValueList<T>::ConstIterator it = list.begin();
@@ -85,10 +85,10 @@ private:
 public:
     enum Type { Declaration, Definition };
 
-    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *parent, TQString name, Type type)
-        :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {}
-    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *parent, TQString name, Type type)
-        :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {}
+    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *tqparent, TQString name, Type type)
+        :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {}
+    FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *tqparent, TQString name, Type type)
+        :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {}
     ~FunctionNavItem() {}
 
     virtual void setup()
@@ -104,8 +104,8 @@ private:
 };
 
 
-Navigator::Navigator(ClassViewPart *parent, const char *name)
- : TQObject(parent, name), m_part(parent)
+Navigator::Navigator(ClassViewPart *tqparent, const char *name)
+ : TQObject(tqparent, name), m_part(tqparent)
 {
     m_state = GoToDefinitions;
     m_navNoDefinition = true;
@@ -289,7 +289,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear)
     {
         TQMap<TQString, TQListViewItem*>::iterator it2 = it;
         ++it;
-        if ( !toLeave.contains( it2.key() ) )
+        if ( !toLeave.tqcontains( it2.key() ) )
         {
             if (it2.data())
             {
@@ -331,7 +331,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear)
     {
         TQMap<TQString, TQListViewItem*>::iterator it2 = itt;
         ++itt;
-        if ( !toLeave.contains( it2.key() ) )
+        if ( !toLeave.tqcontains( it2.key() ) )
         {
             if (it2.data())
             {
@@ -397,14 +397,14 @@ TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleS
     TQString fScope;
     int cutpos;
 
-    if((cutpos = function.find('(')) != -1) {
+    if((cutpos = function.tqfind('(')) != -1) {
         args = function.right( function.length() - cutpos );
         function = function.left( cutpos );
     } else {
         ret.addItem( function );
         return ret;
     }
-    if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) {
+    if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) {
         fScope = function.left( cutpos + 1 );
         function = function.right( function.length() - cutpos - 1);
     }
@@ -499,7 +499,7 @@ void Navigator::slotJumpToPreviousFunction()
     unsigned int currentLine, currentCol;
     m_part->m_activeViewCursor->cursorPositionReal ( &currentLine, &currentCol );
 
-    TQValueList<int> lines = QValueList_reversed<int> ( functionStartLines() );
+    TQValueList<int> lines = TQValueList_reversed<int> ( functionStartLines() );
     if ( lines.isEmpty() ) return;
 
     TQValueList<int>::iterator it = lines.begin();
diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h
index 80b1ca4d..3338e4b1 100644
--- a/parts/classview/navigator.h
+++ b/parts/classview/navigator.h
@@ -36,13 +36,14 @@ class KAction;
 class TextPaintItem;
 TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyleStore& styles );
 
-class Navigator : public QObject
+class Navigator : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     enum NavigationState { GoToDefinitions, GoToDeclarations };
 
-    Navigator(ClassViewPart *parent, const char *name = 0);
+    Navigator(ClassViewPart *tqparent, const char *name = 0);
     ~Navigator();
 
     void stopTimer();
diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp
index bb7bf01d..bc1c4f3b 100644
--- a/parts/classview/viewcombos.cpp
+++ b/parts/classview/viewcombos.cpp
@@ -27,13 +27,13 @@
 #include "viewcombos.h"
 #include "classviewpart.h"
 
-NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom)
-    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
+NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom)
+    :TQListViewItem(tqparent, name), m_dom(dom), m_part(part)
 {
 }
 
-NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom)
-    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
+NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom)
+    :TQListViewItem(tqparent, name), m_dom(dom), m_part(part)
 {
 }
 
@@ -53,13 +53,13 @@ void NamespaceItem::setup()
 }
 
 
-ClassItem::ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom)
-    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
+ClassItem::ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom)
+    :TQListViewItem(tqparent, name), m_dom(dom), m_part(part)
 {
 }
 
-ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom)
-    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
+ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom)
+    :TQListViewItem(tqparent, name), m_dom(dom), m_part(part)
 {
 }
 
@@ -79,13 +79,13 @@ void ClassItem::setup()
 }
 
 
-FunctionItem::FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom)
-    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
+FunctionItem::FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom)
+    :TQListViewItem(tqparent, name), m_dom(dom), m_part(part)
 {
 }
 
-FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom)
-    :TQListViewItem(parent, name), m_dom(dom), m_part(part)
+FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom)
+    :TQListViewItem(tqparent, name), m_dom(dom), m_part(part)
 {
 }
 
diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h
index 7525a5d8..c3ea79a2 100644
--- a/parts/classview/viewcombos.h
+++ b/parts/classview/viewcombos.h
@@ -32,10 +32,10 @@ class KComboView;
 const TQString EmptyClasses = i18n("(Classes)");
 const TQString EmptyFunctions = i18n("(Functions)");
 
-class NamespaceItem: public QListViewItem{
+class NamespaceItem: public TQListViewItem{
 public:
-    NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom);
-    NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom);
+    NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom);
+    NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom);
     ~NamespaceItem();
     NamespaceDom dom() const;
     virtual void setup();
@@ -44,10 +44,10 @@ private:
     ClassViewPart *m_part;
 };
 
-class ClassItem: public QListViewItem{
+class ClassItem: public TQListViewItem{
 public:
-    ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom);
-    ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom);
+    ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom);
+    ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom);
     ~ClassItem();
     ClassDom dom() const;
     virtual void setup();
@@ -56,10 +56,10 @@ private:
     ClassViewPart *m_part;
 };
 
-class FunctionItem: public QListViewItem{
+class FunctionItem: public TQListViewItem{
 public:
-    FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom);
-    FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom);
+    FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom);
+    FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom);
     ~FunctionItem();
     FunctionDom dom() const;
     virtual void setup();
diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp
index e066a136..ab9febc4 100644
--- a/parts/ctags2/ctags2_createtagfile.cpp
+++ b/parts/ctags2/ctags2_createtagfile.cpp
@@ -16,8 +16,8 @@
 #include "ctags2_part.h"
 
 
-CreateTagFile::CreateTagFile(TQWidget* parent, const char* name, bool modal, WFlags fl)
-: CTags2CreateTagFileBase( parent, name, modal, fl )
+CreateTagFile::CreateTagFile(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: CTags2CreateTagFileBase( tqparent, name, modal, fl )
 {
 	dirToTag->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
 	newTagFilePath->setMode( KFile::File | KFile::LocalOnly );
diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h
index 068c1815..61cc6448 100644
--- a/parts/ctags2/ctags2_createtagfile.h
+++ b/parts/ctags2/ctags2_createtagfile.h
@@ -19,9 +19,10 @@
 class CreateTagFile : public CTags2CreateTagFileBase {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	CreateTagFile(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~CreateTagFile();
 	TQString name();
 	TQString tagsfilePath();
diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui
index bf4469f3..ae3bcea4 100644
--- a/parts/ctags2/ctags2_createtagfilebase.ui
+++ b/parts/ctags2/ctags2_createtagfilebase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CTags2CreateTagFileBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CTags2CreateTagFileBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <cstring>displayName</cstring>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1_3</cstring>
             </property>
@@ -45,7 +45,7 @@
                 <cstring>newTagFilePath</cstring>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -58,9 +58,9 @@
                 <cstring>dirToTag</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -76,14 +76,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>createTagFileButton</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>&amp;Create</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -135,11 +135,11 @@
         <slot>validate()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>createTagFile()</slot>
     <slot>validate()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index b05a12a4..60fe4ca5 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -58,8 +58,8 @@ typedef KDevGenericFactory<CTags2Part> CTags2Factory;
 static const KDevPluginInfo data("kdevctags2");
 K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
 
-CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
+CTags2Part::CTags2Part(TQObject *tqparent, const char *name, const TQStringList& )
+  : KDevPlugin(&data, tqparent, name ? name : "ctags2Part" )
 {
 	setInstance(CTags2Factory::instance());
 	setXMLFile("kdevpart_ctags2.rc");
@@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context)
 		popup->insertSeparator();
 
 		if ( showDeclaration )
-			popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
+			popup->insertItem( i18n("CTags - Go to Declaration: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
 
 		if ( showDefinition )
-			popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
+			popup->insertItem( i18n("CTags - Go to Definition: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
 
 		if ( showLookup )
-			popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) );
+			popup->insertItem( i18n("CTags - Lookup: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoTag()) );
 	}
 }
 
@@ -268,9 +268,9 @@ int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const &
 {
 	if ( pattern.isEmpty() ) return -1;
 
-	// ctags interestingly escapes "/", but apparently nothing else. lets revert that
+	// ctags interestingly escapes "/", but aptqparently nothing else. lets revert that
 	TQString unescaped = pattern;
-	unescaped.replace( "\\/", "/" );
+	unescaped.tqreplace( "\\/", "/" );
 
 	// most of the time, the ctags pattern has the form /^foo$/
 	// but this isn't true for some macro definitions
diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h
index 05a53c41..648c6ded 100644
--- a/parts/ctags2/ctags2_part.h
+++ b/parts/ctags2/ctags2_part.h
@@ -29,10 +29,11 @@ class KDialogBase;
 class CTags2Part : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
    
-	CTags2Part(TQObject *parent, const char *name, const TQStringList &);
+	CTags2Part(TQObject *tqparent, const char *name, const TQStringList &);
 	~CTags2Part();
 
 	int getFileLineFromPattern( KURL const & url, TQString const & pattern);
diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp
index c1a8d617..38227d1d 100644
--- a/parts/ctags2/ctags2_selecttagfile.cpp
+++ b/parts/ctags2/ctags2_selecttagfile.cpp
@@ -15,8 +15,8 @@
 #include "ctags2_selecttagfile.h"
 
 
-SelectTagFile::SelectTagFile( TQWidget* parent, const char* name, bool modal, WFlags fl)
-: SelectTagFileBase( parent, name, modal, fl )
+SelectTagFile::SelectTagFile( TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: SelectTagFileBase( tqparent, name, modal, fl )
 {
 	tagFile->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
 	okButton->setEnabled( false );
diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h
index d4f4f5f9..a069743e 100644
--- a/parts/ctags2/ctags2_selecttagfile.h
+++ b/parts/ctags2/ctags2_selecttagfile.h
@@ -16,9 +16,10 @@
 
 class SelectTagFile : public SelectTagFileBase {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-	SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	SelectTagFile( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~SelectTagFile();
 	TQString name();
 	TQString tagsfilePath();
diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui
index cddd5f26..db02f864 100644
--- a/parts/ctags2/ctags2_selecttagfilebase.ui
+++ b/parts/ctags2/ctags2_selecttagfilebase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SelectTagFileBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SelectTagFileBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <cstring>displayName</cstring>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -45,9 +45,9 @@
                 <cstring>tagFile</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -63,14 +63,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>O&amp;K</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -116,10 +116,10 @@
         <slot>validate()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>validate()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index d7458a85..ea607eb6 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -30,8 +30,8 @@
 #include "ctags2_createtagfile.h"
 
 
-CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* parent, const char* name, WFlags fl )
-	: CTags2SettingsWidgetBase( parent, name, fl ), m_part( part )
+CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent, const char* name, WFlags fl )
+	: CTags2SettingsWidgetBase( tqparent, name, fl ), m_part( part )
 {
 	binaryPath->completionObject()->setMode( KURLCompletion::FileCompletion );
 	binaryPath->setMode( KFile::File | KFile::LocalOnly );
@@ -91,7 +91,7 @@ void CTags2SettingsWidget::loadSettings()
     while ( it != entryMap.end() )
 	{
 		TQString file = config->readPathEntry( it.key() );
-		new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.contains( file ) );
+		new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.tqcontains( file ) );
 		++it;
 	}
 }
diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h
index 5a9d5c71..1ee3ede0 100644
--- a/parts/ctags2/ctags2_settingswidget.h
+++ b/parts/ctags2/ctags2_settingswidget.h
@@ -18,11 +18,11 @@
 
 class CTags2Part;
 
-class TagsItem : public QCheckListItem
+class TagsItem : public TQCheckListItem
 {
 public:
-	TagsItem( TQListView * parent, TQString name, TQString tagsfilePath, bool active )
-		: TQCheckListItem( parent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath )
+	TagsItem( TQListView * tqparent, TQString name, TQString tagsfilePath, bool active )
+		: TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath )
 	{
 		setOn( active );
 		setText( 1, tagsfilePath );
@@ -40,9 +40,10 @@ private:
 class CTags2SettingsWidget : public CTags2SettingsWidgetBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	CTags2SettingsWidget( CTags2Part * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+	CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 	~CTags2SettingsWidget();
 
 signals:
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 27898206..2ea6e4aa 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CTags2SettingsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CTags2SettingsWidgetBase</cstring>
     </property>
@@ -16,11 +16,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget8</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox1</cstring>
                         </property>
@@ -50,7 +50,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>showDeclarationBox</cstring>
                                 </property>
@@ -61,7 +61,7 @@
                                     <string>If checked, an option to go directly to the matching tag declaration will be shown. If more than one match, all matches will be shown in the main ctags result view.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>showDefinitionBox</cstring>
                                 </property>
@@ -72,7 +72,7 @@
                                     <string>If checked, an option to go directly to the matching tag definition will be shown. If more than one match, all matches will be shown in the main ctags result view.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>showLookupBox</cstring>
                                 </property>
@@ -85,7 +85,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox3_2</cstring>
                         </property>
@@ -104,7 +104,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>jumpToFirstBox</cstring>
                                 </property>
@@ -115,7 +115,7 @@
                                     <string>If more than one hit was produced from an attempt to find an exact match, go to the first match in the list. Note: the &lt;i&gt;Go To Next Match&lt;/i&gt; shortcut can be used to step between the matches.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>tagfileCustomBox</cstring>
                                 </property>
@@ -142,7 +142,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox3</cstring>
                         </property>
@@ -164,7 +164,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -192,7 +192,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>31</height>
@@ -201,7 +201,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -212,15 +212,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout15</cstring>
+                            <cstring>tqlayout15</cstring>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -238,7 +238,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>textLabel1_2</cstring>
                         </property>
@@ -246,15 +246,15 @@
                             <string>Other tag files:</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1">
+                    <widget class="TQLayoutWidget" row="2" column="1">
                         <property name="name">
-                            <cstring>layout21</cstring>
+                            <cstring>tqlayout21</cstring>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton" row="0" column="0">
+                            <widget class="TQPushButton" row="0" column="0">
                                 <property name="name">
                                     <cstring>createButton</cstring>
                                 </property>
@@ -262,7 +262,7 @@
                                     <string>&amp;Create...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="0">
+                            <widget class="TQPushButton" row="1" column="0">
                                 <property name="name">
                                     <cstring>addButton</cstring>
                                 </property>
@@ -270,7 +270,7 @@
                                     <string>&amp;Add...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="2" column="0">
+                            <widget class="TQPushButton" row="2" column="0">
                                 <property name="name">
                                     <cstring>removeButton</cstring>
                                 </property>
@@ -290,7 +290,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>61</height>
@@ -361,14 +361,14 @@
         <slot>clear()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>createNewTagSlot()</slot>
     <slot>addNewTagFile()</slot>
     <slot>removeTagFile()</slot>
     <slot>moveUpTagFile()</slot>
     <slot>moveDownTagFile()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index ab277966..f6fec985 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -28,7 +28,7 @@
 #include "ctags2_widget.h"
 #include "tags.h"
 
-class TagItem : public QListViewItem
+class TagItem : public TQListViewItem
 {
 public:
     TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern );
@@ -104,7 +104,7 @@ void CTags2Widget::line_edit_changed_delayed( )
 
 void CTags2Widget::showHitCount( int n )
 {
-	hitcount_label->setText( i18n("Hits: %1").arg( n ) );
+	hitcount_label->setText( i18n("Hits: %1").tqarg( n ) );
 }
 
 int CTags2Widget::calculateHitCount( )
@@ -133,7 +133,7 @@ void CTags2Widget::itemExecuted( TQListViewItem * item )
 
 void CTags2Widget::regeneratebutton_clicked()
 {
-	TQApplication::setOverrideCursor(Qt::waitCursor);
+	TQApplication::setOverrideCursor(TQt::waitCursor);
 
 	_part->createTagsFile();
 
@@ -174,7 +174,7 @@ void CTags2Widget::goToNext( )
 			if ( (item = item->nextSibling()) != NULL )
 			{
 				item->setSelected( true );
-				output_view->repaint( true );
+				output_view->tqrepaint( true );
 				itemExecuted( item );
 				return;
 			}
diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h
index 8b3bb4f4..f86197c0 100644
--- a/parts/ctags2/ctags2_widget.h
+++ b/parts/ctags2/ctags2_widget.h
@@ -22,6 +22,7 @@ class TQListViewItem;
 class CTags2Widget : public CTags2WidgetBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	CTags2Widget( CTags2Part * part, const char* name = 0, WFlags fl = 0 );
diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index ef564767..801a9c3d 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CTags2WidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CTags2WidgetBase</cstring>
     </property>
@@ -69,15 +69,15 @@
                 <string>Result view for a tag lookup. Click a line to go to the corresponding place in the code.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -93,7 +93,7 @@
                         <string>Type the identifier you want to lookup. &lt;p&gt; The identifier will populate and display a reducing list as you type.</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>hitcount_label</cstring>
                     </property>
@@ -111,14 +111,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>datetime_label</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         <string>Date:</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>generate_button</cstring>
                     </property>
@@ -168,12 +168,12 @@
     <tabstop>input_edit</tabstop>
     <tabstop>output_view</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="private">line_edit_changed_delayed()</slot>
     <slot access="private">line_edit_changed()</slot>
     <slot access="private">regeneratebutton_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp
index e198c577..012db208 100644
--- a/parts/ctags2/ctagskinds.cpp
+++ b/parts/ctags2/ctagskinds.cpp
@@ -290,7 +290,7 @@ static CTagsKindMapping *findKindMapping(const TQString &extension)
 
 TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension )
 {
-    if ( kindChar == 0 ) return TQString::null;
+    if ( kindChar == 0 ) return TQString();
 
     CTagsKindMapping *kindMapping = findKindMapping(extension);
     if (kindMapping) {
@@ -302,5 +302,5 @@ TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension
         }
     }
 
-    return TQString::null;
+    return TQString();
 }
diff --git a/parts/ctags2/readtags.c b/parts/ctags2/readtags.c
index 38014d3f..dce0a2e8 100644
--- a/parts/ctags2/readtags.c
+++ b/parts/ctags2/readtags.c
@@ -649,7 +649,7 @@ static tagResult findSequential (tagFile *const file)
     return result;
 }
 
-static tagResult find (tagFile *const file, tagEntry *const entry,
+static tagResult tqfind (tagFile *const file, tagEntry *const entry,
 		       const char *const name, const int options)
 {
     tagResult result = TagFailure;
@@ -758,7 +758,7 @@ extern tagResult tagsFind (tagFile *const file, tagEntry *const entry,
 {
     tagResult result = TagFailure;
     if (file != NULL  &&  file->initialized)
-	result = find (file, entry, name, options);
+	result = tqfind (file, entry, name, options);
     return result;
 }
 
diff --git a/parts/ctags2/tagitem.h b/parts/ctags2/tagitem.h
index 19bc0a59..7108fcb9 100644
--- a/parts/ctags2/tagitem.h
+++ b/parts/ctags2/tagitem.h
@@ -14,7 +14,7 @@
 
 #include <tqlistview.h>
 
-class TagItem : public QListViewItem
+class TagItem : public TQListViewItem
 {
 public:
     TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern );
diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp
index 19993823..8b83c701 100644
--- a/parts/ctags2/tags.cpp
+++ b/parts/ctags2/tags.cpp
@@ -123,7 +123,7 @@ Tags::TagList Tags::getMatches(const char* tagFile, const TQString & tagpart, bo
 			{
 				type = "macro";
 			}
-			if ( types.isEmpty() || types.contains( entry.kind ) )
+			if ( types.isEmpty() || types.tqcontains( entry.kind ) )
 			{
 				list << TagEntry( TQString( entry.name ), type, file, TQString( entry.address.pattern ) );
 			}
diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h
index 22b7e7ea..d289d9d6 100644
--- a/parts/ctags2/tags.h
+++ b/parts/ctags2/tags.h
@@ -45,7 +45,7 @@ public:
 	/**
 	 *    Method to check if the tag database contains a specific tag
 	 * @param tag Tag to look up
-	 * @return returns true if tag database contains 'tag'
+	 * @return returns true if tag database tqcontains 'tag'
 	 */
 	static bool hasTag( const TQString & tag );
 	
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index e5a8c74d..aba0f07f 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -16,14 +16,14 @@
 #include "diffdlg.h"
 #include "diffwidget.h"
 
-DiffDlg::DiffDlg( TQWidget *parent, const char *name ):
-    KDialogBase( parent, name, true, i18n("Difference Viewer"), Ok )
+DiffDlg::DiffDlg( TQWidget *tqparent, const char *name ):
+    KDialogBase( tqparent, name, true, i18n("Difference Viewer"), Ok )
 {
   diffWidget = new DiffWidget( this, "Main Diff Widget" );
   setMainWidget( diffWidget );
 
-  TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() );
-  layout->addWidget( diffWidget );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() );
+  tqlayout->addWidget( diffWidget );
 }
 
 DiffDlg::~DiffDlg()
diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h
index a25a3957..574ffaef 100644
--- a/parts/diff/diffdlg.h
+++ b/parts/diff/diffdlg.h
@@ -20,9 +20,10 @@ class DiffWidget;
 class DiffDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DiffDlg( TQWidget *parent = 0, const char *name = 0 );
+    DiffDlg( TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~DiffDlg();
 
 public slots:
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index fab596ad..f6495932 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -41,8 +41,8 @@ static const KDevPluginInfo data("kdevdiff");
 typedef KDevGenericFactory<DiffPart> DiffFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
 
-DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+DiffPart::DiffPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevDiffFrontend(&data, tqparent, name ? name : "DiffPart"), proc(0)
 {
   setInstance(DiffFactory::instance());
   setXMLFile("kdevdiff.rc");
@@ -122,7 +122,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context )
 	{
 		int id = popup->insertItem( i18n( "Difference to Disk File" ),
 							this, TQT_SLOT(localDiff()) );
-		popup->setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between "
+		popup->TQMenuData::setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between "
 			"the file contents in this editor and the file contents on disk."));
 	}
 }
@@ -146,7 +146,7 @@ void DiffPart::localDiff()
   if ( !editIface )
     return;
   buffer = editIface->text().local8Bit();
-  resultBuffer = resultErr = TQString::null;
+  resultBuffer = resultErr = TQString();
 
   delete proc;
   proc = new KProcess();
@@ -182,9 +182,9 @@ void DiffPart::processExited( KProcess* p )
     else
       showDiff( resultBuffer );
   } else {
-    KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr );
+    KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr );
   }
-  resultBuffer = resultErr = TQString::null;
+  resultBuffer = resultErr = TQString();
   delete proc;
   proc = 0;
 }
@@ -196,7 +196,7 @@ void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
 
 void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
 {
-  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ) << endl;
+  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ).data() << endl;
   resultErr += TQString::fromLocal8Bit( buf, buflen );
 }
 
@@ -237,7 +237,7 @@ void DiffPart::showDiff( const TQString& diff )
 
 void DiffPart::slotExecDiff()
 {
-  KURL url = KFileDialog::getOpenURL( TQString::null, TQString::null, 0, i18n("Please Select Patch File") );
+  KURL url = KFileDialog::getOpenURL( TQString(), TQString(), 0, i18n("Please Select Patch File") );
 
   if ( url.isEmpty() )
     return;
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index 0162f40c..6cbd8b28 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -27,9 +27,10 @@ class TQCString;
 class DiffPart : public KDevDiffFrontend
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DiffPart( TQObject *parent, const char *name, const TQStringList & );
+    DiffPart( TQObject *tqparent, const char *name, const TQStringList & );
     virtual ~DiffPart();
 
     void openURL( const KURL& url );
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 7d403e46..21e7709f 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -42,7 +42,7 @@ static const int POPUP_BASE = 130977;
 TQStringList KDiffTextEdit::extParts;
 TQStringList KDiffTextEdit::extPartsTranslated;
 
-KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
+KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name )
 {
   KConfig* config = kapp->config();
   config->setGroup( "Diff" );
@@ -73,7 +73,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
   int i = 0;
 
   for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
-    popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
+    popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i );
     i++;
   }
   if ( !extPartsTranslated.isEmpty() )
@@ -90,7 +90,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
   popup->insertSeparator( 3 );
 
   popup->insertSeparator();
-  popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) );
+  popup->insertItem( i18n("Hide view"), tqparent(), TQT_SLOT(hideView()) );
 
   return popup;
 }
@@ -180,8 +180,8 @@ void KDiffTextEdit::popupActivated( int id )
   emit externalPartRequested( extParts[ id ] );
 }
 
-DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFlags f ):
-    TQWidget( parent, name, f ), m_part( part ), tempFile( 0 )
+DiffWidget::DiffWidget( DiffPart * part, TQWidget *tqparent, const char *name, WFlags f ):
+    TQWidget( tqparent, name, f ), m_part( part ), tempFile( 0 )
 {
   job = 0;
   extPart = 0;
@@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl
 //  te->setMinimumSize( 300, 200 );
   connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
 
-  TQVBoxLayout* layout = new TQVBoxLayout( this );
-  layout->addWidget( te );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+  tqlayout->addWidget( te );
 }
 
 DiffWidget::~DiffWidget()
@@ -229,11 +229,11 @@ void DiffWidget::loadExtPart( const TQString& partName )
   if ( !extService )
     return;
 
-  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 );
+  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 );
   if ( !extPart || !extPart->widget() )
     return;
 
-  layout()->add( extPart->widget() );
+  tqlayout()->add( extPart->widget() );
 
   setExtPartVisible( true );
 
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index dc8568c2..638073d0 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -30,11 +30,12 @@ namespace KParts {
 }
 
 // Helper class that displays a modified RMB popup menu
-class KDiffTextEdit: public QTextEdit
+class KDiffTextEdit: public TQTextEdit
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 );
+  KDiffTextEdit( TQWidget* tqparent = 0, const char* name = 0 );
   virtual ~KDiffTextEdit();
   void applySyntaxHighlight();
   void clearSyntaxHighlight();
@@ -58,12 +59,13 @@ private:
   bool _highlight;
 };
 
-class DiffWidget : public QWidget
+class DiffWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DiffWidget( DiffPart * part, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    DiffWidget( DiffPart * part, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~DiffWidget();
 
 public slots:
diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
index 77e69705..33b74c80 100644
--- a/parts/distpart/distpart_part.cpp
+++ b/parts/distpart/distpart_part.cpp
@@ -37,8 +37,8 @@ typedef KDevGenericFactory<DistpartPart> DistpartFactory;
 static const KDevPluginInfo data("kdevdistpart");
 K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) )
 
-DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "DistpartPart") {
+DistpartPart::DistpartPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name ? name : "DistpartPart") {
 
     kdDebug(9007) << "DistpartPart::DistpartPart()" << endl;
     setInstance(DistpartFactory::instance());
diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h
index d380d4fd..870ba792 100644
--- a/parts/distpart/distpart_part.h
+++ b/parts/distpart/distpart_part.h
@@ -34,10 +34,11 @@ class KDialogBase;
 
 class DistpartPart : public KDevPlugin {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    DistpartPart(TQObject *parent, const char *name, const TQStringList &);
+    DistpartPart(TQObject *tqparent, const char *name, const TQStringList &);
     ~DistpartPart();
     
 public slots:
diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui
index a987c009..7a53590b 100644
--- a/parts/distpart/distpart_ui.ui
+++ b/parts/distpart/distpart_ui.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>distpart_ui</class>
 <author>Ian Reinhart Geiser &lt;geiseri@yahoo.com&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>packaging_dialog</cstring>
     </property>
@@ -21,13 +21,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -46,7 +46,7 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout30</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>titleLabel</cstring>
                     </property>
@@ -69,7 +69,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>250</width>
                             <height>0</height>
@@ -79,7 +79,7 @@
                         <string>&lt;H2&gt;Project Packaging &amp; Publishing&lt;/H2&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>KDevelopGraphic</cstring>
                     </property>
@@ -91,13 +91,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
@@ -112,7 +112,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>actions_box</cstring>
             </property>
@@ -127,7 +127,7 @@
             <property name="tabPosition">
                 <enum>Top</enum>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -143,7 +143,7 @@
                             <cstring>srcDistFileListBox</cstring>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0" rowspan="2" colspan="1">
+                    <widget class="TQCheckBox" row="0" column="0" rowspan="2" colspan="1">
                         <property name="name">
                             <cstring>customProjectCheckBox</cstring>
                         </property>
@@ -154,7 +154,7 @@
                             <string>Default is: %n-%v.tar.gz</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="0">
+                    <widget class="TQLayoutWidget" row="2" column="0">
                         <property name="name">
                             <cstring>Layout19</cstring>
                         </property>
@@ -165,7 +165,7 @@
                             <property name="margin">
                                 <number>0</number>
                             </property>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>sourceOptionsGroupBox</cstring>
                                 </property>
@@ -176,7 +176,7 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>bzipCheckBox</cstring>
                                         </property>
@@ -184,7 +184,7 @@
                                             <string>Use &amp;bzip2 instead of gzip</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
                                             <cstring>Layout34</cstring>
                                         </property>
@@ -195,7 +195,7 @@
                                             <property name="margin">
                                                 <number>0</number>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>archiveNameLabel</cstring>
                                                 </property>
@@ -231,14 +231,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>addFile</cstring>
                                 </property>
@@ -288,7 +288,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLabel" row="0" column="1">
+                    <widget class="TQLabel" row="0" column="1">
                         <property name="name">
                             <cstring>fileListLabel</cstring>
                         </property>
@@ -301,7 +301,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -312,17 +312,17 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout12</cstring>
+                            <cstring>tqlayout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout11</cstring>
+                                    <cstring>tqlayout11</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -341,7 +341,7 @@
                                             </sizepolicy>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="3" column="0">
+                                    <widget class="TQLabel" row="3" column="0">
                                         <property name="name">
                                             <cstring>vendorLabel</cstring>
                                         </property>
@@ -394,7 +394,7 @@
                                             </sizepolicy>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>appNameLabel</cstring>
                                         </property>
@@ -405,7 +405,7 @@
                                             <cstring>appNameLineEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="5" column="0">
+                                    <widget class="TQLabel" row="5" column="0">
                                         <property name="name">
                                             <cstring>summaryLabel</cstring>
                                         </property>
@@ -416,7 +416,7 @@
                                             <cstring>summaryLineEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="4" column="0">
+                                    <widget class="TQLabel" row="4" column="0">
                                         <property name="name">
                                             <cstring>licenseLabel</cstring>
                                         </property>
@@ -427,7 +427,7 @@
                                             <cstring>licenseLineEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="2" column="0">
+                                    <widget class="TQLabel" row="2" column="0">
                                         <property name="name">
                                             <cstring>releaseLabel</cstring>
                                         </property>
@@ -438,7 +438,7 @@
                                             <cstring>releaseLineEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>versionLabel</cstring>
                                         </property>
@@ -493,7 +493,7 @@ Menu item: Project/Project Options/General/Version
 changes project compiled version number</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="6" column="0">
+                                    <widget class="TQLabel" row="6" column="0">
                                         <property name="name">
                                             <cstring>groupLabel</cstring>
                                         </property>
@@ -504,7 +504,7 @@ changes project compiled version number</string>
                                             <cstring>groupLineEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="7" column="0">
+                                    <widget class="TQLabel" row="7" column="0">
                                         <property name="name">
                                             <cstring>packagerLabel</cstring>
                                         </property>
@@ -530,7 +530,7 @@ changes project compiled version number</string>
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QButtonGroup">
+                            <widget class="TQButtonGroup">
                                 <property name="name">
                                     <cstring>advancedOptionsGroupBox</cstring>
                                 </property>
@@ -541,7 +541,7 @@ changes project compiled version number</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>devPackageCheckBox</cstring>
                                         </property>
@@ -549,7 +549,7 @@ changes project compiled version number</string>
                                             <string>&amp;Create development package</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>docsPackageCheckBox</cstring>
                                         </property>
@@ -557,7 +557,7 @@ changes project compiled version number</string>
                                             <string>Create documentation package</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>appIconCheckBox</cstring>
                                         </property>
@@ -565,7 +565,7 @@ changes project compiled version number</string>
                                             <string>Include application icon</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>archLabel</cstring>
                                         </property>
@@ -573,7 +573,7 @@ changes project compiled version number</string>
                                             <string>Architecture target:&lt;BR&gt;&lt;b&gt;(Note: You must have a compiler that supports this target)&lt;/b&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QComboBox">
+                                    <widget class="TQComboBox">
                                         <item>
                                             <property name="text">
                                                 <string>i386</string>
@@ -644,17 +644,17 @@ changes project compiled version number</string>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1">
+                    <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>layout13</cstring>
+                            <cstring>tqlayout13</cstring>
                         </property>
                         <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout8</cstring>
+                                    <cstring>tqlayout8</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -700,23 +700,23 @@ Build Files</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="0">
+                    <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>layout16</cstring>
+                            <cstring>tqlayout16</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout14</cstring>
+                                    <cstring>tqlayout14</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>projectDescriptionLabel</cstring>
                                         </property>
@@ -753,15 +753,15 @@ Build Files</string>
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout15</cstring>
+                                    <cstring>tqlayout15</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>TextLabel1</cstring>
                                         </property>
@@ -799,7 +799,7 @@ Build Files</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -810,7 +810,7 @@ Build Files</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>localOptionsGroupBox</cstring>
                         </property>
@@ -829,7 +829,7 @@ Build Files</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout15</cstring>
                                 </property>
@@ -840,7 +840,7 @@ Build Files</string>
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>genHTMLCheckBox</cstring>
                                         </property>
@@ -848,7 +848,7 @@ Build Files</string>
                                             <string>Ge&amp;nerate HTML information page</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="1">
+                                    <widget class="TQCheckBox" row="1" column="1">
                                         <property name="name">
                                             <cstring>useRPMInfoCheckBox</cstring>
                                         </property>
@@ -866,7 +866,7 @@ Build Files</string>
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -885,14 +885,14 @@ Build Files</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout21</cstring>
                                 </property>
@@ -923,7 +923,7 @@ Build Files</string>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>remoteOptionsGroupBox</cstring>
                         </property>
@@ -954,14 +954,14 @@ Build Files</string>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>250</width>
                                         <height>0</height>
                                     </size>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="0" column="1">
+                            <widget class="TQLayoutWidget" row="0" column="1">
                                 <property name="name">
                                     <cstring>Layout23</cstring>
                                 </property>
@@ -972,7 +972,7 @@ Build Files</string>
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>fileSubmissionLabel</cstring>
                                         </property>
@@ -993,7 +993,7 @@ Build Files</string>
                                         <property name="sizeType">
                                             <enum>Minimum</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1034,7 +1034,7 @@ Build Files</string>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
+                            <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                                 <property name="name">
                                     <cstring>Layout25</cstring>
                                 </property>
@@ -1045,7 +1045,7 @@ Build Files</string>
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>uploadCustomCheckBox</cstring>
                                         </property>
@@ -1053,7 +1053,7 @@ Build Files</string>
                                             <string>Upload to &amp;custom FTP site</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>uploadftpkdeorgCheckBox</cstring>
                                         </property>
@@ -1071,7 +1071,7 @@ Build Files</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>0</width>
                                                 <height>20</height>
@@ -1102,7 +1102,7 @@ Build Files</string>
                                             <string>Reset</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>uploadAppsKDEcomCheckBox</cstring>
                                         </property>
@@ -1136,7 +1136,7 @@ Build Files</string>
         <sender>srcPackagePushButton</sender>
         <signal>clicked()</signal>
         <receiver>packaging_dialog</receiver>
-        <slot>slotsrcPackagePushButtonPressed()</slot>
+        <slot>Q_SLOTSrcPackagePushButtonPressed()</slot>
     </connection>
     <connection>
         <sender>importSPECPushButton</sender>
@@ -1152,9 +1152,9 @@ Build Files</string>
     </connection>
     <connection>
         <sender>srcDistFileListBox</sender>
-        <signal>clicked(QListBoxItem*)</signal>
+        <signal>clicked(TQListBoxItem*)</signal>
         <receiver>packaging_dialog</receiver>
-        <slot>slotRemoveFile(QListBoxItem*)</slot>
+        <slot>slotRemoveFile(TQListBoxItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -1201,17 +1201,17 @@ Build Files</string>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotbuildAllPushButtonPressed()</slot>
     <slot>slotexportSPECPushButtonPressed()</slot>
     <slot>slotimportSPECPushButtonPressed()</slot>
-    <slot>slotsrcPackagePushButtonPressed()</slot>
+    <slot>Q_SLOTSrcPackagePushButtonPressed()</slot>
     <slot>slotAddFileButtonPressed()</slot>
-    <slot>slotRemoveFile(QListBoxItem *item)</slot>
-</slots>
+    <slot>slotRemoveFile(TQListBoxItem *item)</slot>
+</Q_SLOTS>
 <pixmapfunction>DesktopIcon</pixmapfunction>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index eebbbe36..177bd966 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -51,8 +51,8 @@
 #include "specsupport.h"
 #include "lsmsupport.h"
 
-DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent)
-        :distpart_ui(parent, "dist_widget"), m_part(part) {
+DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *tqparent)
+        :distpart_ui(tqparent, "dist_widget"), m_part(part) {
     m_spec = new SpecSupport(m_part);
 
     connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ),
@@ -142,14 +142,14 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() {
 		}
 		else
 		{
-			prog->setLabel(i18n("Adding file: %1").arg( file) );
+			prog->setLabel(i18n("Adding file: %1").tqarg( file) );
 			prog->progressBar()->setValue( (idx*100)/srcDistFileListBox->numRows() );
 		}
 	}
     	tar.close( );
 	prog->hide();
 	delete prog;
-	KMessageBox::information( this, i18n("Archive made at: %1").arg( filename ), i18n("Archive Done") );
+	KMessageBox::information( this, i18n("Archive made at: %1").tqarg( filename ), i18n("Archive Done") );
 
     }
     else
@@ -192,7 +192,7 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() {
     else {
         for(unsigned int i=0; i< uploadFileListBox->count(); i++)
 	    KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ),
-                    KURL::fromPathOrURL( getuploadURLLineEditText() +  uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") ));
+                    KURL::fromPathOrURL( getuploadURLLineEditText() +  uploadFileListBox->text(i).tqreplace(TQRegExp("[^/]*/"),"") ));
     }
 }
 
@@ -455,9 +455,9 @@ void DistpartDialog::setprojectChangelogMultilineEditText(TQString text) {
 TQString DistpartDialog::getSourceName() {
     TQString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : TQString("%n-%v");
     name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz";
-    return name.replace(TQRegExp("%n"),getappNameFormatLineEditText())
-	.replace(TQRegExp("%v"),getversionLineEditText())
-	.replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd"));
+    return name.tqreplace(TQRegExp("%n"),getappNameFormatLineEditText())
+	.tqreplace(TQRegExp("%v"),getversionLineEditText())
+	.tqreplace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd"));
 }
 
 void DistpartDialog::loadSettings() {
@@ -592,7 +592,7 @@ void DistpartDialog::slotAddFileButtonPressed(){
 }
 
 void DistpartDialog::slotRemoveFile(TQListBoxItem *item){
-	if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){
+	if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").tqarg( item->text() ), i18n("Remove File") )){
 	for(uint count =0; count< srcDistFileListBox->numRows(); count++){
 		if ( item == srcDistFileListBox->item(count)){
 			srcDistFileListBox->removeItem(count);
diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h
index 32712ee1..36f70582 100644
--- a/parts/distpart/distpart_widget.h
+++ b/parts/distpart/distpart_widget.h
@@ -46,10 +46,11 @@ class ReadOnlyPart;
 
 class DistpartDialog : public distpart_ui {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    DistpartDialog(DistpartPart *part, TQWidget *parent);
+    DistpartDialog(DistpartPart *part, TQWidget *tqparent);
     ~DistpartDialog();
 
 signals:
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index ab4d684f..985c7c0f 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -38,23 +38,9 @@
 #include <tqmessagebox.h>
 
 /// \FIXME This is at least the fifth place in the kdevelop code something like this exists
-TQString QRegExp_escape(const TQString& str )
+TQString TQRegExp_escape(const TQString& str )
 {
-#if QT_VERSION >= 0x030100
     return TQRegExp::escape(str);
-#else
-    // this block is copyrighted by Trolltech AS (GPL)
-    static const char meta[] = "$()*+.?[\\]^{|}";
-    TQString quoted = str;
-    int i = 0;
-
-    while ( i < (int) quoted.length() ) {
-       if ( strchr(meta, quoted[i].latin1()) != 0 )
-           quoted.insert( i++, "\\" );
-       i++;
-    }
-    return quoted;
-#endif
 }
 
 SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) {
@@ -86,7 +72,7 @@ SpecSupport::~SpecSupport() {
 void SpecSupport::slotbuildAllPushButtonPressed() {
     TQMap<TQString,TQString>::Iterator it;
     TQFile file1(dir + "/" + getAppSource());
-    TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
+    TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource());
     if (!file2.exists()) {
 	if (!file1.exists()) {
 	    TQMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first."));
@@ -95,17 +81,17 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
 	else
             if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
                 makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
-		" && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
+		" && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir"))));
     }
     if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
-        makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
+        makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
 }
 
 //    TQPushButton* exportSPECPushButton;
 void SpecSupport::slotexportSPECPushButtonPressed() {
     TQMap<TQString,TQString>::Iterator it;
-    TQString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory());
+    TQString specname = ((it = map.tqfind("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory());
     specname += ("/" + m_part->project()->projectName() + ".spec");
     TQFile file(specname);
 
@@ -122,7 +108,7 @@ TQString SpecSupport::getInfo(TQString s, TQString motif) {
     TQRegExp re(motif + "[ \t]*([^ \t].*[^ \t])[ \t]*");
     if (re.exactMatch(s))
         return re.cap(1);
-    return TQString::null;
+    return TQString();
 }
 
 //    TQPushButton* importSPECPushButton;
@@ -185,7 +171,7 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
     TQMap<TQString,TQString>::Iterator it;
 
     TQFile file1(dir + "/" + getAppSource());
-    TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
+    TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource());
     if (!file2.exists()) {
 	if (!file1.exists()) {
 	    TQMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first."));
@@ -194,10 +180,10 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
 	else
             if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
 	        makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
-		" && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
+		" && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir"))));
     }
     if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
-        makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
+        makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -bs " + m_part->project()->projectName() + ".spec");
 }
 
@@ -226,7 +212,7 @@ void SpecSupport::parseDotRpmmacros() {
             TQString value = re.cap(2).stripWhiteSpace();
 
             while(subst.search(value) != -1) {
-                value.replace(TQRegExp("%\\{"+ QRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1)));
+                value.tqreplace(TQRegExp("%\\{"+ TQRegExp_escape( subst.cap(1) ) +"\\}"),*map.tqfind(subst.cap(1)));
             }
             map.insert(re.cap(1),value);
         }
@@ -245,7 +231,7 @@ void SpecSupport::parseDotRpmmacros() {
 
 bool SpecSupport::createRpmDirectoryFromMacro(const TQString & name) {
     TQMap<TQString,TQString>::Iterator it;
-    if((it = map.find(name)) != map.end()) {
+    if((it = map.tqfind(name)) != map.end()) {
         TQDir dir(*it);
         if (!dir.exists()) return dir.mkdir(*it);
     }
diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h
index e398e89d..a4c49b8d 100644
--- a/parts/documentation/KDevDocumentationIface.h
+++ b/parts/documentation/KDevDocumentationIface.h
@@ -27,6 +27,7 @@ class DocumentationPart;
 
 class KDevDocumentationIface : public TQObject, public DCOPObject {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
     KDevDocumentationIface(DocumentationPart *part);
diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp
index 21913089..28be5a8c 100644
--- a/parts/documentation/addcatalogdlg.cpp
+++ b/parts/documentation/addcatalogdlg.cpp
@@ -32,8 +32,8 @@
 #include "kdevdocumentationplugin.h"
 
 AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, 
-	TQWidget* parent, const char* name, bool modal, WFlags fl)
-	:AddCatalogDlgBase(parent,name, modal,fl), m_plugins( plugins )
+	TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+	:AddCatalogDlgBase(tqparent,name, modal,fl), m_plugins( plugins )
 {
 	for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it)
 	{
diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h
index 0a437294..ec5654fa 100644
--- a/parts/documentation/addcatalogdlg.h
+++ b/parts/documentation/addcatalogdlg.h
@@ -29,8 +29,9 @@ class DocumentationPlugin;
 class AddCatalogDlg: public AddCatalogDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
 		~AddCatalogDlg();
 	
 		TQString title() const;
diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui
index 5274d12b..a24d4d79 100644
--- a/parts/documentation/addcatalogdlgbase.ui
+++ b/parts/documentation/addcatalogdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>AddCatalogDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AddCatalogDlgBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout20</cstring>
+                <cstring>tqlayout20</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -35,7 +35,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -53,7 +53,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>18</height>
@@ -65,7 +65,7 @@
                         <cstring>locationURL</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -76,7 +76,7 @@
                         <cstring>locationURL</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>titleLabel</cstring>
                     </property>
@@ -90,14 +90,14 @@
                         <cstring>titleEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="5" column="0">
+                <widget class="TQComboBox" row="5" column="0">
                     <property name="name">
                         <cstring>docTypeCombo</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -121,14 +121,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -145,7 +145,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -195,11 +195,11 @@
         <slot>locationURLChanged(const QString&amp;)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>locationURLChanged( const QString &amp; )</slot>
     <slot>docTypeChanged( const QString &amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index ff2bbece..c361947e 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -65,7 +65,7 @@ TQString DocBookmarkOwner::currentURL() const
     if (activePart)
         return activePart->url().url();
     else
-        return TQString::null;
+        return TQString();
 }
 
 TQString DocBookmarkOwner::currentTitle() const
@@ -79,21 +79,21 @@ TQString DocBookmarkOwner::currentTitle() const
         return activePart->url().prettyURL();
     }
     else
-        return TQString::null;
+        return TQString();
 }
 
 class DocBookmarkItem: public DocumentationItem {
 public:
-    DocBookmarkItem(Type type, KListView *parent, const TQString &name)
-        :DocumentationItem(type, parent, name)
+    DocBookmarkItem(Type type, KListView *tqparent, const TQString &name)
+        :DocumentationItem(type, tqparent, name)
     {
     }
-    DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name)
-        :DocumentationItem(type, parent, after, name)
+    DocBookmarkItem(Type type, KListView *tqparent, DocumentationItem *after, const TQString &name)
+        :DocumentationItem(type, tqparent, after, name)
     {
     }
-    DocBookmarkItem(Type type, DocumentationItem *parent, const TQString &name)
-        :DocumentationItem(type, parent, name)
+    DocBookmarkItem(Type type, DocumentationItem *tqparent, const TQString &name)
+        :DocumentationItem(type, tqparent, name)
     {
     }
     void setBookmark(const KBookmark &bm) { m_bm = bm; }
@@ -107,8 +107,8 @@ private:
 
 //class BookmarkView
 
-BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name)
-    :TQWidget(parent, name), m_widget(parent)
+BookmarkView::BookmarkView(DocumentationWidget *tqparent, const char *name)
+    :TQWidget(tqparent, name), m_widget(tqparent)
 {
     m_bmManager = new DocBookmarkManager(m_widget->part());
     m_bmOwner = new DocBookmarkOwner(m_widget->part());
diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h
index 4f639c7c..b180478c 100644
--- a/parts/documentation/bookmarkview.h
+++ b/parts/documentation/bookmarkview.h
@@ -47,11 +47,12 @@ private:
     DocumentationPart *m_part;
 };
 
-class BookmarkView : public QWidget
+class BookmarkView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    BookmarkView(DocumentationWidget *parent = 0, const char *name = 0);
+    BookmarkView(DocumentationWidget *tqparent = 0, const char *name = 0);
     ~BookmarkView();
     
 public slots:
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index 2581f5a0..074f6e2b 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -33,8 +33,8 @@
 #include "documentation_part.h"
 #include "docutils.h"
 
-ContentsView::ContentsView(DocumentationWidget *parent, const char *name)
-     :TQWidget(parent, name), m_widget(parent)
+ContentsView::ContentsView(DocumentationWidget *tqparent, const char *name)
+     :TQWidget(tqparent, name), m_widget(tqparent)
 {
     TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0);
     m_view = new KListView(this);
diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h
index 73b133d0..ad323d01 100644
--- a/parts/documentation/contentsview.h
+++ b/parts/documentation/contentsview.h
@@ -27,11 +27,12 @@ class DocumentationWidget;
 class TQListViewItem;
 class KListView;
 
-class ContentsView : public QWidget
+class ContentsView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ContentsView(DocumentationWidget *parent, const char *name = 0);
+    ContentsView(DocumentationWidget *tqparent, const char *name = 0);
     ~ContentsView();
     
     KListView *view() const { return m_view; }
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index b8d6071c..17735dd6 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -23,8 +23,8 @@
 
 #include "kdevdocumentationplugin.h"
 
-DocConfigListView::DocConfigListView(TQWidget *parent, const char *name)
-     :KListView(parent, name)
+DocConfigListView::DocConfigListView(TQWidget *tqparent, const char *name)
+     :KListView(tqparent, name)
 {
 //    setSorting(-1);
     addColumn(i18n("TOC"));
@@ -66,7 +66,7 @@ void DocConfigListView::clickedItem(TQListViewItem *item, const TQPoint &// pnt
         cfg->setIndex(!cfg->index());
     else if ((c == 2)  && (cfg->fullTextSearchPossible()))
         cfg->setFullTextSearch(!cfg->fullTextSearch());
-    repaintItem(item);
+    tqrepaintItem(item);
 }
 
 #include "docconfiglistview.moc"
diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h
index a7c0aea0..b81b0203 100644
--- a/parts/documentation/docconfiglistview.h
+++ b/parts/documentation/docconfiglistview.h
@@ -25,8 +25,9 @@
 class DocConfigListView : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocConfigListView(TQWidget *parent = 0, const char *name = 0);
+    DocConfigListView(TQWidget *tqparent = 0, const char *name = 0);
     ~DocConfigListView();
 
 protected slots:
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 0184c4c9..3bcefe97 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -51,8 +51,8 @@
 #include "docutils.h"
 
 DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
-    DocumentationWidget *widget, TQWidget *parent, const char *name, WFlags fl)
-    :DocGlobalConfigWidgetBase(parent, name, fl), m_part(part), m_widget(widget)
+    DocumentationWidget *widget, TQWidget *tqparent, const char *name, WFlags fl)
+    :DocGlobalConfigWidgetBase(tqparent, name, fl), m_part(part), m_widget(widget)
 {
     m_View = new DocConfigListView( viewHolder );
     viewHolder->addWidget( m_View );
@@ -100,7 +100,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
     useAssistant_box->setChecked(m_part->isAssistantUsed());
 
     // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant
-    if ( kapp->instanceName().find("kdevassistant") != -1 )
+    if ( kapp->instanceName().tqfind("kdevassistant") != -1 )
         useAssistant_box->hide();
 
     //font sizes and zoom levels
@@ -195,7 +195,7 @@ void DocGlobalConfigWidget::accept()
             for (TQStringList::const_iterator it2 = app.constBegin();
                 it2 != app.constEnd(); ++it2)
             {
-                if (!locs.contains(*it2))
+                if (!locs.tqcontains(*it2))
                     locs.append(*it2);
             }
         }
diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h
index afef5730..dc2ab3f0 100644
--- a/parts/documentation/docglobalconfigwidget.h
+++ b/parts/documentation/docglobalconfigwidget.h
@@ -32,9 +32,10 @@ class KListView;
 class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget,
-        TQWidget *parent = 0, const char *name = 0, WFlags fl = 0);
+        TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0);
     ~DocGlobalConfigWidget();
     /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui
index 1af1e011..7798ed79 100644
--- a/parts/documentation/docglobalconfigwidgetbase.ui
+++ b/parts/documentation/docglobalconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>DocGlobalConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DocGlobalConfigWidgetBase</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>docTab</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -37,7 +37,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QWidgetStack">
+                    <widget class="TQWidgetStack">
                         <property name="name">
                             <cstring>viewHolder</cstring>
                         </property>
@@ -49,7 +49,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>WStackPage</cstring>
                             </property>
@@ -58,15 +58,15 @@
                             </attribute>
                         </widget>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout1</cstring>
+                            <cstring>tqlayout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>addCollectionButton</cstring>
                                 </property>
@@ -74,7 +74,7 @@
                                     <string>&amp;Add...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>editCollectionButton</cstring>
                                 </property>
@@ -82,7 +82,7 @@
                                     <string>&amp;Edit...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>removeCollectionButton</cstring>
                                 </property>
@@ -100,7 +100,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -111,7 +111,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -132,22 +132,22 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>190</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout5</cstring>
+                            <cstring>tqlayout5</cstring>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="4" column="0">
+                            <widget class="TQLabel" row="4" column="0">
                                 <property name="name">
                                     <cstring>htsearchbinLabel</cstring>
                                 </property>
@@ -176,7 +176,7 @@
                                 <property name="sizeType">
                                     <enum>Minimum</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -199,7 +199,7 @@
                                     <enum>StrongFocus</enum>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>htdigbinLabel</cstring>
                                 </property>
@@ -218,7 +218,7 @@
                                     <enum>StrongFocus</enum>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>databaseDirLabel</cstring>
                                 </property>
@@ -229,7 +229,7 @@
                                     <cstring>databaseDirEdit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>htmergebinLabel</cstring>
                                 </property>
@@ -244,7 +244,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -265,14 +265,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QButtonGroup" row="1" column="0">
+                    <widget class="TQButtonGroup" row="1" column="0">
                         <property name="name">
                             <cstring>buttonGroup1</cstring>
                         </property>
@@ -283,7 +283,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>find_box</cstring>
                                 </property>
@@ -291,7 +291,7 @@
                                     <string>&amp;Find in documentation</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>index_box</cstring>
                                 </property>
@@ -299,7 +299,7 @@
                                     <string>&amp;Look in documentation index</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>search_box</cstring>
                                 </property>
@@ -307,7 +307,7 @@
                                     <string>S&amp;earch in documentation</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="4" column="0">
+                            <widget class="TQCheckBox" row="4" column="0">
                                 <property name="name">
                                     <cstring>info_box</cstring>
                                 </property>
@@ -315,7 +315,7 @@
                                     <string>Goto &amp;infopage</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0">
+                            <widget class="TQCheckBox" row="3" column="0">
                                 <property name="name">
                                     <cstring>man_box</cstring>
                                 </property>
@@ -325,7 +325,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>useAssistant_box</cstring>
                         </property>
@@ -333,7 +333,7 @@
                             <string>Use KDevelop &amp;Assistant to browse documentation</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>groupBox1</cstring>
                         </property>
@@ -344,7 +344,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -373,7 +373,7 @@
                                     <cstring>fixedFont_combo</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
@@ -392,7 +392,7 @@
                                     <cstring>fixedFont_combo</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -411,7 +411,7 @@
                                     <cstring>zoom_combo</cstring>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="2" column="1">
+                            <widget class="TQComboBox" row="2" column="1">
                                 <item>
                                     <property name="text">
                                         <string>20</string>
@@ -542,15 +542,15 @@
     <tabstop>info_box</tabstop>
     <tabstop>man_box</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>addCollectionButtonClicked()</slot>
     <slot>editCollectionButtonClicked()</slot>
     <slot>removeCollectionButtonClicked()</slot>
     <slot>collectionsBoxCurrentChanged( int )</slot>
     <slot>updateConfig()</slot>
     <slot>updateIndex()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp
index a37ad5cb..910cd5d4 100644
--- a/parts/documentation/docprojectconfigwidget.cpp
+++ b/parts/documentation/docprojectconfigwidget.cpp
@@ -33,8 +33,8 @@
 #include "documentation_part.h"
 #include "documentation_widget.h"
 
-DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent, const char *name)
-    :DocProjectConfigWidgetBase(parent, name), m_part(part)
+DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent, const char *name)
+    :DocProjectConfigWidgetBase(tqparent, name), m_part(part)
 {
     for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin();
         it != m_part->m_plugins.constEnd(); ++it)
diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h
index c5d904b5..8a925a50 100644
--- a/parts/documentation/docprojectconfigwidget.h
+++ b/parts/documentation/docprojectconfigwidget.h
@@ -27,8 +27,9 @@ class DocumentationPlugin;
 
 class DocProjectConfigWidget: public DocProjectConfigWidgetBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0);
+    DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     virtual void changeDocSystem(const TQString &text);
diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui
index ccff4bfc..25bf023f 100644
--- a/parts/documentation/docprojectconfigwidgetbase.ui
+++ b/parts/documentation/docprojectconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>DocProjectConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DocProjectConfigWidgetBase</cstring>
     </property>
@@ -26,14 +26,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -52,7 +52,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <cstring>catalogURL</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -88,14 +88,14 @@
                         <cstring>docSystemCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>docSystemCombo</cstring>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -106,7 +106,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -140,10 +140,10 @@
     <tabstop>catalogURL</tabstop>
     <tabstop>docSystemCombo</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>changeDocSystem(const QString &amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 32e57d9e..0d22c07a 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdocumentation");
 typedef KDevGenericFactory<DocumentationPart> DocumentationFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
 
-DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
+DocumentationPart::DocumentationPart(TQObject *tqparent, const char *name, const TQStringList& )
+    :KDevPlugin(&data, tqparent, name ? name : "DocumentationPart" ),
     m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
 {
     setInstance(DocumentationFactory::instance());
@@ -98,7 +98,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T
 
     TQWhatsThis::add(m_widget, i18n("<b>Documentation browser</b><p>"
         "The documentation browser gives access to various "
-        "documentation sources (Qt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp "
+        "documentation sources (TQt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp "
         "documentation) and the KDevelop manuals. It also provides documentation index "
         "and full text search capabilities."));
 
@@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart()
 void DocumentationPart::loadDocumentationPlugins()
 {
     KTrader::OfferList docPluginOffers =
-        KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
-            TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
+        KTrader::self()->query(TQString::tqfromLatin1("KDevelop/DocumentationPlugins"),
+            TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION));
 
     KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
     for ( ; serviceIt != docPluginOffers.end(); ++serviceIt )
@@ -156,7 +156,7 @@ void DocumentationPart::emitIndexSelected(IndexBox *indexBox)
 {
     if (!m_hasIndex)
     {
-        TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor));
+        TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
         emit indexSelected(indexBox);
         indexBox->fill();
         m_hasIndex = true;
@@ -347,13 +347,13 @@ void DocumentationPart::infoPage()
 
 void DocumentationPart::manPage(const TQString &term)
 {
-    TQString url = TQString::fromLatin1("man:/%1").arg(term);
+    TQString url = TQString::tqfromLatin1("man:/%1").tqarg(term);
     partController()->showDocument(KURL(url));
 }
 
 void DocumentationPart::infoPage(const TQString &term)
 {
-    TQString url = TQString::fromLatin1("info:/%1").arg(term);
+    TQString url = TQString::tqfromLatin1("info:/%1").tqarg(term);
     partController()->showDocument(KURL(url));
 }
 
@@ -465,40 +465,40 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
             TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30);
             int id = -1;
             if (hasContextFeature(Finder)) {
-                id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed),
+                id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed),
                                     this, TQT_SLOT(contextFindDocumentation()));
-                popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>"
+                popup->tqsetWhatsThis(id, i18n("<b>Find documentation</b><p>"
                                     "Opens the documentation finder tab and searches "
                                     "all possible sources of documentation like "
                                     "table of contents, index, man and info databases, "
                                     "Google, etc."));
             }
             if (hasContextFeature(IndexLookup)) {
-                id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed),
+                id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed),
                                 this, TQT_SLOT(contextLookInDocumentationIndex()));
-                popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
+                popup->tqsetWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
                                 "Opens the documentation index tab. It allows "
                                 "a term to be entered which will be looked for in "
                                 "the documentation index."));
             }
             if (hasContextFeature(FullTextSearch)) {
-                id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed),
+                id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed),
                                 this, TQT_SLOT(contextSearchInDocumentation()));
-                popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
+                popup->tqsetWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
                                 "for a term under the cursor in "
                                 "the documentation. For this to work, "
                                 "a full text index must be created first, which can be done in the "
                                 "configuration dialog of the documentation plugin."));
             }
             if (hasContextFeature(GotoMan)) {
-                id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed),
+                id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed),
                                 this, TQT_SLOT(contextManPage()));
-                popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
+                popup->tqsetWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
             }
             if (hasContextFeature(GotoInfo)) {
-                id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed),
+                id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed),
                                 this, TQT_SLOT(contextInfoPage()) );
-                popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
+                popup->tqsetWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
             }
             if (id != -1)
                 popup->insertSeparator();
@@ -665,7 +665,7 @@ TQCString DocumentationPart::startAssistant()
             kdDebug() << dcopName.data() << endl;
             
             //@fixme: is there another way to wait for the remote object to be loaded
-            while (!KApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation"))
+            while (!KApplication::dcopClient()->remoteObjects(dcopName).tqcontains("KDevDocumentation"))
                 usleep(500);
         }
     }
@@ -675,7 +675,7 @@ TQCString DocumentationPart::startAssistant()
 bool DocumentationPart::isAssistantUsed() const
 {
 	// hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant
-	if ( kapp->instanceName().find("kdevassistant") != -1 )
+	if ( kapp->instanceName().tqfind("kdevassistant") != -1 )
 	{
 		return false;
 	}
diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h
index 056785a0..1334b8ca 100644
--- a/parts/documentation/documentation_part.h
+++ b/parts/documentation/documentation_part.h
@@ -42,10 +42,11 @@ class TQPopupMenu;
 class DocumentationPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo };
 
-    DocumentationPart(TQObject *parent, const char *name, const TQStringList &);
+    DocumentationPart(TQObject *tqparent, const char *name, const TQStringList &);
     ~DocumentationPart();
     
     void emitIndexSelected(IndexBox *indexBox);
diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h
index d579142b..21325e81 100644
--- a/parts/documentation/documentation_widget.h
+++ b/parts/documentation/documentation_widget.h
@@ -34,9 +34,10 @@ class SearchView;
 class BookmarkView;
 class KListView;
 
-class DocumentationWidget : public QWidget
+class DocumentationWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     DocumentationWidget(DocumentationPart *part);
     ~DocumentationWidget();
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index 79fa9915..4291a745 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, cons
     if (showSearch)
     {
         menu.insertSeparator();
-        menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4);
+        menu.insertItem(TQString("%1: %2").tqarg(i18n("Search")).tqarg(KStringHandler::csqueeze(title,20)), 4);
     }
     
     switch (menu.exec(pos))
diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui
index fec2dc11..2962e58d 100644
--- a/parts/documentation/editbookmarkdlg.ui
+++ b/parts/documentation/editbookmarkdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EditBookmarkDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>EditBookmarkDlg</cstring>
     </property>
@@ -24,7 +24,7 @@
                 <cstring>locationEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <cstring>nameEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <cstring>nameEdit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -75,14 +75,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -99,7 +99,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -125,7 +125,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -156,7 +156,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp
index 8bdc19d5..ed8c2467 100644
--- a/parts/documentation/editcatalogdlg.cpp
+++ b/parts/documentation/editcatalogdlg.cpp
@@ -28,9 +28,9 @@
 #include "docutils.h"
 #include "kdevdocumentationplugin.h"
 
-EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
+EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* tqparent,
     const char* name, bool modal, WFlags fl)
-    :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin)
+    :EditCatalogBase(tqparent,name, modal,fl), m_plugin(plugin)
 {
     if (m_plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles))
     {
diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h
index f8f1fabf..9f54faf8 100644
--- a/parts/documentation/editcatalogdlg.h
+++ b/parts/documentation/editcatalogdlg.h
@@ -27,9 +27,10 @@ class DocumentationPlugin;
 class EditCatalogDlg : public EditCatalogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     EditCatalogDlg(DocumentationPlugin *plugin, 
-        TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+        TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     ~EditCatalogDlg();
     /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui
index 3fd4caf9..07989ef9 100644
--- a/parts/documentation/editcatalogdlgbase.ui
+++ b/parts/documentation/editcatalogdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EditCatalogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>EditCatalogBase</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -49,14 +49,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -73,7 +73,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -89,9 +89,9 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -107,14 +107,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -130,7 +130,7 @@
                         <cstring>locationURL</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>titleLabel</cstring>
                     </property>
@@ -184,10 +184,10 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>locationURLChanged( const QString &amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 782ef467..60b0bce1 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -41,15 +41,15 @@
 
 #include <klocale.h>
 
-FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name)
-    :FindDocumentationBase(parent, name),
+FindDocumentation::FindDocumentation(DocumentationWidget* tqparent, const char* name)
+    :FindDocumentationBase(tqparent, name),
     man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0),
-    last_item(0), m_widget(parent)
+    last_item(0), m_widget(tqparent)
 {
-    TQWidget* tmp = TQApplication::desktop();
+    TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop());
     setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height());
-    proc_man = new KProcess( this );
-    proc_info = new KProcess( this );
+    proc_man = new KProcess( TQT_TQOBJECT(this) );
+    proc_info = new KProcess( TQT_TQOBJECT(this) );
 
     connect( proc_man, TQT_SIGNAL(processExited( KProcess* )),
                 this, TQT_SLOT(procManExited( KProcess* )) );
@@ -94,11 +94,11 @@ void FindDocumentation::clickOnItem( TQListViewItem * item )
 
     DocumentationItem* doc_item = dynamic_cast<DocumentationItem*>(item);
 
-    if(item->parent() == man_item ||
-        item->parent() == info_item ||
-        item->parent() == google_item ||
-        item->parent() == index_item ||
-        item->parent() == contents_item)
+    if(item->tqparent() == man_item ||
+        item->tqparent() == info_item ||
+        item->tqparent() == google_item ||
+        item->tqparent() == index_item ||
+        item->tqparent() == contents_item)
         m_widget->part()->partController()->showDocument(doc_item->url());
 }
 
@@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* )
 
 void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len)
 {
-    proc_info_out += TQString::fromLatin1( buf, len );
+    proc_info_out += TQString::tqfromLatin1( buf, len );
 }
 
 void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len)
 {
-    proc_man_out += TQString::fromLatin1( buf, len );
+    proc_man_out += TQString::tqfromLatin1( buf, len );
 }
 
 void FindDocumentation::searchInInfo()
@@ -228,7 +228,7 @@ void FindDocumentation::searchInContents()
             catalogItem->load();
             catalogItem->plugin()->setCatalogURL(catalogItem);
         }
-        if (it.current()->text(0).contains(search_term->text(),false))
+        if (it.current()->text(0).tqcontains(search_term->text(),false))
         {
             DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document,
                 contents_item, it.current()->text(0) );
@@ -260,7 +260,7 @@ void FindDocumentation::searchInIndex()
         DocumentationItem* newitem = 0;
         while(item)
         {
-            if(!item->text().contains(search_term->text(),false))
+            if(!item->text().tqcontains(search_term->text(),false))
                 break;
 
             IndexItem::List urls = item->urls();
diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h
index 0a9a3e0a..25088d9a 100644
--- a/parts/documentation/find_documentation.h
+++ b/parts/documentation/find_documentation.h
@@ -31,8 +31,9 @@ class KProcess;
 class FindDocumentation : public FindDocumentationBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    FindDocumentation(DocumentationWidget* parent, const char* name = 0);
+    FindDocumentation(DocumentationWidget* tqparent, const char* name = 0);
     ~FindDocumentation();
     /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index df04ca81..823aad2c 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -28,8 +28,8 @@
 #include <kconfig.h>
 #include <kapplication.h>
 
-FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal)
-    :FindDocumentationOptionsBase(parent,name, modal),
+FindDocumentationOptions::FindDocumentationOptions(TQWidget* tqparent, const char* name, bool modal)
+    :FindDocumentationOptionsBase(tqparent,name, modal),
     m_man_item(0), m_info_item(0), m_index_item(0), m_google_item(0), m_contents_item(0)
 {        
     readOptions();
diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h
index 0c88317b..3fb2ed7c 100644
--- a/parts/documentation/find_documentation_options.h
+++ b/parts/documentation/find_documentation_options.h
@@ -29,8 +29,9 @@ class KConfig;
 class FindDocumentationOptions : public FindDocumentationOptionsBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE);
+    FindDocumentationOptions(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE);
     ~FindDocumentationOptions();
     /*$PUBLIC_FUNCTIONS$*/
     virtual bool isContents( TQCheckListItem * item );
diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui
index c2beadc9..de265bfe 100644
--- a/parts/documentation/find_documentation_optionsbase.ui
+++ b/parts/documentation/find_documentation_optionsbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>FindDocumentationOptionsBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FindDocumentationOptionsBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView" row="1" column="0">
+        <widget class="TQListView" row="1" column="0">
             <column>
                 <property name="text">
                     <string></string>
@@ -38,7 +38,7 @@
                 <cstring>source_list</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
                 <cstring>Layout9_3</cstring>
             </property>
@@ -59,14 +59,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>moveup_button</cstring>
                     </property>
@@ -74,7 +74,7 @@
                         <string>Move &amp;Up</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>movedown_button</cstring>
                     </property>
@@ -92,7 +92,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -101,7 +101,7 @@
                 </spacer>
             </vbox>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>goto_first_match</cstring>
             </property>
@@ -109,7 +109,7 @@
                 <string>Go to first match</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -133,14 +133,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -173,7 +173,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -210,9 +210,9 @@ sources and change their priority here.</string>
         <slot>sourceMoveDown()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>sourceMoveUp()</slot>
     <slot>sourceMoveDown()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui
index 58e6aeb0..19da4dab 100644
--- a/parts/documentation/find_documentationbase.ui
+++ b/parts/documentation/find_documentationbase.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>FindDocumentationBase</class>
 <author>Tobias Gläßer</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FindDocumentationBase</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <string>Search term:</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>button_search</cstring>
             </property>
@@ -52,7 +52,7 @@
                 <cstring>search_term</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="0">
+        <widget class="TQPushButton" row="3" column="0">
             <property name="name">
                 <cstring>butten_options</cstring>
             </property>
@@ -70,7 +70,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>100</width>
                     <height>20</height>
@@ -110,9 +110,9 @@
     </connection>
     <connection>
         <sender>result_list</sender>
-        <signal>executed(QListViewItem*)</signal>
+        <signal>executed(TQListViewItem*)</signal>
         <receiver>FindDocumentationBase</receiver>
-        <slot>clickOnItem(QListViewItem*)</slot>
+        <slot>clickOnItem(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>butten_options</sender>
@@ -122,9 +122,9 @@
     </connection>
     <connection>
         <sender>result_list</sender>
-        <signal>mouseButtonPressed(int,QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&amp;,int)</signal>
         <receiver>FindDocumentationBase</receiver>
-        <slot>buttonPressedOnItem(int,QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>buttonPressedOnItem(int,TQListViewItem*,const QPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>search_term</sender>
@@ -134,9 +134,9 @@
     </connection>
     <connection>
         <sender>result_list</sender>
-        <signal>returnPressed(QListViewItem*)</signal>
+        <signal>returnPressed(TQListViewItem*)</signal>
         <receiver>FindDocumentationBase</receiver>
-        <slot>clickOnItem(QListViewItem*)</slot>
+        <slot>clickOnItem(TQListViewItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -145,7 +145,7 @@
     <tabstop>result_list</tabstop>
     <tabstop>butten_options</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>clickOptions()</slot>
     <slot>setSearchTerm( const QString &amp; term )</slot>
     <slot>startSearch()</slot>
@@ -156,10 +156,10 @@
     <slot>searchInInfo()</slot>
     <slot>procManReadFromStdout()</slot>
     <slot>procInfoReadFromStdout()</slot>
-    <slot>clickOnItem( QListViewItem * item )</slot>
-    <slot>buttonPressedOnItem( int button, QListViewItem * item, const QPoint &amp; pos, int c )</slot>
-</slots>
-<layoutdefaults spacing="1" margin="1"/>
+    <slot>clickOnItem( TQListViewItem * item )</slot>
+    <slot>buttonPressedOnItem( int button, TQListViewItem * item, const QPoint &amp; pos, int c )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="1" margin="1"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index 6a7eddcf..a9e240be 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -38,8 +38,8 @@
 #include "documentation_part.h"
 #include "documentation_widget.h"
 
-IndexView::IndexView(DocumentationWidget *parent, const char *name)
-     :TQWidget(parent, name), m_widget(parent)
+IndexView::IndexView(DocumentationWidget *tqparent, const char *name)
+     :TQWidget(tqparent, name), m_widget(tqparent)
 {
     TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0);
 
@@ -85,7 +85,7 @@ void IndexView::searchInIndex(TQListBoxItem *item)
     else
     {
         SelectTopic *dia = new SelectTopic(urls);
-        dia->topicLabel->setText(dia->topicLabel->text().arg(item->text()));
+        dia->topicLabel->setText(dia->topicLabel->text().tqarg(item->text()));
         if (dia->exec())
             m_widget->part()->partController()->showDocument(dia->selectedURL());
         delete dia;
@@ -123,7 +123,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e)
     if (!watched || !e)
         return true;
 
-    if ((watched == m_edit) && (e->type() == TQEvent::KeyPress))
+    if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_edit)) && (e->type() == TQEvent::KeyPress))
     {
         TQKeyEvent *ke = (TQKeyEvent*)e;
         if (ke->key() == Key_Up)
diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h
index 92f965f2..8fb04e4d 100644
--- a/parts/documentation/indexview.h
+++ b/parts/documentation/indexview.h
@@ -28,11 +28,12 @@ class TQListBoxItem;
 class DocumentationWidget;
 class FindDocumentation;
 
-class IndexView : public QWidget
+class IndexView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    IndexView(DocumentationWidget *parent = 0, const char *name = 0);
+    IndexView(DocumentationWidget *tqparent = 0, const char *name = 0);
     ~IndexView();
     
     virtual bool eventFilter(TQObject *watched, TQEvent *e);
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 3364f71a..22c375d2 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -33,30 +33,30 @@
 
 //class DocumentationItem
 
-DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent,
+DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent,
     const TQString &name)
-    :KListViewItem(parent, name), m_type(type)
+    :KListViewItem(tqparent, name), m_type(type)
 {
     init();
 }
 
-DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent,
+DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *tqparent,
     const TQString &name)
-    :KListViewItem(parent, name), m_type(type)
+    :KListViewItem(tqparent, name), m_type(type)
 {
     init();
 }
 
-DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, 
+DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, 
     KListViewItem *after, const TQString &name)
-    :KListViewItem(parent, after, name), m_type(type)
+    :KListViewItem(tqparent, after, name), m_type(type)
 {
     init();
 }
 
-DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent,
+DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * tqparent,
     KListViewItem * after, const TQString & name )
-    :KListViewItem(parent, after, name), m_type(type)
+    :KListViewItem(tqparent, after, name), m_type(type)
 {
     init();
 }
@@ -90,8 +90,8 @@ void DocumentationItem::init( )
 
   
 DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin,
-    KListView *parent, const TQString &name)
-    :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin),
+    KListView *tqparent, const TQString &name)
+    :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin),
     isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false)
 {
     setExpandable(true);
@@ -99,8 +99,8 @@ DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin,
 }
 
 DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin,
-    DocumentationItem *parent, const TQString &name)
-    :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin),
+    DocumentationItem *tqparent, const TQString &name)
+    :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin),
     isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false)
 {
     setExpandable(true);
@@ -172,7 +172,7 @@ IndexItem::List IndexItem::urls() const
     TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()];
     for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin();
         it != itemProtos.end(); ++it)
-        urlList.append(qMakePair((*it)->description(), (*it)->url()));
+        urlList.append(tqMakePair((*it)->description(), (*it)->url()));
     return urlList;
 }
 
@@ -181,9 +181,9 @@ IndexItem::List IndexItem::urls() const
 
 //class ConfigurationItem
 
-ConfigurationItem::ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url,
+ConfigurationItem::ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url,
     bool indexPossible, bool fullTextSearchPossible)
-    :TQCheckListItem(parent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url),
+    :TQCheckListItem(tqparent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url),
     m_origTitle(title), m_contents(true), m_index(false), m_fullTextSearch(false),
     m_indexPossible(indexPossible), m_fullTextSearchPossible(fullTextSearchPossible),
     m_docPlugin( plugin )
@@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
         p->fillRect(0, 0, width, height(), cg.brush(crole));
 
         TQFontMetrics fm(lv->fontMetrics());
-        int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+        int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
         int marg = lv->itemMargin();
         int styleflags = TQStyle::Style_Default;
                 
@@ -229,7 +229,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
             y = (fm.height() + 2 + marg - boxsize) / 2;
 
         TQStyleOption opt(this);
-        lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
+        lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
             TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
                
         return;
@@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
 int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const
 {
     if ((c == 0) || (c == 1) || (c == 2))
-        return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
+        return lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
     return TQListViewItem::width(fm, lv, c);
 }
 
@@ -253,8 +253,8 @@ int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int
 
 //class DocumentationPlugin
 
-DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name)
-    :TQObject(parent, name), config(pluginConfig), m_indexCreated(false)
+DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent, const char *name)
+    :TQObject(tqparent, name), config(pluginConfig), m_indexCreated(false)
 {
 }
 
@@ -462,7 +462,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL
     for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin();
         it != deletedConfigurationItems.constEnd(); ++it)
     {
-        if (namedCatalogs.contains(*it))
+        if (namedCatalogs.tqcontains(*it))
             delete namedCatalogs[*it];
     }
     deletedConfigurationItems.clear();
@@ -472,15 +472,15 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL
         it != entryMap.end(); ++it)
     {
         config->setGroup("Locations");
-        if (restrictions.contains(it.key()) || (!catalogEnabled(it.key())))
+        if (restrictions.tqcontains(it.key()) || (!catalogEnabled(it.key())))
         {
-            if (namedCatalogs.contains(it.key()))
+            if (namedCatalogs.tqcontains(it.key()))
                 delete namedCatalogs[it.key()];
         }
         else
         {
             kdDebug() << "updating 1" << endl;
-            if (!namedCatalogs.contains(it.key()))    //create catalog if it does not exist
+            if (!namedCatalogs.tqcontains(it.key()))    //create catalog if it does not exist
             {
                 DocumentationCatalogItem * item = createCatalog(contents, it.key(), config->readPathEntry(it.key()));
                 loadIndex(index, item);
@@ -493,7 +493,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL
                 clearCatalogIndex(namedCatalogs[it.key()]);
             }
             else if ( (indexEnabled(namedCatalogs[it.key()]))    //index is requested in configuration but does not yet exist
-                && (!indexes.contains(namedCatalogs[it.key()])) )
+                && (!indexes.tqcontains(namedCatalogs[it.key()])) )
             {
                 kdDebug() << "    index requested " << endl;
                 loadIndex(index, namedCatalogs[it.key()]);
@@ -512,7 +512,7 @@ void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView)
     for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin();
         it != entryMap.end(); ++it)
     {
-        if (namedCatalogs.contains(it.key())
+        if (namedCatalogs.tqcontains(it.key())
             && namedCatalogs[it.key()]->isProjectDocumentationItem())
             continue;
         
@@ -613,8 +613,8 @@ void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e)
 
 //class IndexBox
 
-IndexBox::IndexBox(TQWidget *parent, const char *name)
-    :KListBox(parent, name), m_dirty(false)
+IndexBox::IndexBox(TQWidget *tqparent, const char *name)
+    :KListBox(tqparent, name), m_dirty(false)
 {
 }
 
@@ -630,7 +630,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item)
     if (items[text].count() == 0)
     {
         items.remove(text);
-        TQListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch);
+        TQListBoxItem *item = tqfindItem(text, TQt::CaseSensitive | TQt::ExactMatch);
         if (item)
             delete item;
     }
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index 0c1dcf0d..fc7af7e3 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -43,10 +43,10 @@ public:
         Document      /**<Document.*/
     };
 
-    DocumentationItem(Type type, KListView *parent, const TQString &name);
-    DocumentationItem(Type type, KListView *parent, KListViewItem *after, const TQString &name);
-    DocumentationItem(Type type, KListViewItem *parent, const TQString &name);
-    DocumentationItem(Type type, KListViewItem *parent, KListViewItem *after, const TQString &name);
+    DocumentationItem(Type type, KListView *tqparent, const TQString &name);
+    DocumentationItem(Type type, KListView *tqparent, KListViewItem *after, const TQString &name);
+    DocumentationItem(Type type, KListViewItem *tqparent, const TQString &name);
+    DocumentationItem(Type type, KListViewItem *tqparent, KListViewItem *after, const TQString &name);
 
     virtual void setURL(const KURL &url) { m_url = url; }
     virtual KURL url() const { return m_url; }
@@ -72,8 +72,8 @@ class DocumentationPlugin;
 class DocumentationCatalogItem: public DocumentationItem
 {
 public:
-    DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *parent, const TQString &name);
-    DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *parent, const TQString &name);
+    DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *tqparent, const TQString &name);
+    DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *tqparent, const TQString &name);
     virtual ~DocumentationCatalogItem();
 
     DocumentationPlugin* plugin() const { return m_plugin; }
@@ -122,7 +122,7 @@ private:
 /**Documentation index item.*/
 class IndexItem: public TQListBoxText {
 public:
-    typedef QPair<TQString, KURL> URL;
+    typedef TQPair<TQString, KURL> URL;
     typedef TQValueList<URL> List;
 
     IndexItem(IndexBox *listbox, const TQString &text);
@@ -136,7 +136,7 @@ private:
 /**Documentation index view.*/
 class IndexBox: public KListBox{
 public:
-    IndexBox(TQWidget *parent = 0, const char *name = 0);
+    IndexBox(TQWidget *tqparent = 0, const char *name = 0);
 
     virtual void addIndexItem(IndexItemProto *item);
     virtual void removeIndexItem(IndexItemProto *item);
@@ -158,10 +158,10 @@ class TQFontMetrics;
 class DocumentationPlugin;
 
 /**Documentation configuration item.*/
-class ConfigurationItem: public QCheckListItem
+class ConfigurationItem: public TQCheckListItem
 {
 public:
-    ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url,
+    ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url,
         bool indexPossible, bool fullTextSearchPossible);
 
     virtual TQString title() const { return m_title; }
@@ -214,9 +214,10 @@ methods to load documentation catalogs and indexes for a documentation
 of that type. It also has methods to configure catalogs and provides
 a list of URL's for the full text search tool.
 */
-class DocumentationPlugin: public QObject
+class DocumentationPlugin: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Capability of documentation plugin.*/
     enum Capability { Index=1 /**<index can be built for catalogs*/,
@@ -233,7 +234,7 @@ public:
     setCapabilities(Index | FullTextSearch);
     @endcode
     */
-    DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0);
+    DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent =0, const char *name =0);
     virtual ~DocumentationPlugin();
 
     /**Returns the i18n name of the plugin.*/
@@ -310,7 +311,7 @@ public:
     virtual void deleteCatalogConfiguration(const ConfigurationItem *const configurationItem);
 
     /**Returns a mode and a filter for catalog locator dialogs.*/
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps() = 0;
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps() = 0;
     /**Returns a title of catalog defined by an url parameter.*/
     virtual TQString catalogTitle(const TQString &url) = 0;
 
@@ -389,6 +390,7 @@ Represents functionality to display project documentation catalog and index in d
 */
 class ProjectDocumentationPlugin: public TQObject {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type);
     virtual ~ProjectDocumentationPlugin();
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index e0b19de9..fb033a7f 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -38,9 +38,9 @@ static const KDevPluginInfo data("docchmplugin");
 typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) )
 
-DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args
+DocCHMPlugin::DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList // args
                            )
-    :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation
     autoSetup();
@@ -59,15 +59,15 @@ DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocCHMPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocCHMPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "*.chm");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "*.chm");
 }
 
 TQString DocCHMPlugin::catalogTitle(const TQString& // url
                                    )
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQString DocCHMPlugin::pluginName() const
@@ -127,9 +127,9 @@ void DocCHMPlugin::createIndex(IndexBox* // index
 }
 
 
-static KListViewItem* chainEnd(KListViewItem *parent) {
-    if(parent == 0) return 0;
-    KListViewItem* ret = dynamic_cast<KListViewItem*>(parent->firstChild());
+static KListViewItem* chainEnd(KListViewItem *tqparent) {
+    if(tqparent == 0) return 0;
+    KListViewItem* ret = dynamic_cast<KListViewItem*>(tqparent->firstChild());
     if(ret == 0) return 0;
     while(ret->nextSibling() != 0) {
         ret = dynamic_cast<KListViewItem*>(ret->nextSibling());
@@ -138,15 +138,15 @@ static KListViewItem* chainEnd(KListViewItem *parent) {
 }
 
 static TQString decodeHTML(const TQString& s) {
-    TQRegExp rx(TQString::fromLatin1("&#(\\d+);|&nbsp;"));
+    TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);|&nbsp;"));
     TQString out = s;
     int pos = rx.search(out);
     while(pos > -1) {
         TQString found = rx.cap(0);
         if(found != "&nbsp;") {
-            out.replace(pos, found.length(), static_cast<char>(rx.cap(1).toInt()));
+            out.tqreplace(pos, found.length(), static_cast<char>(rx.cap(1).toInt()));
         }else{
-            out.replace(pos, found.length(), " ");
+            out.tqreplace(pos, found.length(), " ");
         }
         pos = rx.search(out, pos+1);
     }
@@ -163,11 +163,11 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item)
     items.push_back(item);
     for(TQStringList::Iterator it = lines.begin(); it != lines.end();) {
         bool ok1 = true, ok2 = true;
-        int parent = (*it).toInt(&ok1);
+        int tqparent = (*it).toInt(&ok1);
         ++it;
         int current = (*it).toInt(&ok2);
         ++it;
-        if(int(items.size()) != current || !ok1 || !ok2 || parent < 0 || parent >= int(items.size()) || current < 0 || current != int(items.size())) {
+        if(int(items.size()) != current || !ok1 || !ok2 || tqparent < 0 || tqparent >= int(items.size()) || current < 0 || current != int(items.size())) {
             kdDebug(9002) << "DocCHMPlugin::createTOC error while parsing output of ioslave" << endl;
             break;
         }
@@ -178,9 +178,9 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item)
         ++it;
         
         items.push_back(new DocumentationItem(
-                DocumentationItem::Document, items[parent], chainEnd(items[parent]), decodeHTML(name)));
+                DocumentationItem::Document, items[tqparent], chainEnd(items[tqparent]), decodeHTML(name)));
         items[current]->setURL(url);
-        if(parent != 0) items[parent]->setType(DocumentationItem::Book);
+        if(tqparent != 0) items[tqparent]->setType(DocumentationItem::Book);
     }
     
 
diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h
index ca90a978..3f069faf 100644
--- a/parts/documentation/plugins/chm/docchmplugin.h
+++ b/parts/documentation/plugins/chm/docchmplugin.h
@@ -25,15 +25,16 @@
 class DocCHMPlugin :public DocumentationPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList());
+    DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList args = TQStringList());
     ~DocCHMPlugin();
     
     virtual TQString pluginName() const;
 
     virtual void setCatalogURL(DocumentationCatalogItem* item);
     virtual TQString catalogTitle(const TQString& url);
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url);
     virtual void createTOC(DocumentationCatalogItem* item);
     
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index ae95aff1..47012a2b 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -32,9 +32,9 @@ static const KDevPluginInfo data("doccustomplugin");
 typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) )
 
-DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args
+DocCustomPlugin::DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList // args
                                  )
-    :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
     autoSetup();
@@ -62,14 +62,14 @@ DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, co
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
 }
 
 TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DocCustomPlugin::fullTextSearchLocations()
diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h
index 77bc9750..33efec8f 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.h
+++ b/parts/documentation/plugins/custom/doccustomplugin.h
@@ -24,7 +24,7 @@
 
 class DocCustomPlugin : public DocumentationPlugin {
 public:
-    DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocCustomPlugin();
 
     virtual TQString pluginName() const;
@@ -39,7 +39,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 11c2b6a7..79106157 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -41,13 +41,13 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
     DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin,
-        KListView *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile)
+        KListView *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile)
     {
     }
     DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile)
+        DocumentationItem *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile)
     {
     }
     TQString devHelpFile() const { return m_devHelpFile; }
@@ -73,9 +73,9 @@ static const KDevPluginInfo data("docdevhelpplugin");
 typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) )
 
-DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name,
+DocDevHelpPlugin::DocDevHelpPlugin(TQObject* tqparent, const char* name,
     const TQStringList /*args*/)
-    :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(Index | FullTextSearch | ProjectDocumentation);
     autoSetup();
@@ -90,29 +90,29 @@ DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, c
     return new DevHelpDocumentationCatalogItem(url, this, contents, title);
 }
 
-QPair<KFile::Mode, TQString> DocDevHelpPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocDevHelpPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "*.devhelp");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "*.devhelp");
 }
 
 TQString DocDevHelpPlugin::catalogTitle(const TQString& url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
-        return TQString::null;
+        return TQString();
 
     TQFile f(url);
     if (!f.open(IO_ReadOnly))
-        return TQString::null;
+        return TQString();
     
     TQDomDocument doc;
     if (!doc.setContent(&f))
-        return TQString::null;
+        return TQString();
     f.close();
 
     TQDomElement docEl = doc.documentElement();
 
-    return docEl.attribute("title", TQString::null);
+    return docEl.attribute("title", TQString());
 }
 
 TQString DocDevHelpPlugin::pluginName() const
@@ -194,7 +194,7 @@ void DocDevHelpPlugin::autoSetupPlugin()
             continue;
         scanList << dir.path();
 
-        const QFileInfoList *dirEntries = dir.entryInfoList();
+        const TQFileInfoList *dirEntries = dir.entryInfoList();
         if ( !dirEntries ) continue;
         TQPtrListIterator<TQFileInfo> it(*dirEntries);
         for (; it.current(); ++it) 
@@ -224,8 +224,8 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path)
     
     d.setFilter(TQDir::Files);
     //scan for *.devhelp files
-    const QFileInfoList *list = d.entryInfoList();
-    QFileInfoListIterator it( *list );
+    const TQFileInfoList *list = d.entryInfoList();
+    TQFileInfoListIterator it( *list );
     TQFileInfo *fi;
     while ( (fi = it.current()) != 0 ) 
     {
@@ -240,7 +240,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path)
 
 void DocDevHelpPlugin::pushToScanStack(TQValueStack<TQString> &stack, const TQString &value)
 {
-    if ( (!value.isEmpty()) && (!stack.contains(value)) )
+    if ( (!value.isEmpty()) && (!stack.tqcontains(value)) )
     {
         stack << value;
         kdDebug() << "Devhelp scan stack: +: " << value << endl;
@@ -320,7 +320,7 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item)
     addTocSect(dhItem, childEl, baseUrl, true);
 }
 
-void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, 
+void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, 
     TQString baseUrl, bool book)
 {
     while (!childEl.isNull())
@@ -330,11 +330,11 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE
             TQString name = childEl.attribute("name");
             TQString url = childEl.attribute("link");
             
-            if (name.isEmpty() && url.contains("ix"))
+            if (name.isEmpty() && url.tqcontains("ix"))
                 name = "Index";
             
             DocumentationItem *item = new DocumentationItem(
-                book ? DocumentationItem::Book : DocumentationItem::Document, parent, name);
+                book ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name);
             item->setURL(KURL(baseUrl+"/"+url));
             
             TQDomElement grandchildEl = childEl.lastChild().toElement();
@@ -371,7 +371,7 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item)
 
     if (item->url().isEmpty())
     {
-        KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString::null));
+        KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString()));
         item->setURL(url);
     }
 }
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
index 9e4df5c2..dde545d3 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
@@ -28,8 +28,9 @@
 class DocDevHelpPlugin: public DocumentationPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocDevHelpPlugin();
 
     virtual TQString pluginName() const;
@@ -47,14 +48,14 @@ public:
     virtual TQStringList fullTextSearchLocations();
     virtual void autoSetupPlugin();
     
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
 
     virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type);
         
 protected:
     void pushToScanStack(TQValueStack<TQString> &stack, const TQString &value);
     void scanDevHelpDir(const TQString &path);
-    void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false);
+    void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book=false);
 };
 
 #endif
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index f9761155..77997d6b 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -31,8 +31,8 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug
 typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
 
-DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args)
-    :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name)
+DocDjvuPlugin::DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args)
+    :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
     autoSetup();
@@ -59,14 +59,14 @@ DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, cons
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
 }
 
 TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DocDjvuPlugin::fullTextSearchLocations()
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h
index 05689bd8..ec99e024 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.h
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.h
@@ -24,7 +24,7 @@
 
 class DocDjvuPlugin : public DocumentationPlugin {
 public:
-    DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocDjvuPlugin();
 
     virtual TQString pluginName() const;
@@ -39,7 +39,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index a92eb60f..f50ceb3d 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -44,13 +44,13 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
     DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin,
-        KListView *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl)
+        KListView *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl)
     {
     }
     DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl)
+        DocumentationItem *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl)
     {
     }
     TQString origUrl() const { return m_origUrl; }
@@ -64,8 +64,8 @@ static const KDevPluginInfo data("docdoxygenplugin");
 typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
 
-DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
-    :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name)
+DocDoxygenPlugin::DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList)
+    :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles );
     autoSetup();
@@ -75,22 +75,22 @@ DocDoxygenPlugin::~DocDoxygenPlugin()
 {
 }
 
-QPair<KFile::Mode, TQString> DocDoxygenPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocDoxygenPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "index.html *.tag");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "index.html *.tag");
 }
 
 TQString DocDoxygenPlugin::catalogTitle(const TQString& url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
-        return TQString::null;
+        return TQString();
     
     if (fi.extension(false) == "html")
     {
         TQFile f(url);
         if (!f.open(IO_ReadOnly))
-            return TQString::null;
+            return TQString();
         
         TQTextStream ts(&f);
         TQString contents = ts.read();
@@ -118,7 +118,7 @@ TQString DocDoxygenPlugin::catalogTitle(const TQString& url)
             return re.cap(1);   
         }
     }
-    return TQString::null;
+    return TQString();
 }
 
 TQString DocDoxygenPlugin::pluginName() const
@@ -256,7 +256,7 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
         if (!d.exists())
             continue;
 
-        const QFileInfoList *dirEntries = d.entryInfoList();
+        const TQFileInfoList *dirEntries = d.entryInfoList();
         if (!dirEntries) continue;
         TQPtrListIterator<TQFileInfo> it(*dirEntries);
         for (; it.current(); ++it)
@@ -306,7 +306,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item)
         if (!d.exists())
             continue;
 
-        const QFileInfoList *dirEntries = d.entryInfoList();
+        const TQFileInfoList *dirEntries = d.entryInfoList();
         if (!dirEntries) continue;
         TQPtrListIterator<TQFileInfo> it(*dirEntries);
         for (; it.current(); ++it)
@@ -434,9 +434,9 @@ void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index,
 }
 
 void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
-    DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix)
+    DocumentationCatalogItem *item, TQDomElement &tqparentEl, const TQString &prefix)
 {
-    TQDomElement docEl = parentEl;
+    TQDomElement docEl = tqparentEl;
 
     TQDomElement childEl = docEl.firstChild().toElement();
     while (!childEl.isNull())
@@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
             TQString filename = childEl.namedItem("filename").firstChild().toText().data();
 
             IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, 
-            i18n("%1 Class Reference").arg(classname));
+            i18n("%1 Class Reference").tqarg(classname));
             indexItem->addURL(KURL(prefix + filename));
             
             createIndexFromTag(dom, index, item, childEl, prefix + filename);
@@ -460,14 +460,14 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
             || (childEl.attribute("kind") == "slot")
             || (childEl.attribute("kind") == "signal") ))
         {
-            TQString classname = parentEl.namedItem("name").firstChild().toText().data();
+            TQString classname = tqparentEl.namedItem("name").firstChild().toText().data();
             TQString membername = childEl.namedItem("name").firstChild().toText().data();
             TQString anchor = childEl.namedItem("anchor").firstChild().toText().data();
             TQString arglist = childEl.namedItem("arglist").firstChild().toText().data();
             
             if (classname != membername)
             {
-                IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist));
+                IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist));
                 indexItem->addURL(KURL(prefix + "#" + anchor));
             }
         }
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
index 8cf9ec45..d24cedb9 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
@@ -28,8 +28,9 @@ class TQDomElement;
 class DocDoxygenPlugin: public DocumentationPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocDoxygenPlugin();
 
     virtual TQString pluginName() const;
@@ -44,7 +45,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
                     
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
@@ -52,12 +53,12 @@ public:
     virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type);
         
 protected:
-    void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString::null, 
-        const TQString &baseHtmlUrl = TQString::null);
-    void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString::null);
+    void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString(), 
+        const TQString &baseHtmlUrl = TQString());
+    void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString());
     
     void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item,
-        TQDomElement &parentEl, const TQString &prefix);
+        TQDomElement &tqparentEl, const TQString &prefix);
     
     void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, 
         const TQString &name);
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 6dd73707..5829b0bb 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -43,13 +43,13 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
     TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin,
-        KListView *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile)
+        KListView *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile)
     {
     }
     TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile)
+        DocumentationItem *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile)
     {
     }
     TQString tocFile() const { return m_tocFile; }
@@ -63,9 +63,9 @@ static const KDevPluginInfo data("dockdevtocplugin");
 typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) )
 
-DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name,
+DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* tqparent, const char* name,
     const TQStringList /*args*/)
-    :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(Index);
     autoSetup();
@@ -85,24 +85,24 @@ DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, c
     return new TOCDocumentationCatalogItem(url, this, contents, title);
 }
 
-QPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "*.toc");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "*.toc");
 }
 
 TQString DocKDevTOCPlugin::catalogTitle(const TQString& url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
-        return TQString::null;
+        return TQString();
 
     TQFile f(url);
     if (!f.open(IO_ReadOnly))
-        return TQString::null;
+        return TQString();
     
     TQDomDocument doc;
     if (!doc.setContent(&f) || (doc.doctype().name() != "kdeveloptoc"))
-        return TQString::null;
+        return TQString();
     f.close();
 
     TQDomElement titleEl = doc.documentElement().namedItem("title").toElement();
@@ -159,7 +159,7 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     
     TQString base;
     if (!baseEl.isNull())
-        base = baseEl.attribute("href", TQString::null);
+        base = baseEl.attribute("href", TQString());
     
     TQDomElement indexEl = docEl.namedItem("index").toElement();
     TQDomElement childEl = indexEl.firstChild().toElement();
@@ -204,22 +204,22 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
     
     TQString base;
     if (!baseEl.isNull())
-        base = baseEl.attribute("href", TQString::null);
+        base = baseEl.attribute("href", TQString());
     
     TQDomElement childEl = docEl.lastChild().toElement();
     addTocSect(tocItem, childEl, base, 1);
 }
 
-void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
+void DocKDevTOCPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level)
 {
     while (!childEl.isNull())
     {
-        if (childEl.tagName() == TQString("tocsect%1").arg(level))
+        if (childEl.tagName() == TQString("tocsect%1").tqarg(level))
         {
             TQString name = childEl.attribute("name");
             TQString url = childEl.attribute("url");
             
-            DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name);
+            DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name);
             item->setURL(KURL(constructURL(base, url)));
 
             TQDomElement grandchildEl = childEl.lastChild().toElement();
@@ -259,8 +259,8 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
         if (baseEl.isNull())
             item->setURL(KURL());
         else
-            item->setURL(KURL(constructURL(baseEl.attribute("href", TQString::null),
-                baseEl.attribute("url", TQString::null))));
+            item->setURL(KURL(constructURL(baseEl.attribute("href", TQString()),
+                baseEl.attribute("url", TQString()))));
     }
 }
 
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
index 626848b9..fc980247 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
@@ -27,8 +27,9 @@
 class DocKDevTOCPlugin : public DocumentationPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocKDevTOCPlugin();
 
     virtual TQString pluginName() const;
@@ -43,11 +44,11 @@ public:
     
     virtual TQStringList fullTextSearchLocations();
 
-    virtual QPair<KFile::Mode, TQString > catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString > catalogLocatorProps();
     virtual void autoSetupPlugin();
 
 protected:
-    void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level);
+    void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level);
     static TQString constructURL(const TQString &base, const TQString &url) ;
 };
 
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index 8fdc4643..17089c89 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -31,8 +31,8 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl
 typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )
 
-DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args)
-    :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name)
+DocPDBPlugin::DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args)
+    :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
     autoSetup();
@@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocPDBPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocPDBPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles");
 }
 
 TQString DocPDBPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DocPDBPlugin::fullTextSearchLocations()
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h
index b9544a7b..33bb5ded 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.h
+++ b/parts/documentation/plugins/pdb/docpdbplugin.h
@@ -24,7 +24,7 @@
 
 class DocPDBPlugin : public DocumentationPlugin {
 public:
-    DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocPDBPlugin();
 
     virtual TQString pluginName() const;
@@ -39,7 +39,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 79dab511..8fa76deb 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -31,8 +31,8 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin
 typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )
 
-DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args)
-    :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name)
+DocPDFPlugin::DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args)
+    :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(CustomDocumentationTitles | ProjectUserManual);
     autoSetup();
@@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const
     return item;
 }
 
-QPair<KFile::Mode, TQString> DocPDFPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocPDFPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "*.pdf");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "*.pdf");
 }
 
 TQString DocPDFPlugin::catalogTitle(const TQString& /*url*/)
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DocPDFPlugin::fullTextSearchLocations()
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h
index b7e8b26b..e3a9c099 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.h
+++ b/parts/documentation/plugins/pdf/docpdfplugin.h
@@ -24,7 +24,7 @@
 
 class DocPDFPlugin : public DocumentationPlugin {
 public:
-    DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~DocPDFPlugin();
 
     virtual TQString pluginName() const;
@@ -39,7 +39,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
             
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString& url);
     
     virtual void autoSetupPlugin();
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index b4118f97..5efe880f 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -37,17 +37,17 @@
 
 #include "../../../../config.h"
 
-class QtDocumentationCatalogItem: public DocumentationCatalogItem
+class TQtDocumentationCatalogItem: public DocumentationCatalogItem
 {
 public:
-    QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin,
-        KListView *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile)
+    TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin,
+        KListView *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile)
     {
     }
-    QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin,
-        DocumentationItem *parent, const TQString &name)
-        :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile)
+    TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin,
+        DocumentationItem *tqparent, const TQString &name)
+        :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile)
     {
     }
     TQString dcfFile() const { return m_dcfFile; }
@@ -57,23 +57,23 @@ private:
 };
 
 static const KDevPluginInfo data("docqtplugin");
-typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
+typedef KDevGenericFactory<DocTQtPlugin> DocTQtPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocTQtPluginFactory(data) )
 
-DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
-    :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name)
+DocTQtPlugin::DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList)
+    :DocumentationPlugin(DocTQtPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(Index | FullTextSearch | CustomDocumentationTitles);
     autoSetup();
 }
 
-DocQtPlugin::~DocQtPlugin()
+DocTQtPlugin::~DocTQtPlugin()
 {
 }
 
-void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
+void DocTQtPlugin::createTOC(DocumentationCatalogItem *item)
 {
-    QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item);
+    TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
         return;
 
@@ -135,32 +135,32 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
     }
 }
 
-void DocQtPlugin::autoSetupPlugin()
+void DocTQtPlugin::autoSetupPlugin()
 {
     TQString qtDocDir(QT_DOCDIR);
     qtDocDir = URLUtil::envExpand(qtDocDir);
     if (qtDocDir.isEmpty())
     {
-        qtDocDir = getenv("QTDIR");
+        qtDocDir = getenv("TQTDIR");
     }
     if (!qtDocDir.isEmpty())
     {
         config->setGroup("Search Settings");
-        config->writeEntry("Qt Reference Documentation", true);
+        config->writeEntry("TQt Reference Documentation", true);
         config->setGroup("Index Settings");
-        config->writeEntry("Qt Reference Documentation", true);
+        config->writeEntry("TQt Reference Documentation", true);
         config->setGroup("Locations");
-        config->writePathEntry("Qt Reference Documentation", qtDocDir + TQString("/qt.dcf"));
-        config->writePathEntry("Qt Assistant Manual", qtDocDir + TQString("/assistant.dcf"));
-        config->writePathEntry("Qt Designer Manual", qtDocDir + TQString("/designer.dcf"));
-        config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + TQString("/linguist.dcf"));
+        config->writePathEntry("TQt Reference Documentation", qtDocDir + TQString("/qt.dcf"));
+        config->writePathEntry("TQt Assistant Manual", qtDocDir + TQString("/assistant.dcf"));
+        config->writePathEntry("TQt Designer Manual", qtDocDir + TQString("/designer.dcf"));
+        config->writePathEntry("Guide to the TQt Translation Tools", qtDocDir + TQString("/linguist.dcf"));
         config->writePathEntry("qmake User Guide", qtDocDir + TQString("/qmake.dcf"));
     }
 }
 
-void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
+void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
 {
-    QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item);
+    TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
         return;
 
@@ -185,19 +185,19 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
 
     if (item->url().isEmpty())
     {
-        KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString::null));
+        KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString()));
         item->setURL(url);
     }
 }
 
-TQString DocQtPlugin::pluginName() const
+TQString DocTQtPlugin::pluginName() const
 {
-    return i18n("Qt Documentation Collection");
+    return i18n("TQt Documentation Collection");
 }
 
-bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
+bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
 {
-    QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item);
+    TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
         return false;
 
@@ -213,9 +213,9 @@ bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
         return false;
 }
 
-void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
+void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
-    QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item);
+    TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
         return;
 
@@ -249,10 +249,10 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
     }
 }
 
-void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
+void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
                                      TQDomElement section)
 {
-    //adymo: do not load section to index for Qt reference documentation
+    //adymo: do not load section to index for TQt reference documentation
     TQString title = section.attribute("title");
     if (fi.fileName() != "qt.dcf")
     {
@@ -285,7 +285,7 @@ void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, Documentat
     }
 }
 
-TQStringList DocQtPlugin::fullTextSearchLocations()
+TQStringList DocTQtPlugin::fullTextSearchLocations()
 {
     TQStringList locs;
 
@@ -306,34 +306,34 @@ TQStringList DocQtPlugin::fullTextSearchLocations()
     return locs;
 }
 
-QPair<KFile::Mode, TQString> DocQtPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocTQtPlugin::catalogLocatorProps()
 {
-    return QPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf");
+    return TQPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf");
 }
 
-TQString DocQtPlugin::catalogTitle(const TQString &url)
+TQString DocTQtPlugin::catalogTitle(const TQString &url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
-        return TQString::null;
+        return TQString();
 
     TQFile f(url);
     if (!f.open(IO_ReadOnly))
-        return TQString::null;
+        return TQString();
 
     TQDomDocument doc;
     if (!doc.setContent(&f) || (doc.doctype().name() != "DCF"))
-        return TQString::null;
+        return TQString();
     f.close();
 
     TQDomElement docEl = doc.documentElement();
 
-    return docEl.attribute("title", TQString::null);
+    return docEl.attribute("title", TQString());
 }
 
-DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
+DocumentationCatalogItem *DocTQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
 {
-    return new QtDocumentationCatalogItem(url, this, contents, title);
+    return new TQtDocumentationCatalogItem(url, this, contents, title);
 }
 
 #include "docqtplugin.moc"
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index e09ce7a5..1bc1e865 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -17,20 +17,21 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef DOCQTPLUGIN_H
-#define DOCQTPLUGIN_H
+#ifndef DOCTQTPLUGIN_H
+#define DOCTQTPLUGIN_H
 
 #include <kdevdocumentationplugin.h>
 #include <tqdom.h>
 
 class KConfig;
 
-class DocQtPlugin : public DocumentationPlugin
+class DocTQtPlugin : public DocumentationPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
-    ~DocQtPlugin();
+    DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
+    ~DocTQtPlugin();
 
     virtual TQString pluginName() const;
 
@@ -46,7 +47,7 @@ public:
 
     virtual TQStringList fullTextSearchLocations();
 
-    virtual QPair<KFile::Mode, TQString> catalogLocatorProps();
+    virtual TQPair<KFile::Mode, TQString> catalogLocatorProps();
     virtual TQString catalogTitle(const TQString &url);
 
     virtual void autoSetupPlugin();
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 1d7543c3..dbcbb07f 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -76,7 +76,7 @@ ChmProtocol::~ChmProtocol()
 void ChmProtocol::get( const KURL& url )
 {
     /** When :catalog is appended to the end, a plain-text representation of the catalog
-      * is given out where each entry consists of four lines, an integer representing the parent
+      * is given out where each entry consists of four lines, an integer representing the tqparent
       * of the node, an integer representing a node's ID, the Title of the Node, and it's hyperlink.
       * When :contents is appended, all contained htm- and html-files will be printed, each in a line.
       */
@@ -105,7 +105,7 @@ void ChmProtocol::get( const KURL& url )
     }
     
 
-    if (m_dirMap.find(path) == m_dirMap.end()) {
+    if (m_dirMap.tqfind(path) == m_dirMap.end()) {
         error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
         return;
     }
@@ -178,25 +178,25 @@ void ChmProtocol::get( const KURL& url )
         TQRegExp mergeParam("<param name=\"Merge\" value=\"(.*)\">", false);
         mergeParam.setMinimal(true);
 
-        std::stack<int> parents;
+        std::stack<int> tqparents;
         int counter = 1;
         int current = 0;
         int old = 0, pos = 0;
-        parents.push(0);
-        while ((pos = s.find(object, pos)) != -1) {
+        tqparents.push(0);
+        while ((pos = s.tqfind(object, pos)) != -1) {
             if(htmlOutput) output += s.mid(old, pos - old);
             if(catalog) {
                 TQRegExp ex("<UL>|</UL>", false);    ex.setMinimal(true);
                 TQString ms = s.mid(old, pos - old);
                 int pos = 0;
-                while( (pos = ms.find(ex, pos)) != -1) {
+                while( (pos = ms.tqfind(ex, pos)) != -1) {
                     if(ms.mid(pos, 4) == "<UL>") {
-                        parents.push(current);
+                        tqparents.push(current);
                     } else{
-                        if(parents.empty()){
+                        if(tqparents.empty()){
                         }else{
-                            current = parents.top();
-                            parents.pop();
+                            current = tqparents.top();
+                            tqparents.pop();
                         }
                     }
                     pos++;
@@ -206,9 +206,9 @@ void ChmProtocol::get( const KURL& url )
             old = pos;
             TQString obj = object.cap(1);
             TQString name, local;
-            if (obj.find(nameParam) != -1) {
+            if (obj.tqfind(nameParam) != -1) {
                 name = nameParam.cap(1);
-                if (obj.find(localParam) != -1) {
+                if (obj.tqfind(localParam) != -1) {
                     local = localParam.cap(1);
                     //output += "<a href=\"" + local + "\">" + name + "</a>";
                     //added by lucida lucida@users.sf.net
@@ -221,7 +221,7 @@ void ChmProtocol::get( const KURL& url )
                             KURL u = url;
                             u.setPath(bigpath + local);
                             TQString str;
-                            output += str.sprintf("%i\n%i\n", parents.top(), current);
+                            output += str.sprintf("%i\n%i\n", tqparents.top(), current);
                             output += name + "\n" + u.prettyURL() + "\n";
                         }
                         m_bIndex = 1;
@@ -233,10 +233,10 @@ void ChmProtocol::get( const KURL& url )
                     if(htmlOutput) output += name;
                 }
             }
-            if (obj.find(mergeParam) != -1 && htmlOutput) {
+            if (obj.tqfind(mergeParam) != -1 && htmlOutput) {
                 TQString link = mergeParam.cap(1);
-                TQString href = link.left(link.find("::"));
-                TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1);
+                TQString href = link.left(link.tqfind("::"));
+                TQString path = m_chmFile.left(m_chmFile.tqfindRev("/") + 1);
                 //output += " (<a href=\"" + path + href + "\">link</a>)";
                 m_bIndex = 1;
                 output += " (<a target=\"browse\" href=\"" + url.url() + path + href + "\">link</a>)";
@@ -301,7 +301,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path )
 {
     //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl;
 
-    fullPath = fullPath.replace(TQRegExp("::"), "");
+    fullPath = fullPath.tqreplace(TQRegExp("::"), "");
 
 	// Are we already looking at that file ?
     if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) )
@@ -324,7 +324,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path )
         fullPath += '/';
 
     //kdDebug() << "the full path is " << fullPath << endl;
-    while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
+    while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 )
     {
         TQString tryPath = fullPath.left( pos );
         //kdDebug() << fullPath << "  trying " << tryPath << endl;
@@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path )
             }
             else
             {
-                path = TQString::fromLatin1("/");
+                path = TQString::tqfromLatin1("/");
             }
             kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl;
             break;
diff --git a/parts/documentation/protocols/chm/chmfile.cpp b/parts/documentation/protocols/chm/chmfile.cpp
index 43ae8877..2d705b8e 100644
--- a/parts/documentation/protocols/chm/chmfile.cpp
+++ b/parts/documentation/protocols/chm/chmfile.cpp
@@ -66,7 +66,7 @@ bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) con
     char tag[4];
     if (f.readBlock(tag, 4) != 4) return false;
 
-    if (!qstrncmp(tag, "PMGL", 4))
+    if (!tqstrncmp(tag, "PMGL", 4))
     {
         uint quickref_length = getIntel32(f);
         f.at(f.at() + 12);
@@ -87,7 +87,7 @@ bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) con
 
         return (f.at(f.at() + quickref_length));
     }
-    else if (!qstrncmp(tag, "PMGI", 4))
+    else if (!tqstrncmp(tag, "PMGI", 4))
     {
         // evaluation of the index chunk is not yet implemented => skip it
         return f.at(f.at() + chunkSize - 4);
@@ -105,7 +105,7 @@ bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& c
 
     // read CHM file header
     char tag[4];
-    if (f.readBlock(tag, 4) != 4 || qstrncmp(tag, "ITSF", 4)) return false;
+    if (f.readBlock(tag, 4) != 4 || tqstrncmp(tag, "ITSF", 4)) return false;
 	uint chm_version = getIntel32(f);
     if (!f.at(f.at() + 0x30)) return false;
 
@@ -120,7 +120,7 @@ bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& c
 
     // read directory header
     if (!f.at(section_1_offset)) return false;
-    if (f.readBlock(tag, 4) != 4 || qstrncmp(tag, "ITSP", 4)) return false;
+    if (f.readBlock(tag, 4) != 4 || tqstrncmp(tag, "ITSP", 4)) return false;
     if (!f.at(f.at() + 12)) return false;
     uint directory_chunk_size = getIntel32(f);
     if (!f.at(f.at() + 24)) return false;
diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp
index b8f45ae2..212eb244 100644
--- a/parts/documentation/protocols/chm/decompress.cpp
+++ b/parts/documentation/protocols/chm/decompress.cpp
@@ -121,7 +121,7 @@ struct
  * The LZX document does not state the uncompressed block has an
  * uncompressed length field. Where does this length field come from, so
  * we can know how large the block is? The implementation has it as the 24
- * bits following after the 3 blocktype bits, before the alignment
+ * bits following after the 3 blocktype bits, before the tqalignment
  * padding.
  *
  * The LZX document states that aligned offset blocks have their aligned
@@ -228,7 +228,7 @@ int LZXinit(int window) {
  * REMOVE_BITS(n)    removes N bits from the bit buffer
  *
  * These bit access routines work by using the area beyond the MSB and the
- * LSB as a free source of zeroes. This avoids having to mask any bits.
+ * LSB as a free source of zeroes. This avoids having to tqmask any bits.
  * So we have to know the bit width of the bitbuffer variable. This is
  * sizeof(ULONG) * 8, also defined as ULONG_BITS
  */
@@ -328,9 +328,9 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) {
 	register UBYTE bit_num = 1;
 	ULONG fill;
 	ULONG pos         = 0; /* the current position in the decode table */
-	ULONG table_mask  = 1 << nbits;
-	ULONG bit_mask    = table_mask >> 1; /* don't do 0 length codes */
-	ULONG next_symbol = bit_mask; /* base of allocation for long codes */
+	ULONG table_tqmask  = 1 << nbits;
+	ULONG bit_tqmask    = table_tqmask >> 1; /* don't do 0 length codes */
+	ULONG next_symbol = bit_tqmask; /* base of allocation for long codes */
 
 	/* fill entries for codes short enough for a direct mapping */
 	while (bit_num <= nbits)
@@ -341,27 +341,27 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) {
 			{
 				leaf = pos;
 
-				if ((pos += bit_mask) > table_mask)	return 1; /* table overrun */
+				if ((pos += bit_tqmask) > table_tqmask)	return 1; /* table overrun */
 
 				/* fill all possible lookups of this symbol with the symbol itself */
-				fill = bit_mask;
+				fill = bit_tqmask;
 				while (fill-- > 0) table[leaf++] = sym;
 			}
 		}
-		bit_mask >>= 1;
+		bit_tqmask >>= 1;
 		bit_num++;
 	}
 
 	/* if there are any codes longer than nbits */
-	if (pos != table_mask)
+	if (pos != table_tqmask)
 	{
 		/* clear the remainder of the table */
-		for (sym = pos; sym < table_mask; sym++) table[sym] = 0;
+		for (sym = pos; sym < table_tqmask; sym++) table[sym] = 0;
 
 		/* give ourselves room for codes to grow by up to 16 more bits */
 		pos <<= 16;
-		table_mask <<= 16;
-		bit_mask = 1 << 15;
+		table_tqmask <<= 16;
+		bit_tqmask = 1 << 15;
 
 		while (bit_num <= 16)
 		{
@@ -385,16 +385,16 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) {
 					}
 					table[leaf] = sym;
 
-					if ((pos += bit_mask) > table_mask)	return 1; /* table overflow */
+					if ((pos += bit_tqmask) > table_tqmask)	return 1; /* table overflow */
 				}
 			}
-			bit_mask >>= 1;
+			bit_tqmask >>= 1;
 			bit_num++;
 		}
 	}
 
 	/* full table? */
-	if (pos == table_mask) return 0;
+	if (pos == table_tqmask) return 0;
 
 	/* either erroneous table, or all elements are 0 - let's find out. */
 	for (sym = 0; sym < nsyms; sym++) if (length[sym]) return 1;
@@ -555,7 +555,7 @@ int LZXdecompress(UBYTE* inpos, int inlen, UBYTE* outpos, int outlen) {
 			togo -= this_run;
 			LZX(block_remaining) -= this_run;
 
-			/* apply 2^x-1 mask */
+			/* apply 2^x-1 tqmask */
 			window_posn &= window_size - 1;
 			/* runs can't straddle the window wraparound */
 			if ((window_posn + this_run) > window_size)
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index b1d9d166..7b91c7fc 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -35,8 +35,8 @@ extern "C"
 KInstance* KChmPartFactory::s_instance = 0L;
 KAboutData* KChmPartFactory::s_about = 0L;
 
-KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name )
-   : KParts::Factory( parent, name )
+KChmPartFactory::KChmPartFactory( TQObject* tqparent, const char* name )
+   : KParts::Factory( tqparent, name )
 {
 }
 
@@ -47,10 +47,10 @@ KChmPartFactory::~KChmPartFactory()
    delete s_about;
 }
 
-KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
+KParts::Part* KChmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *,
                                  const char *name, const char *, const TQStringList & )
 {
-   KChmPart* part = new KChmPart( parentWidget, name );
+   KChmPart* part = new KChmPart( tqparentWidget, name );
    return part;
 }
 
@@ -66,7 +66,7 @@ KInstance* KChmPartFactory::instance()
 }
 
 
-KChmPart::KChmPart( TQWidget * parent, const char * name )
+KChmPart::KChmPart( TQWidget * tqparent, const char * name )
 	: KDevHTMLPart(  ), m_job(0)
 {
    KInstance * instance = new KInstance( "kchmpart" );
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 023f8ed9..37bb4695 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -33,13 +33,14 @@ class KAboutData;
 class KChmPartFactory: public KParts::Factory
 {
    Q_OBJECT
+  TQ_OBJECT
    public:
-      KChmPartFactory( TQObject *parent = 0, const char *name = 0 );
+      KChmPartFactory( TQObject *tqparent = 0, const char *name = 0 );
       virtual ~KChmPartFactory();
 
       virtual KParts::Part* createPartObject(
-		  TQWidget *parentWidget, const char *widgetName,
-          TQObject *parent, const char *name,
+		  TQWidget *tqparentWidget, const char *widgetName,
+          TQObject *tqparent, const char *name,
 		  const char *classname, const TQStringList &args );
 
       static KInstance *instance();
@@ -54,6 +55,7 @@ class KChmPartFactory: public KParts::Factory
 class KChmPart : public KDevHTMLPart
 {
    Q_OBJECT
+  TQ_OBJECT
    public:
       KChmPart( TQWidget *, const char * = 0 );
       KParts::BrowserExtension * extension() { return m_extension; }
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index c7b2305a..a2d688ec 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -49,8 +49,8 @@
 #include "documentation_part.h"
 #include "docutils.h"
 
-SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *name)
-    :TQWidget(parent, name), m_part(part)
+SearchView::SearchView(DocumentationPart *part, TQWidget *tqparent, const char *name)
+    :TQWidget(tqparent, name), m_part(part)
 {
     TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -182,11 +182,11 @@ void SearchView::search()
         d.mkdir(savedir);
 
     TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5")
-        .arg(m_edit->text())
-        .arg(m_searchMethodBox->currentItem()==1? "or" : "and")
-        .arg(50)
-        .arg("builtin-short")
-        .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score");
+        .tqarg(m_edit->text())
+        .tqarg(m_searchMethodBox->currentItem()==1? "or" : "and")
+        .tqarg(50)
+        .tqarg("builtin-short")
+        .tqarg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score");
 
     kdDebug(9002) << "starting kprocess" << endl;
     kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query <<  endl;
@@ -211,7 +211,7 @@ void SearchView::search()
     }
 
     // While receiving data from the subprocess, we want
-    // to block the user interface, but still get repaint
+    // to block the user interface, but still get tqrepaint
     // events. Hack taken from NetAccess...
     kapp->setOverrideCursor(waitCursor);
     TQWidget blocker(0, 0, WType_Dialog | WShowModal);
@@ -230,8 +230,8 @@ void SearchView::search()
     delete proc;
 
     // modify the search result
-    searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/");
-    searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), "");
+    searchResult = searchResult.tqreplace(TQRegExp("http://localhost/"), "file:/");
+    searchResult = searchResult.tqreplace(TQRegExp("Content-type: text/html"), "");
 
     // dump the search result
     TQFile f(savedir + "/results.html");
@@ -268,7 +268,7 @@ void SearchView::analyseSearchResults()
 
         TQRegExp starsExp("alt=\"\\*\"");
         starsExp.setMinimal(true);
-        int stars = line.contains(starsExp);
+        int stars = line.tqcontains(starsExp);
 
         TQRegExp urlExp("<strong><a href=\"(.*)\">(.*)</a></strong>");
         if (urlExp.search(line)==-1)
diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h
index 98f11834..e1d9d106 100644
--- a/parts/documentation/searchview.h
+++ b/parts/documentation/searchview.h
@@ -30,11 +30,12 @@ class KPushButton;
 class KProcess;
 class TQListViewItem;
 
-class SearchView: public QWidget
+class SearchView: public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0);
+    SearchView(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0);
     ~SearchView();
     
 public slots:
diff --git a/parts/documentation/selecttopic.cpp b/parts/documentation/selecttopic.cpp
index 4dab4d83..ef35a2a1 100644
--- a/parts/documentation/selecttopic.cpp
+++ b/parts/documentation/selecttopic.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "selecttopic.h"
 
-SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *parent, const char *name)
-    :SelectTopicBase(parent, name), m_urls(urls)
+SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *tqparent, const char *name)
+    :SelectTopicBase(tqparent, name), m_urls(urls)
 {
     for (IndexItem::List::const_iterator it = m_urls.begin(); it != m_urls.end(); ++it)
         topicBox->insertItem((*it).first);
diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h
index fdddbf4c..e90f893c 100644
--- a/parts/documentation/selecttopic.h
+++ b/parts/documentation/selecttopic.h
@@ -26,8 +26,9 @@
 
 class SelectTopic: public SelectTopicBase{
 Q_OBJECT
+  TQ_OBJECT
 public:
-    SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0);
+    SelectTopic(IndexItem::List &urls, TQWidget *tqparent = 0, const char *name = 0);
     KURL selectedURL();
 
 public slots:
diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui
index b363be2a..1d04e0a2 100644
--- a/parts/documentation/selecttopicbase.ui
+++ b/parts/documentation/selecttopicbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SelectTopicBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SelectTopicBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,14 +46,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -86,7 +86,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>topicLabel</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <cstring>listBox1</cstring>
             </property>
         </widget>
-        <widget class="QListBox" row="1" column="0">
+        <widget class="TQListBox" row="1" column="0">
             <property name="name">
                 <cstring>topicBox</cstring>
             </property>
@@ -135,8 +135,8 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>newSlot()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 63e21888..d0146d0e 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -39,9 +39,9 @@
 
 #define INDEXER
 
-ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
+ProgressDialog::ProgressDialog(bool index, TQWidget *tqparent, const char *name)
     :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close,
-    parent, name, false)
+    tqparent, name, false)
 {
     proc = 0;
 
@@ -122,7 +122,7 @@ void ProgressDialog::done(int r)
 
 void ProgressDialog::setFilesScanned(int n)
 {
-    filesLabel->setText(i18n("Files processed: %1").arg(n));
+    filesLabel->setText(i18n("Files processed: %1").tqarg(n));
 }
 
 void ProgressDialog::setFilesToDig(int n)
@@ -162,7 +162,7 @@ void ProgressDialog::addDir(const TQString &dir)
         setFilesScanned(++filesScanned);
     }
 
-    TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
+    TQDir d2(dir, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs);
     TQStringList dlist = d2.entryList();
 
     for ( it=dlist.begin(); it != dlist.end(); ++it )
@@ -214,7 +214,7 @@ bool ProgressDialog::createConfig()
     if (language == "C")
         language = "en";
 
-    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
+    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language));
     if (wrapper.isEmpty())
         wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
     if (wrapper.isEmpty())
@@ -323,12 +323,12 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
     TQString line = TQString(buffer).left(len);
 
     int cnt=0, index=-1;
-    while ( (index = line.find("http://", index+1)) > 0)
+    while ( (index = line.tqfind("http://", index+1)) > 0)
         cnt++;
     filesDigged += cnt;
 
     cnt=0, index=-1;
-    while ( (index = line.find("not changed", index+1)) > 0)
+    while ( (index = line.tqfind("not changed", index+1)) > 0)
         cnt++;
     filesDigged -= cnt;
 
diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h
index 3383b2df..06746ad5 100644
--- a/parts/documentation/tools/htdig/htdigindex.h
+++ b/parts/documentation/tools/htdig/htdigindex.h
@@ -25,8 +25,9 @@ class KProgress;
 class ProgressDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProgressDialog(bool index, TQWidget *parent=0, const char *name=0);
+    ProgressDialog(bool index, TQWidget *tqparent=0, const char *name=0);
     ~ProgressDialog();
 
     void addDir(const TQString &dir);
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index de582013..658f5ae5 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -708,7 +708,7 @@ void ConfigBool::convertStrToVal()
 
 TQCString &Config::getString(const char *fileName,int num,const char *name) const
 {
-  ConfigOption *opt = m_dict->find(name);
+  ConfigOption *opt = m_dict->tqfind(name);
   if (opt==0) 
   {
     config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
@@ -724,7 +724,7 @@ TQCString &Config::getString(const char *fileName,int num,const char *name) cons
 
 TQStrList &Config::getList(const char *fileName,int num,const char *name) const
 {
-  ConfigOption *opt = m_dict->find(name);
+  ConfigOption *opt = m_dict->tqfind(name);
   if (opt==0) 
   {
     config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
@@ -740,7 +740,7 @@ TQStrList &Config::getList(const char *fileName,int num,const char *name) const
 
 TQCString &Config::getEnum(const char *fileName,int num,const char *name) const
 {
-  ConfigOption *opt = m_dict->find(name);
+  ConfigOption *opt = m_dict->tqfind(name);
   if (opt==0) 
   {
     config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
@@ -756,7 +756,7 @@ TQCString &Config::getEnum(const char *fileName,int num,const char *name) const
 
 int &Config::getInt(const char *fileName,int num,const char *name) const
 {
-  ConfigOption *opt = m_dict->find(name);
+  ConfigOption *opt = m_dict->tqfind(name);
   if (opt==0) 
   {
     config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
@@ -772,7 +772,7 @@ int &Config::getInt(const char *fileName,int num,const char *name) const
 
 bool &Config::getBool(const char *fileName,int num,const char *name) const
 {
-  ConfigOption *opt = m_dict->find(name);
+  ConfigOption *opt = m_dict->tqfind(name);
   if (opt==0) 
   {
     config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
@@ -2493,7 +2493,7 @@ static void substEnvVarsInStrList(TQStrList &sl)
   {
     TQCString result(s);
     // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE.
-    bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1);
+    bool wasQuoted = (result.tqfind(' ')!=-1) || (result.tqfind('\t')!=-1);
     // here we strip the quote again
     substEnvVarsInString(result);
 
@@ -2654,15 +2654,15 @@ void Config::check()
   }
   else
   {
-    if (warnFormat.find("$file")==-1)
+    if (warnFormat.tqfind("$file")==-1)
     {
       config_err("Warning: warning format does not contain a $file tag!\n");
     }
-    if (warnFormat.find("$line")==-1)
+    if (warnFormat.tqfind("$line")==-1)
     {
       config_err("Warning: warning format does not contain a $line tag!\n");
     }
-    if (warnFormat.find("$text")==-1)
+    if (warnFormat.tqfind("$text")==-1)
     {
       config_err("Warning: warning format foes not contain a $text tag!\n");
     }
@@ -2774,7 +2774,7 @@ void Config::check()
     TQRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument
     TQCString alias=s;
     alias=alias.stripWhiteSpace();
-    if (alias.find(re1)!=0 && alias.find(re2)!=0)
+    if (alias.tqfind(re1)!=0 && alias.tqfind(re2)!=0)
     {
       config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n",
 	  alias.data());
@@ -2963,25 +2963,25 @@ void Config::check()
 #define PUTENV putenv
 #define SEP ":"
 #endif
-  // check QHP creation requirements
-  if (Config_getBool("GENERATE_QHP"))
+  // check TQHP creation requirements
+  if (Config_getBool("GENERATE_TQHP"))
   {
     bool quit = false;
     if (!Config_getBool("GENERATE_HTML"))
     {
-      config_err("Warning: GENERATE_QHP=YES requires GENERATE_HTML=YES.\n");
+      config_err("Warning: GENERATE_TQHP=YES requires GENERATE_HTML=YES.\n");
       quit = true;
     }
 
-    if (Config_getString("QHP_NAMESPACE").isEmpty())
+    if (Config_getString("TQHP_NAMESPACE").isEmpty())
     {
-      config_err("Warning: GENERATE_QHP=YES requires QHP_NAMESPACE to be set.\n");
+      config_err("Warning: GENERATE_TQHP=YES requires TQHP_NAMESPACE to be set.\n");
       quit = true;
     }
 
-    if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty())
+    if (Config_getString("TQHP_VIRTUAL_FOLDER").isEmpty())
     {
-      config_err("Warning: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set.\n");
+      config_err("Warning: GENERATE_TQHP=YES requires TQHP_VIRTUAL_FOLDER to be set.\n");
       quit = true;
     }
 
@@ -2991,16 +2991,16 @@ void Config::check()
     }
   }
 
-  // check QCH creation requirements
-  if (!Config_getString("QHG_LOCATION").isEmpty() &&
-      !Config_getBool("GENERATE_QHP"))
+  // check TQCH creation requirements
+  if (!Config_getString("TQHG_LOCATION").isEmpty() &&
+      !Config_getBool("GENERATE_TQHP"))
   {
-    config_err("Warning: Specifying QHG_LOCATION requires GENERATE_QHP=YES.\n");
+    config_err("Warning: Specifying TQHG_LOCATION requires GENERATE_TQHP=YES.\n");
   }
-  if (!Config_getString("QCH_FILE").isEmpty() &&
-      Config_getString("QHG_LOCATION").isEmpty())
+  if (!Config_getString("TQCH_FILE").isEmpty() &&
+      Config_getString("TQHG_LOCATION").isEmpty())
   {
-    config_err("Warning: Specifying QCH_FILE requires QHG_LOCATION to be set.\n");
+    config_err("Warning: Specifying TQCH_FILE requires TQHG_LOCATION to be set.\n");
   }
 
   if (Config_getBool("HAVE_DOT")) 
@@ -3042,7 +3042,7 @@ void Config::check()
     annotationFromBrief.append("is");
     annotationFromBrief.append("provides");
     annotationFromBrief.append("specifies");
-    annotationFromBrief.append("contains");
+    annotationFromBrief.append("tqcontains");
     annotationFromBrief.append("represents");
     annotationFromBrief.append("a");
     annotationFromBrief.append("an");
@@ -3306,7 +3306,7 @@ void Config::create()
 		    "used as the annotated text. Otherwise, the brief description is used as-is. \n"
 		    "If left blank, the following values are used (\"$name\" is automatically \n"
 		    "replaced with the name of the entity): \"The $name class\" \"The $name widget\" \n"
-		    "\"The $name file\" \"is\" \"provides\" \"specifies\" \"contains\" \n"
+		    "\"The $name file\" \"is\" \"provides\" \"specifies\" \"tqcontains\" \n"
 		    "\"represents\" \"a\" \"an\" \"the\"\n"
                  );
   cb = addBool(
@@ -3362,16 +3362,16 @@ void Config::create()
                     "If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen \n"
                     "will interpret the first line (until the first dot) of a JavaDoc-style \n"
                     "comment as the brief description. If set to NO, the JavaDoc \n"
-                    "comments will behave just like regular Qt-style comments \n"
+                    "comments will behave just like regular TQt-style comments \n"
                     "(thus requiring an explicit @brief command for a brief description.) \n",
                     FALSE
                  );
   cb = addBool(
-                    "QT_AUTOBRIEF",
-                    "If the QT_AUTOBRIEF tag is set to YES then Doxygen will \n"
-                    "interpret the first line (until the first dot) of a Qt-style \n"
+                    "TQT_AUTOBRIEF",
+                    "If the TQT_AUTOBRIEF tag is set to YES then Doxygen will \n"
+                    "interpret the first line (until the first dot) of a TQt-style \n"
                     "comment as the brief description. If set to NO, the comments \n"
-                    "will behave just like regular Qt-style comments (thus requiring \n"
+                    "will behave just like regular TQt-style comments (thus requiring \n"
                     "an explicit \\brief command for a brief description.) \n",
                     FALSE
                  );
@@ -3773,12 +3773,12 @@ void Config::create()
               );
   cs->setWidgetType(ConfigString::File);
   cs = addString(  "LAYOUT_FILE",
-                   "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
-		   "doxygen. The layout file controls the global structure of the generated output files \n"
-		   "in an output format independent way. The create the layout file that represents \n"
+                   "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n"
+		   "doxygen. The tqlayout file controls the global structure of the generated output files \n"
+		   "in an output format independent way. The create the tqlayout file that represents \n"
 		   "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
 		   "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
-		   "of the layout file.\n"
+		   "of the tqlayout file.\n"
 	      );
   cs->setWidgetType(ConfigString::File);
   addObsolete("DETAILS_AT_TOP");
@@ -3789,8 +3789,8 @@ void Config::create()
   //-----------------------------------------------------------------------------------------------
 
   cb = addBool(
-                    "QUIET",
-                    "The QUIET tag can be used to turn on/off the messages that are generated \n"
+                    "TQUIET",
+                    "The TQUIET tag can be used to turn on/off the messages that are generated \n"
                     "by doxygen. Possible values are YES and NO. If left blank NO is used. \n",
                     FALSE
                  );
@@ -4132,7 +4132,7 @@ void Config::create()
 		    "To create a documentation set, doxygen will generate a Makefile in the \n"
 		    "HTML output directory. Running make will produce the docset in that \n"
 		    "directory and running \"make install\" will install the docset in \n"
-		    "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find \n"
+		    "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will tqfind \n"
 		    "it at startup. \n"
 		    "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html "
 		    "for more information. \n",
@@ -4191,8 +4191,8 @@ void Config::create()
   cs->addDependency("GENERATE_HTML");
 #if 0
   cs = addString(
-                    "QTHELP_FILE",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the QTHELP_FILE tag can \n"
+                    "TQTHELP_FILE",
+                    "If the GENERATE_HTMLHELP tag is set to YES, the TQTHELP_FILE tag can \n"
                     "be used to specify the file name of the resulting .(qch|qhp) file. \n"
                     "You can add a path in front of the file if the result should not be \n"
                     "written to the html output directory. \n"
@@ -4200,15 +4200,15 @@ void Config::create()
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   cs = addString(
-                    "QTHELP_CONFIG",
-                    "If DOXYGEN2QTHELP_LOC is set, QTHELP_CONFIG must specify the file name \n"
+                    "TQTHELP_CONFIG",
+                    "If DOXYGEN2TQTHELP_LOC is set, TQTHELP_CONFIG must specify the file name \n"
                     "of a config file to pass to doxygen2qthelp. \n"
                    );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   cs = addString(
-                    "DOXYGEN2QTHELP_LOC",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the DOXYGEN2QTHELP_LOC tag \n"
+                    "DOXYGEN2TQTHELP_LOC",
+                    "If the GENERATE_HTMLHELP tag is set to YES, the DOXYGEN2TQTHELP_LOC tag \n"
                     "can be used to specify the location (absolute path including file name) of \n"
                     "the doxygen2qthelp tool. If non-empty doxygen will try to run doxygen2qthelp \n"
                     "on the generated index.hhp.\n"
@@ -4216,9 +4216,9 @@ void Config::create()
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
 #endif
-  addObsolete("QTHELP_FILE");
-  addObsolete("QTHELP_CONFIG");
-  addObsolete("DOXYGEN2QTHELP_LOC");
+  addObsolete("TQTHELP_FILE");
+  addObsolete("TQTHELP_CONFIG");
+  addObsolete("DOXYGEN2TQTHELP_LOC");
   cb = addBool(
                     "GENERATE_CHI",
                     "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n"
@@ -4255,71 +4255,71 @@ void Config::create()
   /////////////////////////////////////////////////////////
 
   cb = addBool(
-                    "GENERATE_QHP",
-                    "If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER \n"
+                    "GENERATE_TQHP",
+                    "If the GENERATE_TQHP tag is set to YES and both TQHP_NAMESPACE and TQHP_VIRTUAL_FOLDER \n"
                     "are set, an additional index file will be generated that can be used as input for \n"
-                    "Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated \n"
+                    "TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated \n"
                     "HTML documentation. \n",
                     FALSE
                  );
   cb->addDependency("GENERATE_HTML");
   cs = addString(
-                    "QCH_FILE",
-                    "If the QHG_LOCATION tag is specified, the QCH_FILE tag can \n"
+                    "TQCH_FILE",
+                    "If the TQHG_LOCATION tag is specified, the TQCH_FILE tag can \n"
                     "be used to specify the file name of the resulting .qch file. \n"
                     "The path specified is relative to the HTML output folder. \n"
                    );
   cs->setWidgetType(ConfigString::File);
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
   cs = addString(
-                    "QHP_NAMESPACE",
-                    "The QHP_NAMESPACE tag specifies the namespace to use when generating \n"
-                    "Qt Help Project output. For more information please see \n"
+                    "TQHP_NAMESPACE",
+                    "The TQHP_NAMESPACE tag specifies the namespace to use when generating \n"
+                    "TQt Help Project output. For more information please see \n"
                     "http://doc.trolltech.com/qthelpproject.html#namespace \n"
                    );
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
   cs = addString(
-                    "QHP_VIRTUAL_FOLDER",
-                    "The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n"
-                    "Qt Help Project output. For more information please see \n"
+                    "TQHP_VIRTUAL_FOLDER",
+                    "The TQHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n"
+                    "TQt Help Project output. For more information please see \n"
                     "http://doc.trolltech.com/qthelpproject.html#virtual-folders \n"
                    );
   cs->setDefaultValue("doc");
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
 
   cs = addString(
-                    "QHP_CUSTOM_FILTER_NAME",
-                    "If QHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. \n"
+                    "TQHP_CUSTOM_FILTER_NAME",
+                    "If TQHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. \n"
                     "For more information please see \n"
                     "http://doc.trolltech.com/qthelpproject.html#custom-filters \n"
                    );
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
 
   cs = addString(
-                    "QHP_CUST_FILTER_ATTRS",
-                    "The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add."
+                    "TQHP_CUST_FILTER_ATTRS",
+                    "The TQHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add."
                     "For more information please see \n"
-                    "<a href=\"http://doc.trolltech.com/qthelpproject.html#custom-filters\">Qt Help Project / Custom Filters</a>. \n"
+                    "<a href=\"http://doc.trolltech.com/qthelpproject.html#custom-filters\">TQt Help Project / Custom Filters</a>. \n"
                    );
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
 
   cs = addString(
-                    "QHP_SECT_FILTER_ATTRS",
-                    "The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n"
+                    "TQHP_SECT_FILTER_ATTRS",
+                    "The TQHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n"
                     "filter section matches. \n"
-                    "<a href=\"http://doc.trolltech.com/qthelpproject.html#filter-attributes\">Qt Help Project / Filter Attributes</a>. \n"
+                    "<a href=\"http://doc.trolltech.com/qthelpproject.html#filter-attributes\">TQt Help Project / Filter Attributes</a>. \n"
                    );
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
 
   cs = addString(
-                    "QHG_LOCATION",
-                    "If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can \n"
-                    "be used to specify the location of Qt's qhelpgenerator. \n"
+                    "TQHG_LOCATION",
+                    "If the GENERATE_TQHP tag is set to YES, the TQHG_LOCATION tag can \n"
+                    "be used to specify the location of TQt's qhelpgenerator. \n"
                     "If non-empty doxygen will try to run qhelpgenerator on the generated \n"
                     ".qhp file .\n"
                    );
   cs->setWidgetType(ConfigString::File);
-  cs->addDependency("GENERATE_QHP");
+  cs->addDependency("GENERATE_TQHP");
 
   /////////////////////////////////////////////////////////
   // MISC /////////////////////////////////////////////////
@@ -4857,7 +4857,7 @@ void Config::create()
   cs = addString(   "DOT_FONTNAME",
                     "By default doxygen will write a font called FreeSans.ttf to the output \n"
 		    "directory and reference it in all dot files that doxygen generates. This \n"
-		    "font does not include all possible unicode characters however, so when you need \n"
+		    "font does not include all possible tqunicode characters however, so when you need \n"
 		    "these (or just want a differently looking font) you can specify the font name \n"
 		    "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
 		    "which can be done by putting it in a standard location or by setting the \n"
@@ -5005,7 +5005,7 @@ void Config::create()
                     "nodes that will be shown in the graph. If the number of nodes in a graph \n"
                     "becomes larger than this value, doxygen will truncate the graph, which is \n"
                     "visualized by representing a node as a red box. Note that doxygen if the \n"
-		    "number of direct children of the root node in a graph is already larger than \n"
+		    "number of direct tqchildren of the root node in a graph is already larger than \n"
 		    "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n"
                     "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n",
                     0,10000, 50
@@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name)
       }
       totalSize+=size+2;
       contents.resize(totalSize);
-      contents.at(totalSize-2)='\n'; // to help the scanner
-      contents.at(totalSize-1)='\0';
+      contents.tqat(totalSize-2)='\n'; // to help the scanner
+      contents.tqat(totalSize-1)='\0';
       return contents;
     }
   }
diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h
index 2486956e..19d877d8 100644
--- a/parts/doxygen/config.h
+++ b/parts/doxygen/config.h
@@ -30,7 +30,7 @@ class ConfigOption
     enum 
     { 
      /*! Maximum length of an option in the config file. Used for 
-      *  alignment purposes.
+      *  tqalignment purposes.
       */
       MAX_OPTION_LENGTH = 23  
     };
@@ -409,7 +409,7 @@ class Config
      */
     ConfigOption *get(const char *name) const
     {
-      return m_dict->find(name); 
+      return m_dict->tqfind(name); 
     }
     /* @} */
 
diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index 8269bf0e..eb08f0f9 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -27,8 +27,8 @@
 #include "messages.h"
 
 
-DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *parent, const char *name)
-    : TQTabWidget(parent, name)
+DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *tqparent, const char *name)
+    : TQTabWidget(tqparent, name)
 {
     m_hasChanged = false;
     m_dependencies = new TQDict< TQPtrList<IInput> >(257);
@@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget()
 }
 
 
-TQSize DoxygenConfigWidget::sizeHint() const
+TQSize DoxygenConfigWidget::tqsizeHint() const
 {
     // without this the whole dialog becomes much too large
-    return TQSize(TQTabWidget::sizeHint().width(), 1);
+    return TQSize(TQTabWidget::tqsizeHint().width(), 1);
 }
 
 
@@ -184,13 +184,13 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches,
     if (dep.isEmpty())
         return;
     
-    IInput *parent = m_inputWidgets->find(dep);
-    Q_ASSERT(parent!=0);
-    IInput *child = m_inputWidgets->find(name);
+    IInput *tqparent = m_inputWidgets->tqfind(dep);
+    Q_ASSERT(tqparent!=0);
+    IInput *child = m_inputWidgets->tqfind(name);
     Q_ASSERT(child!=0);
-    if (!switches->find(dep))
-        switches->insert(dep, parent->qobject());
-    TQPtrList<IInput> *list = m_dependencies->find(dep);
+    if (!switches->tqfind(dep))
+        switches->insert(dep, tqparent->qobject());
+    TQPtrList<IInput> *list = m_dependencies->tqfind(dep);
     if (!list) {
         list = new TQPtrList<IInput>;
         m_dependencies->insert(dep, list);
@@ -201,7 +201,7 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches,
 
 void DoxygenConfigWidget::toggle(const TQString &name, bool state)
 {
-    TQPtrList<IInput> *inputs = m_dependencies->find(name);
+    TQPtrList<IInput> *inputs = m_dependencies->tqfind(name);
     Q_ASSERT(inputs!=0);
     IInput *input = inputs->first();
     while (input) {
diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h
index 4dd68178..54584f07 100644
--- a/parts/doxygen/doxygenconfigwidget.h
+++ b/parts/doxygen/doxygenconfigwidget.h
@@ -21,12 +21,13 @@
 class IInput;
 
 
-class DoxygenConfigWidget : public QTabWidget
+class DoxygenConfigWidget : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    DoxygenConfigWidget( const TQString &fileName, TQWidget *parent=0, const char *name=0 );
+    DoxygenConfigWidget( const TQString &fileName, TQWidget *tqparent=0, const char *name=0 );
     ~DoxygenConfigWidget();
 
 public slots:
@@ -37,7 +38,7 @@ private slots:
     void changed();
 
 private:
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     void loadFile();
     void saveFile();
     void init();
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index 833f4938..29265ceb 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -51,8 +51,8 @@ typedef KDevGenericFactory<DoxygenPart> DoxygenFactory;
 static const KDevPluginInfo data("kdevdoxygen");
 K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) )
 
-DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
+DoxygenPart::DoxygenPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
 {
     setInstance(DoxygenFactory::instance());
     setXMLFile("kdevdoxygen.rc");
@@ -172,7 +172,7 @@ void DoxygenPart::adjustDoxyfile()
     patterns->addValue("*.tlh");
     patterns->addValue("*.diff");
     patterns->addValue("*.patch");
-    patterns->addValue("*.moc");
+    patterns->addValue("*.tqmoc");
     patterns->addValue("*.xpm");
     patterns->addValue("*.dox");
   }
@@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( )
         if (poDir != 0)
             *poDir->valueRef() = dirVal;
 
-        KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name()));
+        KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name()));
         return;
     }
 
@@ -485,7 +485,7 @@ void DoxygenPart::slotActivePartChanged( KParts::Part * part )
 	if (doc != 0)
 		m_file = doc->url().path();
 	else
-		m_file = TQString::null;
+		m_file = TQString();
 	// <-
     m_activeEditor = dynamic_cast<KTextEditor::EditInterface*>(part);
     m_cursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()) : 0;
diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h
index 7756a791..a77545c9 100644
--- a/parts/doxygen/doxygenpart.h
+++ b/parts/doxygen/doxygenpart.h
@@ -40,9 +40,10 @@ namespace KTextEditor{
 class DoxygenPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DoxygenPart( TQObject *parent, const char *name, const TQStringList & );
+    DoxygenPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~DoxygenPart();
 
 private slots:
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index e316d69e..bf4af7ea 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -110,16 +110,16 @@ static const char* const update_xpm_data[] =
 const char **update_xpm = (const char **)update_xpm_data;
 
 
-InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
-    : TQWidget(parent), state(flag), key(k)
+InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * tqparent, bool &flag)
+    : TQWidget(tqparent), state(flag), key(k)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     cb = new TQCheckBox(text,this);
 
     init();
 
-    layout->addWidget(cb);
-    layout->addStretch(1);
+    tqlayout->addWidget(cb);
+    tqlayout->addStretch(1);
     
     connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
 }
@@ -151,19 +151,19 @@ void InputBool::setEnabled(bool b)
 }
 
 
-InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
-    : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
+InputInt::InputInt(const TQString &label, TQWidget *tqparent, int &val, int minVal, int maxVal)
+    : TQWidget(tqparent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
     
     sp = new TQSpinBox(minVal, maxVal, 1, this);
     lab = new TQLabel(sp, label+":", this);
     
     init();
   
-    layout->addWidget(lab);
-    layout->addWidget(sp);
-    layout->addStretch(1);
+    tqlayout->addWidget(lab);
+    tqlayout->addWidget(sp);
+    tqlayout->addStretch(1);
 
     connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 }
@@ -175,8 +175,8 @@ InputInt::~InputInt()
 
 void InputInt::init()
 {
-    m_val = QMAX(m_minVal, m_val);
-    m_val = QMIN(m_maxVal, m_val);
+    m_val = TQMAX(m_minVal, m_val);
+    m_val = TQMIN(m_maxVal, m_val);
     sp->setValue(m_val);
 }
 
@@ -197,31 +197,31 @@ void InputInt::setEnabled(bool state)
 
 
 InputString::InputString(const TQString & label, 
-                         TQWidget *parent, TQCString &s, StringMode m)
-    : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0)
+                         TQWidget *tqparent, TQCString &s, StringMode m)
+    : TQWidget(tqparent), str(s), sm(m), m_values(0), m_index(0)
 {
     le = 0; br = 0; com = 0;
     
     if (m == StringFixed) {
-        TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+        TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
         com = new TQComboBox(this); 
 	lab = new TQLabel(com,label+":", this);
-	layout->addWidget(lab);
-        layout->addWidget(com);
-        layout->addStretch(1);
+	tqlayout->addWidget(lab);
+        tqlayout->addWidget(com);
+        tqlayout->addStretch(1);
     } else {
-        TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
+        TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
         le = new KLineEdit(this);
 	lab = new TQLabel(le,label+":", this);
-	layout->addWidget(lab, 0, 0);
+	tqlayout->addWidget(lab, 0, 0);
         le->setText(s);
-        layout->addWidget(le, 0, 1);
+        tqlayout->addWidget(le, 0, 1);
         
         if (m == StringFile || m == StringDir) {
             br = new TQPushButton(this);
             br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
             TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
-            layout->addWidget(br, 0, 2);
+            tqlayout->addWidget(br, 0, 2);
         }
     }
     
@@ -245,7 +245,7 @@ InputString::~InputString()
 void InputString::init()
 {
     if (sm == StringFixed) {
-        int *itemIndex = m_values->find(str);
+        int *itemIndex = m_values->tqfind(str);
         if (itemIndex) 
             com->setCurrentItem(*itemIndex);
         else
@@ -324,32 +324,32 @@ void InputString::browse()
 
 
 InputStrList::InputStrList(const TQString & label, 
-                           TQWidget *parent, TQStrList &sl, ListMode lm)
-    : TQWidget(parent), strList(sl)
+                           TQWidget *tqparent, TQStrList &sl, ListMode lm)
+    : TQWidget(tqparent), strList(sl)
 {
-    TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
     
-    TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
-    TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
+    TQWidget *dw = new TQWidget(this); /* dummy widget used for tqlayouting */
+    TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
     le  = new KLineEdit(dw);
     lab = new TQLabel(le,label+":", this );
-    layout->addWidget(lab, 0, 0);
-    boxlayout->addWidget(le, 1);
+    tqlayout->addWidget(lab, 0, 0);
+    boxtqlayout->addWidget(le, 1);
 
     add = new TQPushButton(dw);
     add->setPixmap(TQPixmap( add_xpm ));
     TQToolTip::add(add, i18n("Add item"));
-    boxlayout->addWidget(add);
+    boxtqlayout->addWidget(add);
     
     del = new TQPushButton(dw);
     del->setPixmap(TQPixmap( del_xpm ));
     TQToolTip::add(del, i18n("Delete selected item"));
-    boxlayout->addWidget(del);
+    boxtqlayout->addWidget(del);
 
     upd = new TQPushButton(dw); 
     upd->setPixmap(TQPixmap( update_xpm ));
     TQToolTip::add(upd, i18n("Update selected item"));
-    boxlayout->addWidget(upd);
+    boxtqlayout->addWidget(upd);
     
     lb  = new TQListBox(this);
     lb->setMinimumSize(400, 100);
@@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label,
             brFile = new TQPushButton(dw);
             brFile->setPixmap(SmallIcon("document"));
             TQToolTip::add(brFile, i18n("Browse to a file"));
-            boxlayout->addWidget(brFile);
+            boxtqlayout->addWidget(brFile);
         } 
         if (lm & ListDir) {
             brDir = new TQPushButton(dw);
             brDir->setPixmap(SmallIcon("folder"));
             TQToolTip::add(brDir, i18n("Browse to a folder"));
-            boxlayout->addWidget(brDir);
+            boxtqlayout->addWidget(brDir);
         }
     }
-    layout->addWidget(dw, 0, 1);
-    layout->addWidget(lb, 1, 1);
+    tqlayout->addWidget(dw, 0, 1);
+    tqlayout->addWidget(lb, 1, 1);
     
     connect( le,   TQT_SIGNAL(returnPressed()), 
              this, TQT_SLOT(addString()) );
diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h
index b046f39c..ac73ce20 100644
--- a/parts/doxygen/input.h
+++ b/parts/doxygen/input.h
@@ -36,14 +36,15 @@ class IInput
 class InputBool : public TQWidget, public IInput
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    InputBool(const TQCString &key, const TQString &text, TQWidget *parent, bool &flag);
+    InputBool(const TQCString &key, const TQString &text, TQWidget *tqparent, bool &flag);
     ~InputBool();
     
     void init();
     virtual void setEnabled(bool b);
-    virtual TQObject *qobject() { return this; }
+    virtual TQObject *qobject() { return TQT_TQOBJECT(this); }
     virtual bool getState() const { return state; }
 
 signals:
@@ -63,15 +64,16 @@ private:
 class InputInt : public TQWidget, public IInput
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    InputInt(const TQString &text, TQWidget *parent,
+    InputInt(const TQString &text, TQWidget *tqparent,
              int &val, int minVal, int maxVal);
     ~InputInt();
     
     void init();
     virtual void setEnabled(bool);
-    TQObject *qobject() { return this; }
+    TQObject *qobject() { return TQT_TQOBJECT(this); }
 
 signals:
     void changed();
@@ -91,6 +93,7 @@ private:
 class InputString : public TQWidget, public IInput
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum StringMode { StringFree=0, 
@@ -99,14 +102,14 @@ public:
                       StringFixed=3
                     };
 
-    InputString(const TQString &text, TQWidget *parent,
+    InputString(const TQString &text, TQWidget *tqparent,
                 TQCString &s, StringMode m=StringFree);
     ~InputString();
     
     void init();
     void addValue(const char *s);
     void setEnabled(bool);
-    TQObject *qobject() { return this; }
+    TQObject *qobject() { return TQT_TQOBJECT(this); }
 
 signals:
     void changed();
@@ -131,6 +134,7 @@ private:
 class InputStrList : public TQWidget, public IInput
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum ListMode { ListString=0, 
@@ -139,13 +143,13 @@ public:
                     ListFileDir=ListFile|ListDir 
                   };
     
-    InputStrList(const TQString &text, TQWidget *parent, 
+    InputStrList(const TQString &text, TQWidget *tqparent, 
                  TQStrList &sl, ListMode v=ListString);
     ~InputStrList();
 
     void init();
     void setEnabled(bool);
-    TQObject *qobject() { return this; }
+    TQObject *qobject() { return TQT_TQOBJECT(this); }
 
 signals:
     void changed();
diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp
index 8819b109..ee56cb34 100644
--- a/parts/doxygen/messages.cpp
+++ b/parts/doxygen/messages.cpp
@@ -90,7 +90,7 @@ TQString message(const TQCString &key)
     // configuration options related to warning and progress messages
     //---------------------------------------------------------------------------
     addMessage("Messages", i18n("Messages"));
-    addMessage("QUIET", i18n("Suppress output"));
+    addMessage("TQUIET", i18n("Suppress output"));
     addMessage("WARNINGS", i18n("Show warnings"));
     addMessage("WARN_IF_UNDOCUMENTED", i18n("Warn about undocumented entities"));
     addMessage("WARN_IF_DOC_ERROR", i18n("Warn if error in documents"));
@@ -289,7 +289,7 @@ TQString message(const TQCString &key)
     initialized = true;
   }
 
-  if (!sMessages.contains(key))
+  if (!sMessages.tqcontains(key))
   {
     kdDebug() << "Unhandled message: " << key << endl;
 
diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp
index 11a0f2a6..ca31669f 100644
--- a/parts/filecreate/addglobaldlg.cpp
+++ b/parts/filecreate/addglobaldlg.cpp
@@ -21,14 +21,14 @@
 #include <klocale.h>
 
 /*
- *  Constructs a AddGlobalDlg as a child of 'parent', with the
+ *  Constructs a AddGlobalDlg as a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFlags fl )
-    : TQDialog( parent, name, modal, fl )
+AddGlobalDlg::AddGlobalDlg( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+    : TQDialog( tqparent, name, modal, fl )
 
 {
     if ( !name )
@@ -68,7 +68,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla
 
     AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 );
     languageChange();
-    resize( TQSize(511, 282).expandedTo(minimumSizeHint()) );
+    resize( TQSize(511, 282).expandedTo(tqminimumSizeHint()) );
 
     // signals and slots connections
     connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
@@ -80,7 +80,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla
  */
 AddGlobalDlg::~AddGlobalDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /*
@@ -93,9 +93,9 @@ void AddGlobalDlg::languageChange()
     buttonHelp->setGuiItem( KStdGuiItem::help() );
     buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) );
     buttonOk->setGuiItem( KStdGuiItem::ok() );
-    buttonOk->setAccel( TQKeySequence( TQString::null ) );
+    buttonOk->setAccel( TQKeySequence( TQString() ) );
     buttonCancel->setGuiItem( KStdGuiItem::cancel() );
-    buttonCancel->setAccel( TQKeySequence( TQString::null ) );
+    buttonCancel->setAccel( TQKeySequence( TQString() ) );
     fcglobal_view->header()->setLabel( 0, i18n( "Type extension:" ) );
     fcglobal_view->header()->setLabel( 1, i18n( "Type name:" ) );
     fcglobal_view->header()->setLabel( 2, i18n( "Template location:" ) );
diff --git a/parts/filecreate/addglobaldlg.h b/parts/filecreate/addglobaldlg.h
index 481309e7..2e7435dc 100644
--- a/parts/filecreate/addglobaldlg.h
+++ b/parts/filecreate/addglobaldlg.h
@@ -20,12 +20,13 @@ class TQListView;
 class TQListViewItem;
 class TQPushButton;
 
-class AddGlobalDlg : public QDialog
+class AddGlobalDlg : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    AddGlobalDlg( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~AddGlobalDlg();
 
     TQPushButton* buttonHelp;
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index df4963fa..6a1dc7e6 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -39,8 +39,8 @@
 #include "kdevpartcontroller.h"
 
 
-FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name):
-    FCConfigWidgetBase(parent, name), m_part(part), m_global(global)
+FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *tqparent, const char *name):
+    FCConfigWidgetBase(tqparent, name), m_part(part), m_global(global)
 {
     fc_view->setSorting(-1, FALSE);
     fcglobal_view->setSorting(-1, FALSE);
@@ -113,7 +113,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
                 TQString subtyperef = element.attribute("subtyperef");
                 if (subtyperef.isNull())
                 {
-                    TQListViewItem *it = view->findItem(ext, 0);
+                    TQListViewItem *it = view->tqfindItem(ext, 0);
                     if (it)
                     {
                         ((TQCheckListItem*)it)->setOn(true);
@@ -128,7 +128,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
                 }
                 else
                 {
-                    TQListViewItem *it = view->findItem(subtyperef, 0);
+                    TQListViewItem *it = view->tqfindItem(subtyperef, 0);
                     if (it)
                         ((TQCheckListItem*)it)->setOn(true);
                 }
@@ -147,9 +147,9 @@ void FCConfigWidget::loadProjectTemplates(TQListView *view)
 {
     TQDir templDir( m_part->project()->projectDirectory() + "/templates/" );
     templDir.setFilter( TQDir::Files );
-    const QFileInfoList * list = templDir.entryInfoList();
+    const TQFileInfoList * list = templDir.entryInfoList();
     if( list ){
-      QFileInfoListIterator it( *list );
+      TQFileInfoListIterator it( *list );
       TQFileInfo *fi;
       while ( (fi = it.current()) != 0 ) {
         FileType * filetype;
@@ -217,7 +217,7 @@ void FCConfigWidget::saveProjectConfig()
 
     TQListViewItemIterator it( fcglobal_view );
     for( ; it.current( ); ++it ){
-        if (!it.current()->parent())
+        if (!it.current()->tqparent())
         {
             TQCheckListItem *chit = dynamic_cast<TQCheckListItem*>(it.current());
             if ( !chit ) continue;
@@ -259,7 +259,7 @@ void FCConfigWidget::saveProjectConfig()
             TQString dest;
             dest = m_part->project()->projectDirectory() + "/templates/";
             if (it2.current()->text(1) == "create")
-                copyTemplate(TQString::null, dest, it2.current()->text(0));
+                copyTemplate(TQString(), dest, it2.current()->text(0));
             else
                 copyTemplate(it2.current()->text(1), dest, it2.current()->text(0));
         }
@@ -271,7 +271,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
 {
     TQListViewItemIterator it( fc_view );
     for( ; it.current( ); ++it ){
-        if (!it.current()->parent())
+        if (!it.current()->tqparent())
         {
             TQDomElement type = dom.createElement( "type" );
             type.setAttribute( "ext", it.current()->text(0) );
@@ -295,7 +295,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
                 else
                     dest = m_part->project()->projectDirectory() + "/templates/";
                 if (it.current()->text(4) == "create")
-                    copyTemplate(TQString::null, dest, it.current()->text(0));
+                    copyTemplate(TQString(), dest, it.current()->text(0));
                 else
                     copyTemplate(it.current()->text(4), dest, it.current()->text(0));
             }
@@ -322,7 +322,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
                     else
                         dest = m_part->project()->projectDirectory() + "/templates/";
                     if (lastChild->text(4) == "create")
-                        copyTemplate(TQString::null, dest, it.current()->text(0) + "-" + lastChild->text(0));
+                        copyTemplate(TQString(), dest, it.current()->text(0) + "-" + lastChild->text(0));
                     else
                         copyTemplate(lastChild->text(4), dest, it.current()->text(0) + "-" + lastChild->text(0));
                 }
@@ -434,15 +434,15 @@ void FCConfigWidget::copyToProject_button_clicked()
     {
         TQListViewItem *it_copy_parent = 0;
         TQString destParent;
-        if (it->parent())
+        if (it->tqparent())
         {
-            it_copy_parent = new TQListViewItem(fc_view, it->parent()->text(0),
-                it->parent()->text(1),
-                it->parent()->text(2),
-                it->parent()->text(3),
-                locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0)));
-            destParent += it->parent()->text(0) + "-";
-            TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->parent());
+            it_copy_parent = new TQListViewItem(fc_view, it->tqparent()->text(0),
+                it->tqparent()->text(1),
+                it->tqparent()->text(2),
+                it->tqparent()->text(3),
+                locate("data", "kdevfilecreate/file-templates/"+ it->tqparent()->text(0)));
+            destParent += it->tqparent()->text(0) + "-";
+            TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->tqparent());
             if (chk)
                 chk->setOn(false);
         }
@@ -497,7 +497,7 @@ void FCConfigWidget::newtype_button_clicked()
 
 void FCConfigWidget::newsubtype_button_clicked()
 {
-    if (fc_view->currentItem() && (!fc_view->currentItem()->parent()))
+    if (fc_view->currentItem() && (!fc_view->currentItem()->tqparent()))
     {
         FCTypeEdit *te = new FCTypeEdit(this);
         if (te->exec() == TQDialog::Accepted )
@@ -541,10 +541,10 @@ void FCConfigWidget::moveup_button_clicked()
         return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
+    TQListViewItem *tqparent = i->tqparent();
     --it;
     while ( it.current() ) {
-        if ( it.current()->parent() == parent )
+        if ( it.current()->tqparent() == tqparent )
             break;
         --it;
     }
@@ -564,10 +564,10 @@ void FCConfigWidget::movedown_button_clicked()
         return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
+    TQListViewItem *tqparent = i->tqparent();
     it++;
     while ( it.current() ) {
-        if ( it.current()->parent() == parent )
+        if ( it.current()->tqparent() == tqparent )
             break;
         it++;
     }
@@ -649,7 +649,7 @@ void FCConfigWidget::edit_template_content_button_clicked( )
             m_part->partController()->editDocument(content);
         else
         {
-            KMessageBox::information(this, i18n("Requested template does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit template content warning");
+            KMessageBox::information(this, i18n("Requested template does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString(), "Edit template content warning");
             fctemplates_view->currentItem()->setPixmap(0, SmallIcon("edit"));
             urlsToEdit.append(content);
         }
@@ -662,8 +662,8 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         return;
     TQListViewItem *it = fc_view->currentItem();
     TQString type_name = it->text(0);
-    if (it->parent())
-        type_name.prepend(it->parent()->text(0) + "-");
+    if (it->tqparent())
+        type_name.prepend(it->tqparent()->text(0) + "-");
     if (!m_global)
     {
         TQString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name;
@@ -674,9 +674,9 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         else
         {
             if (it->text(4) == "create")
-                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString(), "Edit type template content warning");
             else
-                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString(), "Edit type template content warning");
             fc_view->currentItem()->setPixmap(0, SmallIcon("edit"));
             urlsToEdit.append(content);
         }
@@ -697,9 +697,9 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         else
         {
             if (it->text(4) == "create")
-                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit global type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type does not exist yet.\nIt will be opened immediately after accepting the configuration dialog."), TQString(), "Edit global type template content warning");
             else
-                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString::null, "Edit global type template content warning");
+                KMessageBox::information(this, i18n("Template for the selected file type has been changed.\nIt will be opened immediately after accepting the configuration dialog."), TQString(), "Edit global type template content warning");
             fc_view->currentItem()->setPixmap(0, SmallIcon("edit"));
             urlsToEdit.append(content);
         }
diff --git a/parts/filecreate/fcconfigwidget.h b/parts/filecreate/fcconfigwidget.h
index 2e69b6d5..19087ba6 100644
--- a/parts/filecreate/fcconfigwidget.h
+++ b/parts/filecreate/fcconfigwidget.h
@@ -29,8 +29,9 @@ class FileType;
 class FCConfigWidget : public FCConfigWidgetBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name);
+    FCConfigWidget(FileCreatePart * part, bool global, TQWidget *tqparent, const char *name);
 
     ~FCConfigWidget();
 
diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui
index 72f62260..089141a2 100644
--- a/parts/filecreate/fcconfigwidgetbase.ui
+++ b/parts/filecreate/fcconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FCConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FCConfigWidgetBase</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>fc_tabs</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab1</cstring>
                 </property>
@@ -37,7 +37,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QPushButton" row="3" column="1">
+                    <widget class="TQPushButton" row="3" column="1">
                         <property name="name">
                             <cstring>remove_button</cstring>
                         </property>
@@ -45,7 +45,7 @@
                             <string>Re&amp;move Type</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="2" column="1">
+                    <widget class="TQPushButton" row="2" column="1">
                         <property name="name">
                             <cstring>edittype_button</cstring>
                         </property>
@@ -53,7 +53,7 @@
                             <string>Edit T&amp;ype...</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>newsubtype_button</cstring>
                         </property>
@@ -61,7 +61,7 @@
                             <string>New &amp;Subtype...</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>newtype_button</cstring>
                         </property>
@@ -69,7 +69,7 @@
                             <string>&amp;New Type...</string>
                         </property>
                     </widget>
-                    <widget class="QListView" row="0" column="0" rowspan="11" colspan="1">
+                    <widget class="TQListView" row="0" column="0" rowspan="11" colspan="1">
                         <column>
                             <property name="text">
                                 <string>Type Extension</string>
@@ -140,14 +140,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="7" column="1">
+                    <widget class="TQPushButton" row="7" column="1">
                         <property name="name">
                             <cstring>moveup_button</cstring>
                         </property>
@@ -155,7 +155,7 @@
                             <string>Move &amp;Up</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="8" column="1">
+                    <widget class="TQPushButton" row="8" column="1">
                         <property name="name">
                             <cstring>movedown_button</cstring>
                         </property>
@@ -173,7 +173,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -190,14 +190,14 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>edit_type_content_button</cstring>
                         </property>
@@ -207,7 +207,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab2</cstring>
                 </property>
@@ -218,7 +218,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListView" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2">
                         <column>
                             <property name="text">
                                 <string>Type Extension</string>
@@ -286,14 +286,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>330</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>copyToProject_button</cstring>
                         </property>
@@ -303,7 +303,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab3</cstring>
                 </property>
@@ -314,7 +314,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListView" row="1" column="0" rowspan="6" colspan="1">
+                    <widget class="TQListView" row="1" column="0" rowspan="6" colspan="1">
                         <column>
                             <property name="text">
                                 <string>Template Name</string>
@@ -339,7 +339,7 @@
                             <enum>AllColumns</enum>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="2" column="1">
+                    <widget class="TQPushButton" row="2" column="1">
                         <property name="name">
                             <cstring>edittemplate_button</cstring>
                         </property>
@@ -347,7 +347,7 @@
                             <string>C&amp;hange Content...</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>newtemplate_button</cstring>
                         </property>
@@ -355,7 +355,7 @@
                             <string>&amp;New Template...</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>templatesDir_label</cstring>
                         </property>
@@ -363,7 +363,7 @@
                             <string></string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="3" column="1">
+                    <widget class="TQPushButton" row="3" column="1">
                         <property name="name">
                             <cstring>removetemplate_button</cstring>
                         </property>
@@ -381,14 +381,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>150</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>edit_template_content_button</cstring>
                         </property>
@@ -406,7 +406,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -520,7 +520,7 @@
 <variables>
     <variable>AddGlobalDlg *global_dlg;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>removetemplate_button_clicked()</slot>
     <slot>copyToProject_button_clicked()</slot>
     <slot>newtype_button_clicked()</slot>
@@ -534,7 +534,7 @@
     <slot>edit_template_contents_button_clicked()</slot>
     <slot>edit_template_content_button_clicked()</slot>
     <slot>edit_type_content_button_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp
index b019ddb9..1fcc6e02 100644
--- a/parts/filecreate/fctemplateedit.cpp
+++ b/parts/filecreate/fctemplateedit.cpp
@@ -11,8 +11,8 @@
 #include "fctemplateedit.h"
 #include <tqpushbutton.h>
 
-FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name):
-    FCTemplateEditBase(parent, name)
+FCTemplateEdit::FCTemplateEdit(TQWidget *tqparent, const char *name):
+    FCTemplateEditBase(tqparent, name)
 {
     connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )),
              this, TQT_SLOT( slotTemplateNameChanged( )));
diff --git a/parts/filecreate/fctemplateedit.h b/parts/filecreate/fctemplateedit.h
index 8ecf7a81..a5a0c2f6 100644
--- a/parts/filecreate/fctemplateedit.h
+++ b/parts/filecreate/fctemplateedit.h
@@ -17,8 +17,9 @@
 class FCTemplateEdit : public FCTemplateEditBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    FCTemplateEdit(TQWidget *parent=0, const char *name=0);
+    FCTemplateEdit(TQWidget *tqparent=0, const char *name=0);
 
     ~FCTemplateEdit();
 
diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui
index 976bff33..6ea599e2 100644
--- a/parts/filecreate/fctemplateeditbase.ui
+++ b/parts/filecreate/fctemplateeditbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>FCTemplateEditBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FCTemplateEditBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -30,7 +30,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -40,7 +40,7 @@
                     <property name="text">
                         <string>Template &amp;name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignBottom</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -54,15 +54,15 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -77,7 +77,7 @@
                     <property name="text">
                         <string>Set template content from &amp;file:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignBottom</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -96,7 +96,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>26</height>
@@ -108,9 +108,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -126,14 +126,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ok_button</cstring>
                     </property>
@@ -144,7 +144,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancel_button</cstring>
                     </property>
@@ -180,11 +180,11 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">fctemplateeditbase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h
index f4fcfa05..5750f988 100644
--- a/parts/filecreate/fctemplateeditbase.ui.h
+++ b/parts/filecreate/fctemplateeditbase.ui.h
@@ -12,7 +12,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
@@ -22,5 +22,5 @@
 
 void FCTemplateEditBase::init()
 {
-    templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this));
+    templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this)));
 }
diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp
index 5ee4eb0d..dfb29ef6 100644
--- a/parts/filecreate/fctypeedit.cpp
+++ b/parts/filecreate/fctypeedit.cpp
@@ -13,8 +13,8 @@
 #include "fctypeedit.h"
 
 
-FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name)
- : FCTypeEditBase(parent, name)
+FCTypeEdit::FCTypeEdit(TQWidget *tqparent, char *name)
+ : FCTypeEditBase(tqparent, name)
 {
     connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged()));
     connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( )));
diff --git a/parts/filecreate/fctypeedit.h b/parts/filecreate/fctypeedit.h
index f5a9bf7b..122b0b57 100644
--- a/parts/filecreate/fctypeedit.h
+++ b/parts/filecreate/fctypeedit.h
@@ -17,8 +17,9 @@
 class FCTypeEdit : public FCTypeEditBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    FCTypeEdit(TQWidget *parent = 0, char *name = 0);
+    FCTypeEdit(TQWidget *tqparent = 0, char *name = 0);
 
     ~FCTypeEdit();
 
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index 8bc06f87..893a9be3 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>FCTypeEditBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FCTypeEditBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -30,7 +30,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -43,23 +43,23 @@
                     <property name="text">
                         <string>Type &amp;extension:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignBottom</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>typename_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>typeext_edit</cstring>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -68,30 +68,30 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
                     <property name="text">
                         <string>Type &amp;name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignBottom</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>typedescr_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>typename_edit</cstring>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout3_2</cstring>
+                <cstring>tqlayout3_2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -100,21 +100,21 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3_2</cstring>
                     </property>
                     <property name="text">
                         <string>Type &amp;description:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignBottom</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>typedescr_edit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>typedescr_edit</cstring>
                     </property>
@@ -125,7 +125,7 @@
             <property name="name">
                 <cstring>icon_url</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>80</width>
                     <height>80</height>
@@ -138,15 +138,15 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -161,7 +161,7 @@
                     <property name="text">
                         <string>Set template content from &amp;file:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignBottom</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -180,7 +180,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>26</height>
@@ -192,9 +192,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -210,14 +210,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ok_button</cstring>
                     </property>
@@ -228,7 +228,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancel_button</cstring>
                     </property>
@@ -268,11 +268,11 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">fctypeeditbase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h
index b9ec29b5..07576b6b 100644
--- a/parts/filecreate/fctypeeditbase.ui.h
+++ b/parts/filecreate/fctypeeditbase.ui.h
@@ -12,7 +12,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
@@ -22,5 +22,5 @@
 
 void FCTypeEditBase::init()
 {
-    typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this));
+    typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this)));
 }
diff --git a/parts/filecreate/file-templates/ui b/parts/filecreate/file-templates/ui
index 858b4678..0a453896 100644
--- a/parts/filecreate/file-templates/ui
+++ b/parts/filecreate/file-templates/ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class=TQWIDGET_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog
index 975ba4d4..60a0004d 100644
--- a/parts/filecreate/file-templates/ui-confdialog
+++ b/parts/filecreate/file-templates/ui-confdialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class="QDialog">
+<widget class=TQDIALOG_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListBox" row="0" column="0">
+        <widget class=TQLISTBOX_OBJECT_NAME_STRING row="0" column="0">
             <item>
                 <property name="text">
                     <string>New Item</string>
@@ -46,11 +46,11 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="1">
+        <widget class=TQTABWIDGET_OBJECT_NAME_STRING row="0" column="1">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>Widget2</cstring>
                 </property>
@@ -58,7 +58,7 @@
                     <string>Tab</string>
                 </attribute>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>Widget3</cstring>
                 </property>
@@ -67,7 +67,7 @@
                 </attribute>
             </widget>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -105,14 +105,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -161,5 +161,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialog b/parts/filecreate/file-templates/ui-dialog
index fc2aefce..4b0c8bb2 100644
--- a/parts/filecreate/file-templates/ui-dialog
+++ b/parts/filecreate/file-templates/ui-dialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QDialog">
+<widget class=TQDIALOG_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialog-qt4 b/parts/filecreate/file-templates/ui-dialog-qt4
index d35cb285..b2096e86 100644
--- a/parts/filecreate/file-templates/ui-dialog-qt4
+++ b/parts/filecreate/file-templates/ui-dialog-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
+ <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" >
   <property name="geometry" >
    <rect>
     <x>0</x>
diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb
index 7ccbfb94..2929f9e3 100644
--- a/parts/filecreate/file-templates/ui-dialogb
+++ b/parts/filecreate/file-templates/ui-dialogb
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class="QDialog">
+<widget class=TQDIALOG_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -18,7 +18,7 @@
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout1</cstring>
         </property>
@@ -40,7 +40,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QPushButton">
+            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>buttonHelp</cstring>
                 </property>
@@ -64,14 +64,14 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>20</height>
                     </size>
                 </property>
             </spacer>
-            <widget class="QPushButton">
+            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>buttonOk</cstring>
                 </property>
@@ -88,7 +88,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class="QPushButton">
+            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>buttonCancel</cstring>
                 </property>
@@ -119,5 +119,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4
index 2413393e..e1b84f42 100644
--- a/parts/filecreate/file-templates/ui-dialogb-qt4
+++ b/parts/filecreate/file-templates/ui-dialogb-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
+ <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class="QWidget" name="layoutWidget" >
+  <widget class=TQWIDGET_OBJECT_NAME_STRING name="tqlayoutWidget" >
    <property name="geometry" >
     <rect>
      <x>20</x>
@@ -24,7 +24,7 @@
      <height>33</height>
     </rect>
    </property>
-   <layout class="QHBoxLayout" >
+   <tqlayout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
     <property name="margin" >
      <number>0</number>
     </property>
@@ -36,7 +36,7 @@
       <property name="orientation" >
        <enum>Qt::Horizontal</enum>
       </property>
-      <property name="sizeHint" >
+      <property name="tqsizeHint" >
        <size>
         <width>131</width>
         <height>31</height>
@@ -45,20 +45,20 @@
      </spacer>
     </item>
     <item>
-     <widget class="QPushButton" name="okButton" >
+     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" >
       <property name="text" >
        <string>OK</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QPushButton" name="cancelButton" >
+     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" >
       <property name="text" >
        <string>Cancel</string>
       </property>
      </widget>
     </item>
-   </layout>
+   </tqlayout>
   </widget>
  </widget>
  <pixmapfunction></pixmapfunction>
diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr
index 8cf208ec..0b7dde40 100644
--- a/parts/filecreate/file-templates/ui-dialogr
+++ b/parts/filecreate/file-templates/ui-dialogr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class="QDialog">
+<widget class=TQDIALOG_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -18,7 +18,7 @@
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout5</cstring>
         </property>
@@ -40,7 +40,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QPushButton">
+            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>buttonOk</cstring>
                 </property>
@@ -57,7 +57,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class="QPushButton">
+            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>buttonCancel</cstring>
                 </property>
@@ -71,7 +71,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class="QPushButton">
+            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>buttonHelp</cstring>
                 </property>
@@ -95,7 +95,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>20</height>
@@ -119,5 +119,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4
index 57d81913..8e2d0608 100644
--- a/parts/filecreate/file-templates/ui-dialogr-qt4
+++ b/parts/filecreate/file-templates/ui-dialogr-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
+ <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class="QWidget" name="layoutWidget" >
+  <widget class=TQWIDGET_OBJECT_NAME_STRING name="tqlayoutWidget" >
    <property name="geometry" >
     <rect>
      <x>300</x>
@@ -24,7 +24,7 @@
      <height>106</height>
     </rect>
    </property>
-   <layout class="QVBoxLayout" >
+   <tqlayout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
     <property name="margin" >
      <number>0</number>
     </property>
@@ -32,14 +32,14 @@
      <number>6</number>
     </property>
     <item>
-     <widget class="QPushButton" name="okButton" >
+     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" >
       <property name="text" >
        <string>OK</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QPushButton" name="cancelButton" >
+     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" >
       <property name="text" >
        <string>Cancel</string>
       </property>
@@ -50,7 +50,7 @@
       <property name="orientation" >
        <enum>Qt::Vertical</enum>
       </property>
-      <property name="sizeHint" >
+      <property name="tqsizeHint" >
        <size>
         <width>20</width>
         <height>40</height>
@@ -58,7 +58,7 @@
       </property>
      </spacer>
     </item>
-   </layout>
+   </tqlayout>
   </widget>
  </widget>
  <pixmapfunction></pixmapfunction>
diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin
index 854da009..4e0a093b 100644
--- a/parts/filecreate/file-templates/ui-mainwin
+++ b/parts/filecreate/file-templates/ui-mainwin
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QMainWindow">
+<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -415,7 +415,7 @@
         <slot>helpAbout()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>fileNew()</slot>
     <slot>fileOpen()</slot>
     <slot>fileSave()</slot>
@@ -431,6 +431,6 @@
     <slot>helpIndex()</slot>
     <slot>helpContents()</slot>
     <slot>helpAbout()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-mainwin-qt4 b/parts/filecreate/file-templates/ui-mainwin-qt4
index 814096cc..a444cfa3 100644
--- a/parts/filecreate/file-templates/ui-mainwin-qt4
+++ b/parts/filecreate/file-templates/ui-mainwin-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
+ <widget class=TQMAINWINDOW_OBJECT_NAME_STRING name="MainWindow" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,8 +15,8 @@
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralwidget" />
-  <widget class="QMenuBar" name="menubar" >
+  <widget class=TQWIDGET_OBJECT_NAME_STRING name="centralwidget" />
+  <widget class=TQMENUBAR_OBJECT_NAME_STRING name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog
index a28ae7c7..3c45b07b 100644
--- a/parts/filecreate/file-templates/ui-tabdialog
+++ b/parts/filecreate/file-templates/ui-tabdialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class="QDialog">
+<widget class=TQDIALOG_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -28,11 +28,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class=TQTABWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>Widget8</cstring>
                 </property>
@@ -40,7 +40,7 @@
                     <string>Tab</string>
                 </attribute>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>Widget9</cstring>
                 </property>
@@ -49,7 +49,7 @@
                 </attribute>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -87,14 +87,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -111,7 +111,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -143,5 +143,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-widget b/parts/filecreate/file-templates/ui-widget
index 858b4678..0a453896 100644
--- a/parts/filecreate/file-templates/ui-widget
+++ b/parts/filecreate/file-templates/ui-widget
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWidget">
+<widget class=TQWIDGET_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-widget-qt4 b/parts/filecreate/file-templates/ui-widget-qt4
index 2aecd3c9..d8b6e63c 100644
--- a/parts/filecreate/file-templates/ui-widget-qt4
+++ b/parts/filecreate/file-templates/ui-widget-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Form</class>
- <widget class="QWidget" name="Form" >
+ <widget class=TQWIDGET_OBJECT_NAME_STRING name="Form" >
   <property name="geometry" >
    <rect>
     <x>0</x>
diff --git a/parts/filecreate/file-templates/ui-wizard b/parts/filecreate/file-templates/ui-wizard
index 7c68689b..01338af0 100644
--- a/parts/filecreate/file-templates/ui-wizard
+++ b/parts/filecreate/file-templates/ui-wizard
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class="QWizard">
+<widget class=TQWIZARD_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Form1</string>
     </property>
-    <widget class="QWidget">
+    <widget class=TQWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>page</cstring>
         </property>
@@ -24,5 +24,5 @@
         </attribute>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp
index ecc8df42..1baa2132 100644
--- a/parts/filecreate/filecreate_filedialog.cpp
+++ b/parts/filecreate/filecreate_filedialog.cpp
@@ -21,9 +21,9 @@
 namespace FileCreate {
 
   FileDialog::FileDialog(const TQString& startDir, const TQString& filter,
-                         TQWidget *parent, const char *name,
+                         TQWidget *tqparent, const char *name,
                          bool modal, TQWidget * extraWidget) :
-    KFileDialog(startDir, filter, parent, name, modal, extraWidget) {
+    KFileDialog(startDir, filter, tqparent, name, modal, extraWidget) {
 
     setOperationMode(Saving);
 
diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h
index b1523648..26852cfc 100644
--- a/parts/filecreate/filecreate_filedialog.h
+++ b/parts/filecreate/filecreate_filedialog.h
@@ -21,10 +21,11 @@ namespace FileCreate {
 
   class FileDialog : public KFileDialog {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     FileDialog(const TQString& startDir, const TQString& filter,
-               TQWidget *parent, const char *name,
+               TQWidget *tqparent, const char *name,
                bool modal, TQWidget * extraWidget);
     virtual ~FileDialog();
 
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index 86075af8..aa02fe23 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -51,7 +51,7 @@ namespace FileCreate {
 
   void ListItem::setHeight( int height )
   {
-    KListViewItem::setHeight( QMAX(QMAX(height,m_iconHeight), m_filetypeRenderer->height() ) );
+    KListViewItem::setHeight( TQMAX(TQMAX(height,m_iconHeight), m_filetypeRenderer->height() ) );
   }
 
   void ListItem::prepareResize() {
diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp
index b4b84de1..6b41bb0b 100644
--- a/parts/filecreate/filecreate_newfile.cpp
+++ b/parts/filecreate/filecreate_newfile.cpp
@@ -29,9 +29,9 @@
 
 namespace FileCreate {
 
-  NewFileChooser::NewFileChooser(TQWidget * parent) :
+  NewFileChooser::NewFileChooser(TQWidget * tqparent) :
     KDialogBase(KDialogBase::Plain, i18n("New file dialog (title)", "New File"), KDialogBase::Ok|KDialogBase::Cancel,
-                KDialogBase::Ok, parent, "New file", true)
+                KDialogBase::Ok, tqparent, "New file", true)
   {
       TQVBoxLayout* lay = new TQVBoxLayout( plainPage(), 5, 5 );
 
diff --git a/parts/filecreate/filecreate_newfile.h b/parts/filecreate/filecreate_newfile.h
index c1d3b730..04239e90 100644
--- a/parts/filecreate/filecreate_newfile.h
+++ b/parts/filecreate/filecreate_newfile.h
@@ -26,8 +26,9 @@ class KLineEdit;
 namespace FileCreate {
   class NewFileChooser : public KDialogBase {
       Q_OBJECT
+  TQ_OBJECT
   public:
-    NewFileChooser(TQWidget *parent=0);
+    NewFileChooser(TQWidget *tqparent=0);
     virtual ~NewFileChooser();
     void setFileTypes(TQPtrList<FileType> typelist);
     KURL url() const;
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index e07656b9..e8fbecff 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -61,9 +61,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
 
 using namespace FileCreate;
 
-FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
-//    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
+FileCreatePart::FileCreatePart(TQObject *tqparent, const char *name, const TQStringList & )
+//    : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
+    : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_subPopups(0)
 {
   setInstance(FileCreateFactory::instance());
   setXMLFile("kdevpart_filecreate.rc");
@@ -78,7 +78,7 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin
 		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
 
-  KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new");
+  KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new");
   newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") );
   newAction->setToolTip( i18n("Create a new file") );
   m_newPopupMenu = newAction->popupMenu();
@@ -210,8 +210,8 @@ void FileCreatePart::slotProjectClosed() {
 void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
 
   KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
-                                                          TQString::null,
-                                                          TQString::null,
+                                                          TQString(),
+                                                          TQString(),
                                                           filetype->subtypeRef());
 
   openCreatedFile(createdFile);
@@ -274,7 +274,7 @@ FileType * FileCreatePart::getType(const TQString & ex, const TQString subtRef)
 
   TQString subtypeRef = subtRef;
   TQString ext = ex;
-  int dashPos = ext.find('-');
+  int dashPos = ext.tqfind('-');
   if (dashPos>-1 && subtRef.isNull()) {
     ext = ex.left(dashPos);
     subtypeRef = ex.mid(dashPos+1);
@@ -301,7 +301,7 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su
 
   TQString subtypeRef = subtRef;
   TQString ext = ex;
-  int dashPos = ext.find('-');
+  int dashPos = ext.tqfind('-');
   if (dashPos>-1 && subtRef.isNull()) {
     ext = ex.left(dashPos);
     subtypeRef = ex.mid(dashPos+1);
@@ -383,7 +383,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   selectedURL = dialog.url();
   const FileType *selectedFileType = dialog.selectedType();
 
-  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesQMakeBuildSystem) ) {
+  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) {
     result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
     return result;
   }
@@ -425,7 +425,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
     // work out the path relative to the project directory
 //    TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
 	  TQString relToProj;
-	  if( project()->options() & KDevProject::UsesQMakeBuildSystem )
+	  if( project()->options() & KDevProject::UsesTQMakeBuildSystem )
 	  {
 		relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath );
 		  project()->addFile(relToProj);
@@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
 }
 
 void FileCreatePart::slotNoteFiletype(const FileType * filetype) {
-  kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl;
+  kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::tqfromLatin1("Null") ) << endl;
   m_filedialogFiletype = filetype;
 }
 
@@ -483,7 +483,7 @@ void FileCreatePart::slotInitialize( )
         }
       } else {
         // if an extension + subtype have been specified, enable
-        // the subtype and the extension (the 'parent')
+        // the subtype and the extension (the 'tqparent')
         FileType * filetype = getType(ext);
         FileType * subtype = getType(ext,subtyperef);
         if (filetype && subtype) {
@@ -501,9 +501,9 @@ void FileCreatePart::slotInitialize( )
     TQDir templDir( project()->projectDirectory() + "/templates/" );
     if (templDir.exists()) {
       templDir.setFilter( TQDir::Files );
-      const QFileInfoList * list = templDir.entryInfoList();
+      const TQFileInfoList * list = templDir.entryInfoList();
       if( list ){
-        QFileInfoListIterator it( *list );
+        TQFileInfoListIterator it( *list );
         TQFileInfo *fi;
         while ( (fi = it.current()) != 0 ) {
           addFileType(fi->fileName());
@@ -559,4 +559,4 @@ void FileCreatePart::slotGlobalInitialize( )
 
 #include "filecreate_part.moc"
 
-// kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on;
+// kate: indent-width 2; tqreplace-tabs on; tab-width 4; space-indent on;
diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h
index 605f6fbf..c8da5b27 100644
--- a/parts/filecreate/filecreate_part.h
+++ b/parts/filecreate/filecreate_part.h
@@ -39,10 +39,11 @@ using namespace FileCreate;
 class FileCreatePart : public KDevCreateFile
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class FCConfigWidget;
 public:
-  FileCreatePart(TQObject *parent, const char *name, const TQStringList &);
+  FileCreatePart(TQObject *tqparent, const char *name, const TQStringList &);
   virtual ~FileCreatePart();
 
   /**
@@ -52,26 +53,26 @@ public:
 
   /**
    * Call this method to create a new file, within or without the project. Supply as
-   * much information as you know. Leave what you don't know as TQString::null.
+   * much information as you know. Leave what you don't know as TQString().
    * The user will be prompted as necessary for the missing information, and the
    * file created, and added to the project as necessary.
    */
-  virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString::null,
-                     TQString dir = TQString::null,
-                     TQString name = TQString::null,
-                     TQString subtype = TQString::null);
+  virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
+                     TQString dir = TQString(),
+                     TQString name = TQString(),
+                     TQString subtype = TQString());
 
   /**
    * Finds the file type object for a given extension and optionally subtype.
    * You can omit the subtype and specify the extension as ext-subtype if you wish.
    */
-  FileType * getType(const TQString & ext, const TQString subtype = TQString::null);
+  FileType * getType(const TQString & ext, const TQString subtype = TQString());
   /**
    * Finds the file type object for a given extension and optionally subtype.
    * You can omit the subtype and specify the extension as ext-subtype if you wish.
    * Returns only enabled type (i.e. used in the project).
    */
-  FileType * getEnabledType(const TQString & ext, const TQString subtype = TQString::null);
+  FileType * getEnabledType(const TQString & ext, const TQString subtype = TQString());
 
 public slots:
 
diff --git a/parts/filecreate/filecreate_typechoosersig.h b/parts/filecreate/filecreate_typechoosersig.h
index 233afe70..ad98fa68 100644
--- a/parts/filecreate/filecreate_typechoosersig.h
+++ b/parts/filecreate/filecreate_typechoosersig.h
@@ -9,6 +9,7 @@ class FileType;
 
 class Signaller : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   Signaller() : TQObject() { } 
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 10816904..5c39393b 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -67,7 +67,7 @@ namespace FileCreate {
       else kdDebug(9034) << "No match!" << endl;
     }
 
-    // If an exact match is not found (e.g. current points to a 'parent' type) then
+    // If an exact match is not found (e.g. current points to a 'tqparent' type) then
     // look instead for an extension match
     if (changeToRow==-1) {
       for(it = typeForRow.begin(); it!= typeForRow.end() && changeToRow==-1; ++it) {
@@ -164,7 +164,7 @@ namespace FileCreate {
       return;
     }
 
-    m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL;
+    m_selected = typeForRow.tqcontains(row) ? typeForRow[row] : NULL;
     TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) );
 
   }
@@ -191,7 +191,7 @@ namespace FileCreate {
       if( !i )
          continue;
 
-      TQSize size = i->sizeHint();
+      TQSize size = i->tqsizeHint();
       maxHeight = size.height()>maxHeight ? size.height() : maxHeight;
     }
     setRowHeight(row,maxHeight+2); // bit of extra room
@@ -206,13 +206,13 @@ namespace FileCreate {
       if( !i )
          continue;
 
-      TQSize size = item(r,col)->sizeHint();
+      TQSize size = item(r,col)->tqsizeHint();
       maxWidth = size.width()>maxWidth ? size.width() : maxWidth;
     }
     setColumnWidth(col,maxWidth+2); // bit of extra room
   }
 
-#if QT_VERSION < 0x030100
+#if [[[TQT_VERSION IS DEPRECATED]]] < 0x030100
   void FriendlyWidget::selectRow(int row) {
     if (numCols()>0 && row<numRows()) {
       TQTableSelection sel;
diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h
index 0e909d41..a8a3b38e 100644
--- a/parts/filecreate/filecreate_widget2.h
+++ b/parts/filecreate/filecreate_widget2.h
@@ -31,6 +31,7 @@ namespace FileCreate {
   class FriendlyWidget : public TQTable, public TypeChooser
     {
       Q_OBJECT
+  TQ_OBJECT
 
       public:
 
@@ -46,10 +47,6 @@ namespace FileCreate {
 	 */
 	virtual void setCurrent(const FileType * current);
 
-#if QT_VERSION < 0x030100
-        void selectRow(int row);
-#endif
-
       protected:
 	/**
 	 * Sets row <i>row</i> to filetype <i>filetype</i>.
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index 5d307bff..282426c0 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -70,7 +70,7 @@ namespace FileCreate {
 	lvi = lvi->nextSibling();
       else {
 	while (lvi && !lvi->nextSibling())
-	  lvi = lvi->parent();
+	  lvi = lvi->tqparent();
       }
     }
 
diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h
index db2a6b13..89201539 100644
--- a/parts/filecreate/filecreate_widget3.h
+++ b/parts/filecreate/filecreate_widget3.h
@@ -30,6 +30,7 @@ namespace FileCreate {
   class ListWidget : public KListView, public TypeChooser
     {
       Q_OBJECT
+  TQ_OBJECT
 
       public:
 
diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp
index 07817479..4e53e9f3 100644
--- a/parts/filelist/filelist_item.cpp
+++ b/parts/filelist/filelist_item.cpp
@@ -20,8 +20,8 @@
 
 FileListItem * FileListItem::s_activeItem = 0;
 
-FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState state )
-	: TQListViewItem( parent, url.fileName() ),
+FileListItem::FileListItem( TQListView * tqparent, KURL const & url, DocumentState state )
+	: TQListViewItem( tqparent, url.fileName() ),
 	_url( url )
 
 {
@@ -73,7 +73,7 @@ void FileListItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column
 
 	if ( isActive() )
 	{
-		mcg.setColor( TQColorGroup::Base, Qt::yellow );
+		mcg.setColor( TQColorGroup::Base, TQt::yellow );
 	}
 
 	TQListViewItem::paintCell( p, mcg, column, width, align );
diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h
index 7f9f7965..fd0d0a77 100644
--- a/parts/filelist/filelist_item.h
+++ b/parts/filelist/filelist_item.h
@@ -20,10 +20,10 @@
 
 #include <kdevpartcontroller.h>
 
-class FileListItem : public QListViewItem
+class FileListItem : public TQListViewItem
 {
 public:
-	FileListItem( TQListView * parent, KURL const & url, DocumentState = Clean );
+	FileListItem( TQListView * tqparent, KURL const & url, DocumentState = Clean );
 
 	KURL url();
 
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 6f494f93..e31f3fbd 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -34,8 +34,8 @@
  * @param part 
  * @return 
  */
-FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent)
- : KListView(parent), TQToolTip( viewport() ), _part( part )
+FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *tqparent)
+ : KListView(tqparent), TQToolTip( viewport() ), _part( part )
 {
 	addColumn( "" );
 	header()->hide();
@@ -81,7 +81,7 @@ void FileListWidget::startRefreshTimer( )
 void FileListWidget::maybeTip( TQPoint const & p )
 {
 	FileListItem * item = static_cast<FileListItem*>( itemAt( p ) );
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if ( item && r.isValid() )
 	{
@@ -208,7 +208,7 @@ void FileListWidget::activePartChanged( KParts::Part * part )
 			item = static_cast<FileListItem*>( item->nextSibling() );
 		}
 	}
-	repaintContents();
+	tqrepaintContents();
 }
 
 void FileListWidget::documentChangedState( const KURL & url, DocumentState state )
@@ -287,7 +287,7 @@ void FileListWidget::restoreSelections(const TQStringList & list)
 	TQListViewItem * item = firstChild();
 	while ( item )
 	{
-		if ( list.contains( item->text(0) ) )
+		if ( list.tqcontains( item->text(0) ) )
 		{
 			item->setSelected( true );
 		}
diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h
index d30aa6f6..f2c2bd51 100644
--- a/parts/filelist/filelist_widget.h
+++ b/parts/filelist/filelist_widget.h
@@ -30,13 +30,14 @@ class FileListItem;
 
 namespace KParts { class Part; }
 
-class FileListWidget : public KListView, public QToolTip
+class FileListWidget : public KListView, public TQToolTip
 {
   Q_OBJECT
+  TQ_OBJECT
     
 public:
 		  
-	FileListWidget(ProjectviewPart *part, TQWidget *parent=0);
+	FileListWidget(ProjectviewPart *part, TQWidget *tqparent=0);
   	~FileListWidget();
 	
 protected:
diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp
index 0f138e1a..c552a5fd 100644
--- a/parts/filelist/projectviewconfig.cpp
+++ b/parts/filelist/projectviewconfig.cpp
@@ -25,8 +25,8 @@
 #include <kapplication.h>
 
 
-ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name)
-    : ProjectviewConfigBase(parent, name)
+ProjectviewConfig::ProjectviewConfig(TQWidget *tqparent, const char *name)
+    : ProjectviewConfigBase(tqparent, name)
 {
   KConfig * config = kapp->config();
   config->setGroup("File List Plugin");
diff --git a/parts/filelist/projectviewconfig.h b/parts/filelist/projectviewconfig.h
index 44195ab0..d81de3a9 100644
--- a/parts/filelist/projectviewconfig.h
+++ b/parts/filelist/projectviewconfig.h
@@ -27,8 +27,9 @@
 class ProjectviewConfig: public ProjectviewConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProjectviewConfig(TQWidget *parent = 0, const char *name = 0);
+    ProjectviewConfig(TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui
index 7a0241db..ba22dcd7 100644
--- a/parts/filelist/projectviewconfigbase.ui
+++ b/parts/filelist/projectviewconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ProjectviewConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectviewConfigBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>inToolview</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <string>Uncheck this if you want the toolbar together with all other toolbars. You can disable it then</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>onlyProject</cstring>
             </property>
@@ -53,7 +53,7 @@
                 <string>Check this if you want to ignore files that are not part of the project</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>closeOpenFiles</cstring>
             </property>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>61</height>
@@ -89,5 +89,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 91b46b53..c3341cd8 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -68,8 +68,8 @@ K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data))
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "FileListPart")
+ProjectviewPart::ProjectviewPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, tqparent, name ? name : "FileListPart")
 {
     setInstance(projectviewFactory::instance());
     setXMLFile("kdevfilelist.rc");
@@ -107,7 +107,7 @@ ProjectviewPart::~ProjectviewPart()
   delete m_guibuilder;
   if ( m_widget ) {
     mainWindow()->removeView( m_widget );
-    delete m_widget;  // deletes the children as well
+    delete m_widget;  // deletes the tqchildren as well
   }
 }
 
@@ -389,7 +389,7 @@ void ProjectviewPart::slotOpenProjectView(const TQString &view)
     
     m_currentProjectView = view;
     
-    if (m_projectViews.contains(view) > 0)
+    if (m_projectViews.tqcontains(view) > 0)
     {
         FileInfoList viewUrls = m_projectViews[view];
         
@@ -400,7 +400,7 @@ void ProjectviewPart::slotOpenProjectView(const TQString &view)
             for (KURL::List::Iterator it = urlsToClose.begin(); it != urlsToClose.end(); ++it)
             {
                 // it is in the list of wanted files and do we want it at all
-                if ((viewUrls.contains(*it) > 0) && (!onlyProject || !project() ||  project()->isProjectFile((*it).path()) ))
+                if ((viewUrls.tqcontains(*it) > 0) && (!onlyProject || !project() ||  project()->isProjectFile((*it).path()) ))
                 {
                     viewUrls.remove(*it); // don't open if it is open already
                     it = urlsToClose.remove(it);
@@ -439,7 +439,7 @@ void ProjectviewPart::adjustViewActions()
     
     m_openPrjViewAction->clear();
     m_openPrjViewAction->setItems(viewList);
-    int i = viewList.findIndex(m_currentProjectView);
+    int i = viewList.tqfindIndex(m_currentProjectView);
     if (i > -1)
     {
         m_openPrjViewAction->setCurrentItem(i);
@@ -490,8 +490,8 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName)
             return;
         }
         newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it
-        if (m_projectViews.contains(newProjectView) > 0 &&
-            KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newProjectView), TQString::null, i18n("Overwrite")) != KMessageBox::Continue)
+        if (m_projectViews.tqcontains(newProjectView) > 0 &&
+            KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
         {
             return;
         }
diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h
index 7c8d8de3..c8555f8b 100644
--- a/parts/filelist/projectviewpart.h
+++ b/parts/filelist/projectviewpart.h
@@ -56,13 +56,14 @@ FIXME at project open I get the default view and the open files at last close
 class ProjectviewPart: public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
  
   typedef TQMap<TQString, FileInfoList> ViewMap;
 //   typedef TQMap<KURL, FileInfo> FileInfoMap;
   
   
-  ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args);
+  ProjectviewPart(TQObject *tqparent, const char *name, const TQStringList &args);
   ~ProjectviewPart();
   
   // reimplemented from KDevPlugin
diff --git a/parts/filelist/projectviewprojectconfig.cpp b/parts/filelist/projectviewprojectconfig.cpp
index b411dbbd..0b471ff1 100644
--- a/parts/filelist/projectviewprojectconfig.cpp
+++ b/parts/filelist/projectviewprojectconfig.cpp
@@ -24,8 +24,8 @@
 
 #include "projectviewpart.h"
 
-ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent, const char *name)
-    : ProjectviewProjectConfigBase(parent, name), m_part(part)
+ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *tqparent, const char *name)
+    : ProjectviewProjectConfigBase(tqparent, name), m_part(part)
 {
   kComboDefault->clear();
   kComboDefault->insertItem("");
diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h
index 0c36db2f..2a7ee5c5 100644
--- a/parts/filelist/projectviewprojectconfig.h
+++ b/parts/filelist/projectviewprojectconfig.h
@@ -28,8 +28,9 @@ class ProjectviewPart;
 class ProjectviewProjectConfig: public ProjectviewProjectConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0);
+    ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui
index 7ff9a0b0..a6b2643c 100644
--- a/parts/filelist/projectviewprojectconfigbase.ui
+++ b/parts/filelist/projectviewprojectconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ProjectviewProjectConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectviewProjectConfigBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -61,7 +61,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>265</width>
                     <height>20</height>
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>71</height>
@@ -87,7 +87,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp
index b4e1a993..f2123d60 100644
--- a/parts/filelist/toolbarguibuilder.cpp
+++ b/parts/filelist/toolbarguibuilder.cpp
@@ -22,8 +22,8 @@
 
 #include <ktoolbar.h>
 
-ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget)
-  : KXMLGUIBuilder(widget), KToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent)
+ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *tqparent, TQWidget *widget)
+  : KXMLGUIBuilder(widget), KToolBar(tqparent, "ToolbarGUIbuilder"), m_parent(tqparent)
 {
 //   setHidden(true);
   setFrameStyle(0);
@@ -34,7 +34,7 @@ ToolbarGUIBuilder::~ToolbarGUIBuilder()
 {
 }
 
-TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id)
+TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id)
 {
   if (element.tagName().lower() == "toolbar")
   {
@@ -42,11 +42,11 @@ TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const
     return this;
   } else
   {
-    return KXMLGUIBuilder::createContainer(parent, index, element, id);
+    return KXMLGUIBuilder::createContainer(tqparent, index, element, id);
   }
 }
 
-void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id)
+void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id)
 {
   if (container == this)
   {
@@ -54,6 +54,6 @@ void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, T
     reparent(0, TQPoint(0, 0));
   }
   else
-    KXMLGUIBuilder::removeContainer(container, parent, element, id);
+    KXMLGUIBuilder::removeContainer(container, tqparent, element, id);
 }
 
diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h
index ec02c371..c3b6ef51 100644
--- a/parts/filelist/toolbarguibuilder.h
+++ b/parts/filelist/toolbarguibuilder.h
@@ -34,20 +34,20 @@
 class ToolbarGUIBuilder : public KXMLGUIBuilder, public KToolBar
 {
 public:
-  ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget);
+  ToolbarGUIBuilder(TQWidget *tqparent, TQWidget *widget);
 
   virtual ~ToolbarGUIBuilder();
   
   /**
   * Called when a new XML gui client is added to the gui factory. 
   */
-  virtual TQWidget *createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id);
+  virtual TQWidget *createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id);
   
   /**
    * Called when a XML gui client is removed the gui factory. 
    * Reimplemented from KXMLGUIBuilder in order to remove our custom toolbar.
    */
-  virtual void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id);
+  virtual void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id);
   
 private:
   TQWidget * m_parent;
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 4e30fe50..baf4dc86 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -34,8 +34,8 @@ typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory;
 static const KDevPluginInfo data("kdevfileselector");
 K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
 
-FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
+FileSelectorPart::FileSelectorPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "FileSelectorPart")
 {
     setInstance(FileSelectorFactory::instance());
 
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index ae8012ea..d2e8d9ec 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -14,8 +14,9 @@ class KDialogBase;
 class FileSelectorPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FileSelectorPart(TQObject *parent, const char *name, const TQStringList &);
+    FileSelectorPart(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~FileSelectorPart();
 
     KAction *newFileAction() const { return m_newFileAction; }
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 804270e1..e9e60f47 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -72,12 +72,12 @@
 
 
 // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
-static void silenceQToolBar(QtMsgType, const char *)
+static void silenceTQToolBar(TQtMsgType, const char *)
 {}
 
 
-KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent)
-        : KToolBar( parent, "KDev FileSelector Toolbar", true )
+KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *tqparent)
+        : KToolBar( tqparent, "KDev FileSelector Toolbar", true )
 {
     setMinimumWidth(10);
 }
@@ -91,8 +91,8 @@ void KDevFileSelectorToolBar::setMovingEnabled( bool)
 }
 
 
-KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent)
-        :TQFrame(parent),m_tb(0)
+KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *tqparent)
+        :TQFrame(tqparent),m_tb(0)
 {}
 KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent()
 {}
@@ -105,7 +105,7 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
     if (m_tb)
     {
-        setMinimumHeight(m_tb->sizeHint().height());
+        setMinimumHeight(m_tb->tqsizeHint().height());
         m_tb->resize(width(),height());
     }
 }
@@ -115,8 +115,8 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 
 KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow,
                                     KDevPartController *partController,
-                                    TQWidget * parent, const char * name )
-        : TQWidget(parent, name),
+                                    TQWidget * tqparent, const char * name )
+        : TQWidget(tqparent, name),
         m_part(part),
         mainwin(mainWindow),
         partController(partController)
@@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
 
     TQVBoxLayout* lo = new TQVBoxLayout(this);
 
-    QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
+    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
 
     KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
     toolbar = new KDevFileSelectorToolBar(tbp);
@@ -133,10 +133,10 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     lo->addWidget(tbp);
     toolbar->setMovingEnabled(false);
     toolbar->setFlat(true);
-    qInstallMsgHandler( oldHandler );
+    tqInstallMsgHandler( oldHandler );
 
     cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-    cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+    cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
     cmbPath->setCompletionObject( cmpl );
     lo->addWidget(cmbPath);
@@ -171,7 +171,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     btnFilter->setIconSet( SmallIconSet("filter" ) );
     btnFilter->setToggleButton( true );
     filter = new KHistoryCombo( true, filterBox, "filter");
-    filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+    filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     filterBox->setStretchFactor(filter, 2);
     connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
     lo->addWidget(filterBox);
@@ -186,7 +186,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
 
     // kaction for the dir sync method
     acSyncDir = new KAction( i18n("Current Document Directory"), "dirsynch", 0,
-                             this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+                             TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
     toolbar->setIconText( KToolBar::IconOnly );
     toolbar->setIconSize( 16 );
     toolbar->setEnableContextMenu( false );
@@ -209,7 +209,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
              this, TQT_SLOT( setDir( const TQString& ) ) );
 
-    waitingUrl = TQString::null;
+    waitingUrl = TQString();
 
     // whatsthis help
     TQWhatsThis::add
@@ -349,10 +349,10 @@ void KDevFileSelector::slotFilterChange( const TQString & nf )
     if ( empty )
     {
         dir->clearFilter();
-        filter->lineEdit()->setText( TQString::null );
+        filter->lineEdit()->setText( TQString() );
         TQToolTip::add
             ( btnFilter,
-                    TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) );
+                    TQString( i18n("Apply last filter (\"%1\")") ).tqarg( lastFilter ) );
     }
     else
     {
@@ -415,7 +415,7 @@ void KDevFileSelector::btnFilterClick()
 {
     if ( !btnFilter->isOn() )
     {
-        slotFilterChange( TQString::null );
+        slotFilterChange( TQString() );
     }
     else
     {
@@ -432,7 +432,7 @@ void KDevFileSelector::autoSync()
     if ( isVisible() )
     {
         setActiveDocumentDir();
-        waitingUrl = TQString::null;
+        waitingUrl = TQString();
     }
     // else set waiting url
     else
@@ -454,13 +454,13 @@ void KDevFileSelector::autoSync( KParts::Part *part )
     KURL u ( doc->url() );
     if ( u.isEmpty() )
     {
-        waitingUrl = TQString::null;
+        waitingUrl = TQString();
         return;
     }
     if ( isVisible() )
     {
         setDir( u.directory() );
-        waitingUrl = TQString::null;
+        waitingUrl = TQString();
     }
     else
     {
@@ -499,13 +499,13 @@ void KDevFileSelector::showEvent( TQShowEvent * )
     {
         kdDebug()<<"syncing fs on show"<<endl;
         setActiveDocumentDir();
-        waitingUrl = TQString::null;
+        waitingUrl = TQString();
     }
     // else, if we have a waiting URL set it
     else if ( ! waitingUrl.isEmpty() )
     {
         setDir( waitingUrl );
-        waitingUrl = TQString::null;
+        waitingUrl = TQString();
     }
 }
 
@@ -519,11 +519,11 @@ bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
         And the popup is rather useless, if the paths are only partly visible.
     */
     TQListBox *lb = cmbPath->listBox();
-    if ( o == lb && e->type() == TQEvent::Show )
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show )
     {
         int add
             = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
-        int w = QMIN( mainwin->main()->width(), lb->contentsWidth() + add );
+        int w = TQMIN( mainwin->main()->width(), lb->contentsWidth() + add );
         lb->resize( w, lb->height() );
         /// @todo - move the listbox to a suitable place if nessecary
         /// @todo - decide if it is worth caching the size while untill the contents
@@ -537,16 +537,16 @@ bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
 
 //BEGIN ACtionLBItem
 /*
-   QListboxItem that can store and return a string,
+   TQListboxItem that can store and return a string,
    used for the toolbar action selector.
 */
-class ActionLBItem : public QListBoxPixmap
+class ActionLBItem : public TQListBoxPixmap
 {
 public:
     ActionLBItem( TQListBox *lb=0,
                   const TQPixmap &pm = TQPixmap(),
-                  const TQString &text=TQString::null,
-                  const TQString &str=TQString::null ) :
+                  const TQString &text=TQString(),
+                  const TQString &str=TQString() ) :
             TQListBoxPixmap( lb, pm, text ),
             _str(str)
     {}
@@ -575,8 +575,8 @@ KURL KDevFileSelector::activeDocumentUrl( )
 ////////////////////////////////////////////////////////////////////////////////
 // KFSConfigPage implementation
 ////////////////////////////////////////////////////////////////////////////////
-KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs )
-        : TQWidget( parent, name ),
+KFSConfigPage::KFSConfigPage( TQWidget *tqparent, const char *name, KDevFileSelector *kfs )
+        : TQWidget( tqparent, name ),
         fileSelector( kfs ),
         bDirty( false )
 {
@@ -762,13 +762,13 @@ void KFSConfigPage::init()
     TQListBox *lb;
     for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it )
     {
-        lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
+        lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
         if ( *it == "bookmarks" || *it == "sync_dir" )
             ac = fileSelector->actionCollection()->action( (*it).latin1() );
         else
             ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
         if ( ac )
-            new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
+            new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
     }
 
     // sync
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index 4811c398..cf06d42a 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -60,18 +60,20 @@ namespace KTextEditor
 class KDevFileSelectorToolBar: public KToolBar
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevFileSelectorToolBar(TQWidget *parent);
+    KDevFileSelectorToolBar(TQWidget *tqparent);
     virtual ~KDevFileSelectorToolBar();
 
     virtual void setMovingEnabled( bool b );
 };
 
-class KDevFileSelectorToolBarParent: public QFrame
+class KDevFileSelectorToolBarParent: public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevFileSelectorToolBarParent(TQWidget *parent);
+    KDevFileSelectorToolBarParent(TQWidget *tqparent);
     ~KDevFileSelectorToolBarParent();
     void setToolBar(KDevFileSelectorToolBar *tb);
 
@@ -85,9 +87,10 @@ protected:
 class KDevDirOperator: public KDirOperator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
-        :KDirOperator(urlName, parent, name), m_part(part)
+    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *tqparent=0, const char *name=0)
+        :KDirOperator(urlName, tqparent, name), m_part(part)
     {
     }
 
@@ -98,9 +101,10 @@ private:
     FileSelectorPart *m_part;
 };
 
-class KDevFileSelector : public QWidget
+class KDevFileSelector : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class KFSConfigPage;
 
@@ -109,7 +113,7 @@ public:
     enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 };
 
     KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0,
-                      TQWidget * parent = 0, const char * name = 0 );
+                      TQWidget * tqparent = 0, const char * name = 0 );
     ~KDevFileSelector();
 
     void readConfig( KConfig *, const TQString & );
@@ -174,11 +178,12 @@ private:
     of the path and file filter combos, and how to handle
     user closed session.
 */
-class KFSConfigPage : public QWidget
+class KFSConfigPage : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
+    KFSConfigPage( TQWidget* tqparent=0, const char *name=0, KDevFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
 
 public slots:
diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp
index 0534901b..3bf21922 100644
--- a/parts/fileselector/kactionselector.cpp
+++ b/parts/fileselector/kactionselector.cpp
@@ -46,8 +46,8 @@ class KActionSelectorPrivate {
 
 //BEGIN Constructor/destructor
 
-KActionSelector::KActionSelector( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+KActionSelector::KActionSelector( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   d = new KActionSelectorPrivate();
   d->moveOnDoubleClick = true;
@@ -342,7 +342,7 @@ void KActionSelector::polish()
 void KActionSelector::keyPressEvent( TQKeyEvent *e )
 {
   if ( ! d->keyboardEnabled ) return;
-  if ( (e->state() & Qt::ControlButton) )
+  if ( (e->state() & TQt::ControlButton) )
   {
     switch ( e->key() )
     {
@@ -369,7 +369,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress )
   {
-    if  ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) )
+    if  ( (((TQKeyEvent*)e)->state() & TQt::ControlButton) )
     {
       switch ( ((TQKeyEvent*)e)->key() )
       {
diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h
index 2b49114f..9bcbeeea 100644
--- a/parts/fileselector/kactionselector.h
+++ b/parts/fileselector/kactionselector.h
@@ -75,18 +75,19 @@ class KActionSelectorPrivate;
 
 class KActionSelector : public TQWidget {
   Q_OBJECT
+  TQ_OBJECT
   Q_ENUMS( ButtonIconSize InsertionPolicy )
-  Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
-  Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
-  Q_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel )
-  Q_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel )
-  Q_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize )
-  Q_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy )
-  Q_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy )
-  Q_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
+  TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
+  TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
+  TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel )
+  TQ_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel )
+  TQ_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize )
+  TQ_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy )
+  TQ_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy )
+  TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
 
 public:
-  KActionSelector( TQWidget *parent=0, const char *name=0 );
+  KActionSelector( TQWidget *tqparent=0, const char *name=0 );
   ~KActionSelector();
     
   /**
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 6467b83f..68ce3189 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -35,15 +35,15 @@
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu )
-    : TQObject( parent, "KBookmarkHandler" ),
+KBookmarkHandler::KBookmarkHandler( KDevFileSelector *tqparent, KPopupMenu* kpopupmenu )
+    : TQObject( tqparent, "KBookmarkHandler" ),
       KBookmarkOwner(),
-      mParent( parent ),
+      mParent( tqparent ),
       m_menu( kpopupmenu ),
       m_importStream( 0L )
 {
     if (!m_menu)
-      m_menu = new KPopupMenu( parent, "bookmark menu" );
+      m_menu = new KPopupMenu( tqparent, "bookmark menu" );
 
     TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
     if ( file.isEmpty() )
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 86fa5031..a9ec5ad1 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -31,9 +31,10 @@ class KActionMenu;
 class KBookmarkHandler : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KBookmarkHandler( KDevFileSelector *parent, KPopupMenu *kpopupmenu=0 );
+    KBookmarkHandler( KDevFileSelector *tqparent, KPopupMenu *kpopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index b59f2ad2..112eec4a 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -20,8 +20,8 @@
 #include "addfilegroupdlg.h"
 
 
-AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name)
-    : TQDialog(parent, name, true)
+AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *tqparent, const char *name)
+    : TQDialog(tqparent, name, true)
 {
     TQLabel *title_label = new TQLabel(i18n("&Title:"), this);
     title_edit = new KLineEdit(old_title, this);
@@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
     TQFontMetrics fm(pattern_edit->fontMetrics());
     pattern_edit->setMinimumWidth(fm.width('X')*35);
     connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    layout->addLayout(grid);
+    tqlayout->addLayout(grid);
     grid->addWidget(title_label, 0, 0);
     grid->addWidget(title_edit, 0, 1);
     grid->addWidget(pattern_label, 1, 0);
@@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    layout->addWidget(frame, 0);
+    tqlayout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
     slotTextChanged();
 }
 
diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h
index 9692fe89..20c54d37 100644
--- a/parts/fileview/addfilegroupdlg.h
+++ b/parts/fileview/addfilegroupdlg.h
@@ -16,12 +16,13 @@
 #include <klineedit.h>
 class TQPushButton;
 
-class AddFileGroupDialog : public QDialog
+class AddFileGroupDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 );
+    AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *tqparent=0, const char *name=0 );
     ~AddFileGroupDialog();
 
     TQString title() const
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index c1a4f5bc..277bab4e 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -21,8 +21,8 @@
 
 
 FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part,
-                                               TQWidget *parent, const char *name)
-    : FileGroupsConfigWidgetBase(parent, name)
+                                               TQWidget *tqparent, const char *name)
+    : FileGroupsConfigWidgetBase(tqparent, name)
 {
     m_part = part;
 
diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h
index 7c2759cb..c236aa43 100644
--- a/parts/fileview/filegroupsconfigwidget.h
+++ b/parts/fileview/filegroupsconfigwidget.h
@@ -20,9 +20,10 @@ class FileGroupsPart;
 class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 );
+    FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *tqparent, const char *name=0 );
     ~FileGroupsConfigWidget();
 
 public slots:
diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui
index 3b548458..9b2779f1 100644
--- a/parts/fileview/filegroupsconfigwidgetbase.ui
+++ b/parts/fileview/filegroupsconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>FileGroupsConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>filegroups_config_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>title_label</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <cstring>listview</cstring>
                     </property>
                 </widget>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Group</string>
@@ -76,7 +76,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -97,14 +97,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addgroup_button</cstring>
                     </property>
@@ -112,7 +112,7 @@
                         <string>&amp;Add Group...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>editgroup_button</cstring>
                     </property>
@@ -120,7 +120,7 @@
                         <string>&amp;Edit Group...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>deletegroup_button</cstring>
                     </property>
@@ -138,14 +138,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>moveup_button</cstring>
                     </property>
@@ -153,7 +153,7 @@
                         <string>Move &amp;Up</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>movedown_button</cstring>
                     </property>
@@ -171,7 +171,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -217,13 +217,13 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">addGroup()</slot>
     <slot access="protected">editGroup()</slot>
     <slot access="protected">removeGroup()</slot>
     <slot access="protected">moveUp()</slot>
     <slot access="protected">moveDown()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index 4451ff2a..29dccd55 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -36,8 +36,8 @@ typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory;
 static const KDevPluginInfo data("kdevfilegroups");
 K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
 
-FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
+FileGroupsPart::FileGroupsPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "FileGroupsPart")
 {
     deleteRequested = false;
     setInstance(FileGroupsFactory::instance());
diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h
index 22cb055e..85f83164 100644
--- a/parts/fileview/filegroupspart.h
+++ b/parts/fileview/filegroupspart.h
@@ -23,9 +23,10 @@ class KDialogBase;
 class FileGroupsPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FileGroupsPart( TQObject *parent, const char *name, const TQStringList & );
+    FileGroupsPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~FileGroupsPart();
 
 public slots:
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 14f1d50c..d2b1b8ad 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -74,10 +74,10 @@ private:
 	const TQString m_pattern;
 };
 
-class FileViewFolderItem : public QListViewItem
+class FileViewFolderItem : public TQListViewItem
 {
 public:
-    FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern);
+    FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern);
     bool matches(const TQString &fileName);
 
 private:
@@ -85,8 +85,8 @@ private:
 };
 
 
-FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern)
-    : TQListViewItem(parent, name)
+FileViewFolderItem::FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern)
+    : TQListViewItem(tqparent, name)
 {
     setPixmap(0, SmallIcon("folder"));
     m_patterns.setAutoDelete(true);
@@ -97,7 +97,7 @@ FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name,
 		TQString pattern = *ci;
 		TQString tail = pattern.right( pattern.length() - 1 );
 
-		if ( (tail).contains('*') || pattern.contains('?') || pattern.contains('[') || pattern.contains(']') )
+		if ( (tail).tqcontains('*') || pattern.tqcontains('?') || pattern.tqcontains('[') || pattern.tqcontains(']') )
 		{
 			m_patterns.append( new RegExpComparator( pattern ) );
 		}
@@ -130,10 +130,10 @@ bool FileViewFolderItem::matches(const TQString &fileName)
 }
 
 
-class FileGroupsFileItem : public QListViewItem
+class FileGroupsFileItem : public TQListViewItem
 {
 public:
-    FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName);
+    FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName);
     TQString fileName() const
     { return fullname; }
 
@@ -142,8 +142,8 @@ private:
 };
 
 
-FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName)
-    : TQListViewItem(parent), fullname(fileName)
+FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName)
+    : TQListViewItem(tqparent), fullname(fileName)
 {
     setPixmap(0, SmallIcon("document"));
     TQFileInfo fi(fileName);
@@ -162,7 +162,7 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
     */
     LocationID=-1;
 
-    setFocusPolicy(ClickFocus);
+    setFocusPolicy(TQ_ClickFocus);
     setRootIsDecorated(true);
     setResizeMode(TQListView::LastColumn);
     setSorting(-1);
@@ -179,12 +179,12 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
              this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
 
     m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(),
-	this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" );
+	TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(this), "actiontoggleshowshownonprojectfiles" );
     m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files"));
     m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree."));
 
     m_actionToggleDisplayLocation = new KToggleAction( i18n("Display Location Column"), KShortcut(),
-        this, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" );
+        TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" );
     m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files."));
 
     m_part = part;
@@ -209,12 +209,12 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
     if (!item)
         return;
 
-    // toggle open state for parents
+    // toggle open state for tqparents
     if (item->childCount() > 0)
         setOpen(item, !isOpen(item));
 
     // Is it a group item?
-    if (!item->parent())
+    if (!item->tqparent())
         return;
 
     FileGroupsFileItem *fgfitem = static_cast<FileGroupsFileItem*>(item);
@@ -228,9 +228,9 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const
     popup.insertTitle(i18n("File Groups"));
     /// @todo Add, remove groups
     int customizeId = popup.insertItem(i18n("Customize..."));
-    popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
+    popup.tqsetWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
     if (item) {
-    if (item->parent()) {
+    if (item->tqparent()) {
         // Not for group items
         FileGroupsFileItem *fvfitem = static_cast<FileGroupsFileItem*>(item);
         TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName();
@@ -371,7 +371,7 @@ void FileGroupsWidget::addFile(const TQString &fileName)
         if (fvgitem->matches(fileName))
         {
             TQString f = fileName;
-            if (fileName.contains(m_part->project()->projectDirectory()))
+            if (fileName.tqcontains(m_part->project()->projectDirectory()))
                 f = fileName.mid(m_part->project()->projectDirectory().length()+1);
             (void) new FileGroupsFileItem(fvgitem, f);
 //             fvgitem->sortChildItems(0, true);
diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h
index cd7b2f63..b77bbf8d 100644
--- a/parts/fileview/filegroupswidget.h
+++ b/parts/fileview/filegroupswidget.h
@@ -21,6 +21,7 @@ class KDevProject;
 class FileGroupsWidget : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     FileGroupsWidget(FileGroupsPart *part);
diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp
index 3ccf5921..5f4478bc 100644
--- a/parts/fileview/fileitemfactory.cpp
+++ b/parts/fileview/fileitemfactory.cpp
@@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
         m_isActiveDir = false;
         setVisible( listView()->shouldBeShown( this ) );
         foundolddir = true;
-        repaint();
+        tqrepaint();
     }
 
     if ( this->path() == newdir && isDir() && !m_isActiveDir )
@@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
         m_isActiveDir = true;
         setVisible( listView()->shouldBeShown( this ) );
         foundnewdir = true;
-        repaint();
+        tqrepaint();
     }
 
     if( foundnewdir && foundolddir )
@@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
         kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl;
         m_isProjectFile = pf;
         setVisible( listView()->shouldBeShown( this ) );
-        repaint();
+        tqrepaint();
         return true;
     }
 
@@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
 ///////////////////////////////////////////////////////////////////////////////
 
 void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
-    int column, int width, int alignment)
+    int column, int width, int tqalignment)
 {
     if ( listView()->showNonProjectFiles() && isProjectFile() )
     {
@@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
         p->setFont( font );
     }
 
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 
diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h
index 065591d7..fcb606fc 100644
--- a/parts/fileview/fileitemfactory.h
+++ b/parts/fileview/fileitemfactory.h
@@ -28,20 +28,20 @@ namespace filetreeview
     {
         friend class FileTreeBranchItem;
     protected:
-        FileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf )
-        : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false )
+        FileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf )
+        : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false )
         {
             hideOrShow();
         }
-        FileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
-        : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( false )
+        FileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch )
+        : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( false )
         {
             hideOrShow();
         }
         virtual ~FileTreeViewItem() {}
 
     public:
-        virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
+        virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment );
         FileTreeWidget* listView() const;
         void hideOrShow();
         bool isProjectFile() const { return m_isProjectFile; }
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 02b7be86..a35d1a6d 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -30,9 +30,9 @@ using namespace filetreeview;
 // class FileTreeViewWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name )
-    : TQObject( parent, name ), m_branchItemFactory( 0 ),
-    m_part( parent->part() ), m_isReloadingTree( false )
+FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name )
+    : TQObject( tqparent, name ), m_branchItemFactory( 0 ),
+    m_part( tqparent->part() ), m_isReloadingTree( false )
 {
     kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl;
 
@@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl()
 
 FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const
 {
-    return static_cast<FileTreeWidget *>( parent() );
+    return static_cast<FileTreeWidget *>( TQT_TQWIDGET(tqparent()) );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt
     if (item == fileTree()->firstChild() && canReloadTree())
     {
         int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) );
-        popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
+        popupMenu->tqsetWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
     }
 
     m_actionToggleShowNonProjectFiles->plug( popupMenu );
diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h
index 621452b4..34f19ca3 100644
--- a/parts/fileview/filetreeviewwidgetimpl.h
+++ b/parts/fileview/filetreeviewwidgetimpl.h
@@ -36,11 +36,12 @@ class TQPopupMenu;
 * A base class for providing additional features to the standard KFileTreeViewItem-based widget we
 * use for listing files in project directory.
 */
-class FileTreeViewWidgetImpl : public QObject
+class FileTreeViewWidgetImpl : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name );
+    FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name );
     virtual ~FileTreeViewWidgetImpl();
 
     //! return a list containing the filenames of the currently selected items.
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index f5aa0ff4..a21ba427 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -51,8 +51,8 @@ using namespace filetreeview;
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider )
-    : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
+FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider )
+    : KFileTreeView( tqparent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
 {
     kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl;
     if (versionControl() && infoProvider)
@@ -234,7 +234,7 @@ TQString FileTreeWidget::projectDirectory()
  */
 bool FileTreeWidget::isInProject(const TQString &fileName) const
 {
-    return m_projectFiles.contains(fileName);
+    return m_projectFiles.tqcontains(fileName);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -262,10 +262,10 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr
             continue;
         kdDebug(9017) << "adding file: " << *it << endl;
         const TQString file = projectDirectory() + "/" + ( *it );
-        if ( !m_projectFiles.contains( file ) )
+        if ( !m_projectFiles.tqcontains( file ) )
         {
             // We got a new file to add to this project.
-            // Ensure all the parent directories are part of the project set, too.
+            // Ensure all the tqparent directories are part of the project set, too.
             TQStringList paths = TQStringList::split( "/", *it);
             paths.pop_back();
             while( !paths.isEmpty() )
@@ -273,10 +273,10 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr
                 // We are adding the directories from longest (the one containing our file),
                 // to the shortest, measured from root directory of our project.
                 // Whenever we find out that a directory is already recorded as part of our project,
-                // we may stop adding, because its parent directories were already added -
+                // we may stop adding, because its tqparent directories were already added -
                 // in some previous addition.
                 TQString joinedPaths = paths.join("/");
-                if( m_projectFiles.contains( joinedPaths ) )
+                if( m_projectFiles.tqcontains( joinedPaths ) )
                     break;
                 m_projectFiles.insert( projectDirectory() + "/" + joinedPaths, true );
                 paths.pop_back();
diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h
index f9608029..f7a7ac51 100644
--- a/parts/fileview/filetreewidget.h
+++ b/parts/fileview/filetreewidget.h
@@ -47,8 +47,9 @@ class KDevVersionControl;
 class FileTreeWidget : public KFileTreeView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider );
+    FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~FileTreeWidget();
 
     void openDirectory(const TQString &dirName);
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index 0e3758c9..c5d0655a 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
-	: KDevPlugin(&data, parent, name ? name : "FileViewPart"),
+FileViewPart::FileViewPart(TQObject *tqparent, const char *name, const TQStringList &)
+	: KDevPlugin(&data, tqparent, name ? name : "FileViewPart"),
     m_widget( 0 )
 {
     setInstance( FileViewFactory::instance() );
diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h
index 01f84d32..985d15ed 100644
--- a/parts/fileview/fileviewpart.h
+++ b/parts/fileview/fileviewpart.h
@@ -24,9 +24,10 @@ class KDevVersionControl;
 class FileViewPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FileViewPart( TQObject *parent, const char *name, const TQStringList & );
+    FileViewPart( TQObject *tqparent, const char *name, const TQStringList & );
     virtual ~FileViewPart();
 
     //! Colors to use for VCS visual feed-back
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index db921fb1..040f6312 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -34,11 +34,11 @@
 // class PartWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
-    : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ),
+PartWidget::PartWidget( FileViewPart *part, TQWidget *tqparent )
+    : TQVBox( tqparent, "fileviewpartwidget" ), m_filetree( 0 ),
     m_filter( 0 ), m_btnFilter( 0 ), m_part( part )
 {
-    Q_ASSERT( part && parent );
+    Q_ASSERT( part && tqparent );
 
     KDevVCSFileInfoProvider *infoProvider = 0;
     if (part && part->versionControl() && part->versionControl()->fileInfoProvider())
@@ -50,14 +50,14 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
     m_filetree->setIcon(SmallIcon("folder"));
     TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>"
                                     "The file viewer shows all files of the project "
-                                    "in a tree layout."));
+                                    "in a tree tqlayout."));
 
     TQHBox* filterBox = new TQHBox( this );
     m_btnFilter = new TQToolButton( filterBox );
     m_btnFilter->setIconSet( SmallIconSet("filter" ) );
     m_btnFilter->setToggleButton( true );
     m_filter = new KHistoryCombo( true, filterBox, "filter");
-    m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+    m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
     filterBox->setStretchFactor(m_filter, 2);
 
     connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) );
@@ -100,8 +100,8 @@ void PartWidget::slotFilterChange( const TQString & nf )
     bool empty = f.isEmpty() || f == "*";
     if ( empty )
     {
-        m_filter->lineEdit()->setText( TQString::null );
-        TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) );
+        m_filter->lineEdit()->setText( TQString() );
+        TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) );
     }
     else
     {
@@ -127,7 +127,7 @@ void PartWidget::slotBtnFilterClick()
 {
     if ( !m_btnFilter->isOn() )
     {
-        slotFilterChange( TQString::null );
+        slotFilterChange( TQString() );
     }
     else
     {
diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h
index 03090e2b..66c57228 100644
--- a/parts/fileview/partwidget.h
+++ b/parts/fileview/partwidget.h
@@ -16,11 +16,12 @@
 
 class FileViewPart;
 
-class PartWidget : public QVBox
+class PartWidget : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PartWidget( FileViewPart *part, TQWidget *parent = 0 );
+    PartWidget( FileViewPart *part, TQWidget *tqparent = 0 );
     virtual ~PartWidget();
 
     class FileTreeWidget *m_filetree;
diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp
index 67a8da28..943f8850 100644
--- a/parts/fileview/stdfiletreewidgetimpl.cpp
+++ b/parts/fileview/stdfiletreewidgetimpl.cpp
@@ -23,10 +23,10 @@
 class StdFileTreeViewItem : public filetreeview::FileTreeViewItem
 {
 public:
-    StdFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf )
-        : FileTreeViewItem( parent, item, branch, pf ) {}
-    StdFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
-        : FileTreeViewItem( parent, item, branch ) {}
+    StdFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf )
+        : FileTreeViewItem( tqparent, item, branch, pf ) {}
+    StdFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch )
+        : FileTreeViewItem( tqparent, item, branch ) {}
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,22 +39,22 @@ public:
     StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
         : FileTreeBranchItem( view, url, name, pix ) {}
     virtual ~StdFileTreeBranchItem() {}
-    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
+    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem );
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem )
+KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem )
 {
-    if (!parent || !fileItem)
+    if (!tqparent || !fileItem)
         return 0;
 
-    FileTreeWidget *lv = static_cast<StdFileTreeViewItem*>( parent )->listView();
+    FileTreeWidget *lv = static_cast<StdFileTreeViewItem*>( tqparent )->listView();
     const KURL fileURL = fileItem->url();
 
     const bool isDirectory = lv->isInProject( fileURL.path() );
 
-    return new StdFileTreeViewItem( parent, fileItem, this, isDirectory );
+    return new StdFileTreeViewItem( tqparent, fileItem, this, isDirectory );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ public:
 // class StdFileTreeWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent )
-    : FileTreeViewWidgetImpl( parent, "stdfiletreewidgetimpl" )
+StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *tqparent )
+    : FileTreeViewWidgetImpl( tqparent, "stdfiletreewidgetimpl" )
 {
     kdDebug(9017) << "StdFileTreeWidgetImpl::StdFileTreeWidgetImpl()" << endl;
 
     setBranchItemFactory( new StdBranchItemFactory );
 
-    parent->addColumn( TQString::null );
+    tqparent->addColumn( TQString() );
     header()->hide();
 }
 
diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h
index a9ba7159..260d2372 100644
--- a/parts/fileview/stdfiletreewidgetimpl.h
+++ b/parts/fileview/stdfiletreewidgetimpl.h
@@ -23,8 +23,9 @@
 class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    StdFileTreeWidgetImpl( FileTreeWidget *parent );
+    StdFileTreeWidgetImpl( FileTreeWidget *tqparent );
     virtual ~StdFileTreeWidgetImpl();
 
     /*
diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp
index 63067c04..117955d5 100644
--- a/parts/fileview/vcscolorsconfigwidget.cpp
+++ b/parts/fileview/vcscolorsconfigwidget.cpp
@@ -51,8 +51,8 @@ VCSColors &VCSColors::operator=( const VCSColors &others )
 ///////////////////////////////////////////////////////////////////////////////
 
 VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors,
-    TQWidget* parent, const char* name, WFlags fl)
-    : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part )
+    TQWidget* tqparent, const char* name, WFlags fl)
+    : VCSColorsConfigWidgetBase( tqparent, name, fl ), m_part( part )
 {
     setColors( vcsColors );
 }
diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h
index b86038fa..61d1b0e7 100644
--- a/parts/fileview/vcscolorsconfigwidget.h
+++ b/parts/fileview/vcscolorsconfigwidget.h
@@ -37,10 +37,11 @@ struct VCSColors
 class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors,
-      TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+      TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~VCSColorsConfigWidget();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/parts/fileview/vcscolorsconfigwidgetbase.ui b/parts/fileview/vcscolorsconfigwidgetbase.ui
index 7e7998ce..51f93a11 100644
--- a/parts/fileview/vcscolorsconfigwidgetbase.ui
+++ b/parts/fileview/vcscolorsconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>VCSColorsConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VCSColorsConfigWidgetBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <cstring>fileUpdatedColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -68,7 +68,7 @@
                         <cstring>fileModifiedColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel4</cstring>
                     </property>
@@ -87,7 +87,7 @@
                         <cstring>fileConflictColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -106,7 +106,7 @@
                         <cstring>fileAddedColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>textLabel5</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <cstring>fileStickyColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="6" column="0">
+                <widget class="TQLabel" row="6" column="0">
                     <property name="name">
                         <cstring>textLabel5_3</cstring>
                     </property>
@@ -144,7 +144,7 @@
                         <cstring>fileStickyColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>textLabel5_2</cstring>
                     </property>
@@ -163,7 +163,7 @@
                         <cstring>fileStickyColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="7" column="0">
+                <widget class="TQLabel" row="7" column="0">
                     <property name="name">
                         <cstring>textLabel6</cstring>
                     </property>
@@ -182,7 +182,7 @@
                         <cstring>fileUnknownColorCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="8" column="0">
+                <widget class="TQLabel" row="8" column="0">
                     <property name="name">
                         <cstring>textLabel6_2</cstring>
                     </property>
@@ -252,7 +252,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorcombo.h</includehint>
     <includehint>kcolorcombo.h</includehint>
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 131c2b4f..a513a1ae 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -42,16 +42,16 @@ using namespace filetreeview;
 class VCSFileTreeViewItem : public filetreeview::FileTreeViewItem
 {
 public:
-    VCSFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf )
-        : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
-    VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
-        : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
-    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
+    VCSFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf )
+        : FileTreeViewItem( tqparent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
+    VCSFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch )
+        : FileTreeViewItem( tqparent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
+    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
     {
         // paint cell in a different color depending on VCS state
         TQColorGroup mycg( cg );
         mycg.setColor( TQColorGroup::Base, *m_statusColor );
-        FileTreeViewItem::paintCell( p, mycg, column, width, alignment );
+        FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment );
     }
     void setVCSInfo( const VCSFileInfo &info );
 
@@ -62,7 +62,7 @@ public:
     void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); }
     void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); }
     void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); }
-    void setStatus( const VCSFileInfo::FileState status );
+    void settqStatus( const VCSFileInfo::FileState status );
 
 private:
     TQColor *m_statusColor; // cached
@@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info )
     //setFileName( info.fileName );
     setRepositoryRev( info.repoRevision );
     setWorkingRev( info.workRevision );
-    setStatus( info.state );
+    settqStatus( info.state );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status )
+void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status )
 {
     setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) );
     // Update color too
@@ -130,7 +130,7 @@ public:
         KDevVCSFileInfoProvider *vcsInfoProvider )
         : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {}
 //    virtual ~VCSFileTreeBranchItem() {}
-    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
+    virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem );
 
 private:
     KDevVCSFileInfoProvider *m_vcsInfoProvider;
@@ -138,24 +138,24 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem )
+KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem )
 {
 //  kdDebug(9017) << "MyFileTreeBranch::createTreeViewItem(): " + fileItem->url().path() << endl;
-    if (!parent || !fileItem)
+    if (!tqparent || !fileItem)
         return 0;
 
-    FileTreeWidget *lv = static_cast<filetreeview::FileTreeViewItem*>( parent )->listView();
+    FileTreeWidget *lv = static_cast<filetreeview::FileTreeViewItem*>( tqparent )->listView();
     const KURL fileURL = fileItem->url();
     const bool isDirectory = lv->isInProject( fileURL.path() );
 
-    VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory );
+    VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( tqparent, fileItem, this, isDirectory );
 
 //     TQString fileName = fileURL.fileName();
 //     TQString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() );
 
 //     const VCSFileInfoMap &vcsFiles = *m_vcsInfoProvider->status( dirName );
 //  kdDebug(9017) << "Dir has " << vcsFiles.count() << " registered files!" << endl;
-//     if (vcsFiles.contains( fileName ))
+//     if (vcsFiles.tqcontains( fileName ))
 //         newItem->setVCSInfo( vcsFiles[ fileName ] );
 //            else
 //                kdDebug(9017) << "!!!No VCS info for this file!!!" << endl;
@@ -182,8 +182,8 @@ private:
 // class VCSFileTreeWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider )
-    : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ),
+VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider )
+    : FileTreeViewWidgetImpl( tqparent, "vcsfiletreewidgetimpl" ),
     m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ),
     m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 )
 {
@@ -193,10 +193,10 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil
     setBranchItemFactory( new VCSBranchItemFactory( m_vcsInfoProvider ) );
 
     // Update the #define order on top if you change this order!
-    parent->addColumn( "Filename" );
-    parent->addColumn( "Status" );
-    parent->addColumn( "Work" );
-    parent->addColumn( "Repo" );
+    tqparent->addColumn( "Filename" );
+    tqparent->addColumn( "tqStatus" );
+    tqparent->addColumn( "Work" );
+    tqparent->addColumn( "Repo" );
 
     connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)),
         this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) );
@@ -218,7 +218,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil
     TQDomDocument &dom = projectDom();
     m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") );
     slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings
-    connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
+    connect( tqparent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@ void VCSFileTreeWidgetImpl::vcsDirStatusReady( const VCSFileInfoMap &modifiedFil
     {
         const TQString fileName = item->fileName();
         kdDebug(9017) << "Widget item filename is: " << fileName << endl;
-        if (modifiedFiles.contains( fileName ))
+        if (modifiedFiles.tqcontains( fileName ))
         {
             const VCSFileInfo &vcsInfo = modifiedFiles[ fileName ];
             kdDebug(9017) << "Nice! Found info for this file: " << vcsInfo.toString() << endl;
@@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
     const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem );
     const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
     kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl;
-    m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem );
+    m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem );
     m_isSyncingWithRepository = true;
 }
 
@@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem )
 
     const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
     kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl;
-    m_vcsInfoProvider->requestStatus( relDirPath, item, false, false );
+    m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false );
 
 //     m_isSyncingWithRepository = true;
 
diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h
index 7a6761a9..b88766a5 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.h
+++ b/parts/fileview/vcsfiletreewidgetimpl.h
@@ -25,8 +25,9 @@ class KToggleAction;
 class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider );
+    VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider );
     virtual ~VCSFileTreeWidgetImpl();
 
     /*
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index dbb0dfc6..9824cdc9 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -29,8 +29,8 @@
 static const KDevPluginInfo data("kdevfilter");
 K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
 
-FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FilterPart")
+FilterPart::FilterPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "FilterPart")
 {
     setInstance(FilterFactory::instance());
     setXMLFile("kdevfilter.rc");
diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h
index 55b89dbc..939590ed 100644
--- a/parts/filter/filterpart.h
+++ b/parts/filter/filterpart.h
@@ -22,9 +22,10 @@ class ShellFilterDialog;
 class FilterPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FilterPart( TQObject *parent, const char *name, const TQStringList & );
+    FilterPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~FilterPart();
 
 public slots:
diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h
index d51acdbc..9d22c46b 100644
--- a/parts/filter/kdevfilterIface.h
+++ b/parts/filter/kdevfilterIface.h
@@ -10,6 +10,7 @@ class FilterPart;
 class KDevFilterIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
     KDevFilterIface( FilterPart* part );
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 484cb4cc..740762d2 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -31,18 +31,18 @@
 ShellFilterDialog::ShellFilterDialog()
     : TQDialog(0, "shell filter dialog", true)
 {
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
 
     combo = new TQComboBox(true, this);
     combo->setDuplicatesEnabled(false);
-    layout->addWidget(combo);
+    tqlayout->addWidget(combo);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     start_button = buttonbox->addButton(i18n("&Start"));
     start_button->setDefault(true);
     cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->layout();
-    layout->addWidget(buttonbox);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox);
 
     connect( start_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(slotStartClicked()) );
@@ -120,7 +120,7 @@ void ShellFilterDialog::slotProcessExited(KProcess *)
         accept();
     } else {
         KMessageBox::error(this, i18n("Process exited with status %1")
-                           .arg(m_proc->exitStatus()));
+                           .tqarg(m_proc->exitStatus()));
         reject();
     }
 }
diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h
index 78785a11..842ea928 100644
--- a/parts/filter/shellfilterdlg.h
+++ b/parts/filter/shellfilterdlg.h
@@ -20,9 +20,10 @@ class KDevPlugin;
 class KProcess;
 
 
-class ShellFilterDialog : public QDialog
+class ShellFilterDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ShellFilterDialog();
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index e36278b5..17e740b6 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -32,18 +32,18 @@
 ShellInsertDialog::ShellInsertDialog()
     : TQDialog(0, "shell filter dialog", true)
 {
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
 
     combo = new TQComboBox(true, this);
     combo->setDuplicatesEnabled(false);
-    layout->addWidget(combo);
+    tqlayout->addWidget(combo);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     start_button = buttonbox->addButton(i18n("&Start"));
     start_button->setDefault(true);
     cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->layout();
-    layout->addWidget(buttonbox);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox);
 
     connect( start_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(slotStartClicked()) );
@@ -117,7 +117,7 @@ void ShellInsertDialog::slotProcessExited(KProcess *)
         accept();
     } else {
         KMessageBox::error(this, i18n("Process exited with status %1")
-                           .arg(m_proc->exitStatus()));
+                           .tqarg(m_proc->exitStatus()));
         reject();
     }
 }
diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h
index d532079f..b6954ade 100644
--- a/parts/filter/shellinsertdlg.h
+++ b/parts/filter/shellinsertdlg.h
@@ -20,9 +20,10 @@ class KDevPlugin;
 class KProcess;
 
 
-class ShellInsertDialog : public QDialog
+class ShellInsertDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     ShellInsertDialog();
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index b3c2240f..63e40e89 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -27,8 +27,8 @@ static const KDevPluginInfo data("kdevfullscreen");
 typedef KDevGenericFactory<FullScreenPart> FullScreenFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) )
 
-FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
+FullScreenPart::FullScreenPart(TQObject *tqparent, const char *name, const TQStringList& )
+  : KDevPlugin(&data, tqparent, name ? name : "FullScreenPart" )
 {
   setInstance(FullScreenFactory::instance());
 //  const KAboutData &abdata1 = *(info());
diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h
index 1b5fe53e..d248f686 100644
--- a/parts/fullscreen/fullscreen_part.h
+++ b/parts/fullscreen/fullscreen_part.h
@@ -20,8 +20,9 @@ class KAction;
 class FullScreenPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    FullScreenPart(TQObject *parent, const char *name, const TQStringList &);
+    FullScreenPart(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~FullScreenPart();
 
 public slots:
diff --git a/parts/grepview/README.dox b/parts/grepview/README.dox
index d5e9130a..23e0eac3 100644
--- a/parts/grepview/README.dox
+++ b/parts/grepview/README.dox
@@ -1,5 +1,5 @@
 /** \class GrepViewPart
-Integrates "find|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions.
+Integrates "tqfind|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions.
 
 \authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a>
 
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 80264a92..80c06c8b 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -80,33 +80,33 @@ const char *filepatterns[] = {
 };
 
 
-GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name )
-    : TQDialog(parent, name, false), m_part( part )
+GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *tqparent, const char *name )
+    : TQDialog(tqparent, name, false), m_part( part )
 {
     setCaption(i18n("Find in Files"));
 
     config = GrepViewFactory::instance()->config();
     config->setGroup("GrepDialog");
 
-    TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4);
-    layout->setColStretch(0, 0);
-    layout->setColStretch(1, 20);
+    TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4);
+    tqlayout->setColStretch(0, 0);
+    tqlayout->setColStretch(1, 20);
 
     TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this);
-    layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
+    tqlayout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
 
     pattern_combo = new KHistoryCombo(true, this);
     pattern_label->setBuddy(pattern_combo);
     pattern_combo->setFocus();
     pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true);
     pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion);
-    layout->addWidget(pattern_combo, 0, 1);
+    tqlayout->addWidget(pattern_combo, 0, 1);
 
     TQLabel *template_label = new TQLabel(i18n("&Template:"), this);
-    layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
+    tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
 
     TQBoxLayout *template_layout = new TQHBoxLayout(4);
-    layout->addLayout(template_layout, 1, 1);
+    tqlayout->addLayout(template_layout, 1, 1);
 
     template_edit = new KLineEdit(this);
     template_label->setBuddy(template_edit);
@@ -118,22 +118,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     template_layout->addWidget(template_combo, 0);
 
     TQBoxLayout *search_opts_layout = new TQHBoxLayout(15);
-    layout->addLayout(search_opts_layout, 2, 1);
+    tqlayout->addLayout(search_opts_layout, 2, 1);
 
     regexp_box = new TQCheckBox(i18n("&Regular Expression"), this);
     regexp_box->setChecked(config->readBoolEntry("regexp", false ));
     search_opts_layout->addWidget(regexp_box);
 
     case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this);
-    case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    case_sens_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     case_sens_box->setChecked(config->readBoolEntry("case_sens", true));
     search_opts_layout->addWidget(case_sens_box);
 
     TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this);
-    layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
+    tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
 
     TQBoxLayout *dir_layout = new TQHBoxLayout(4);
-    layout->addLayout(dir_layout, 3, 1);
+    tqlayout->addLayout(dir_layout, 3, 1);
 
     dir_combo = new KComboBox( true, this );
     dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths"));
@@ -158,31 +158,31 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     dir_layout->addWidget( synch_button );
 
     TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15);
-    layout->addLayout(dir_opts_layout, 4, 1);
+    tqlayout->addLayout(dir_opts_layout, 4, 1);
 
     recursive_box = new TQCheckBox(i18n("Rec&ursive"), this);
     recursive_box->setChecked(config->readBoolEntry("recursive", true));
     dir_opts_layout->addWidget(recursive_box);
 
     use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this);
-    use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    use_project_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     use_project_box->setChecked(config->readBoolEntry("search_project_files", true));
     dir_opts_layout->addWidget(use_project_box);
 
     TQLabel *files_label = new TQLabel(i18n("&Files:"), this);
-    layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
+    tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
 
     files_combo = new KComboBox(true, this);
-    files_label->setBuddy(files_combo->focusProxy());
+    files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
     files_combo->insertStrList(filepatterns);
-    layout->addWidget(files_combo, 5, 1);
+    tqlayout->addWidget(files_combo, 5, 1);
 
     TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this);
-    layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
+    tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
 
     TQStringList exclude_list = config->readListEntry("exclude_patterns");
     exclude_combo = new KComboBox(true, this);
-    exclude_label->setBuddy(files_combo->focusProxy());
+    exclude_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
     if (exclude_list.count()) {
         exclude_combo->insertStringList(exclude_list);
     }
@@ -191,22 +191,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
         exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/");
         exclude_combo->insertItem("");
     }
-    layout->addWidget(exclude_combo, 6, 1);
+    tqlayout->addWidget(exclude_combo, 6, 1);
 
     TQBoxLayout *other_opts_layout = new TQHBoxLayout(15);
-    layout->addLayout(other_opts_layout, 7, 1);
+    tqlayout->addLayout(other_opts_layout, 7, 1);
 
     keep_output_box = new TQCheckBox(i18n("New view"), this);
     keep_output_box->setChecked(config->readBoolEntry("new_view", true));
     other_opts_layout->addWidget(keep_output_box);
 
     no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this);
-    no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    no_find_err_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true));
     other_opts_layout->addWidget(no_find_err_box);
 
     TQBoxLayout *button_layout = new TQHBoxLayout(4);
-    layout->addLayout(button_layout, 8, 1);
+    tqlayout->addLayout(button_layout, 8, 1);
     search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this);
     search_button->setDefault(true);
     KPushButton *done_button = new KPushButton(KStdGuiItem::cancel(), this);
@@ -214,7 +214,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     button_layout->addWidget(search_button);
     button_layout->addWidget(done_button);
 
-    resize(sizeHint());
+    resize(tqsizeHint());
 
     TQWhatsThis::add(pattern_combo,
 		    i18n("<qt>Enter the regular expression you want to search for here.<p>"
@@ -261,7 +261,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     slotPatternChanged( pattern_combo->currentText() );
 }
 
-// Returns the contents of a TQComboBox as a QStringList
+// Returns the contents of a TQComboBox as a TQStringList
 static TQStringList qCombo2StringList( TQComboBox* combo )
 {
     TQStringList list;
@@ -345,7 +345,7 @@ void GrepDialog::slotSearchClicked()
 void GrepDialog::show()
 {
     // not beautiful, but works with all window
-    // managers and Qt versions
+    // managers and TQt versions
     if (isVisible())
         hide();
 //         TQDialog::hide();
diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h
index 5c49a155..294dd326 100644
--- a/parts/grepview/grepdlg.h
+++ b/parts/grepview/grepdlg.h
@@ -25,12 +25,13 @@ class TQPushButton;
 class GrepViewPart;
 class KLineEdit;
 
-class GrepDialog : public QDialog
+class GrepDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    GrepDialog( GrepViewPart * part, TQWidget *parent=0, const char *name=0 );
+    GrepDialog( GrepViewPart * part, TQWidget *tqparent=0, const char *name=0 );
     ~GrepDialog();
 
     void setPattern(const TQString &pattern)
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 6765f87f..e404ad2d 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -34,8 +34,8 @@ static const KDevPluginInfo data("kdevgrepview");
 
 K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data))
 
-GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & )
-    : KDevPlugin( &data, parent, name ? name : "GrepViewPart" )
+GrepViewPart::GrepViewPart( TQObject *tqparent, const char *name, const TQStringList & )
+    : KDevPlugin( &data, tqparent, name ? name : "GrepViewPart" )
 {
     setInstance(GrepViewFactory::instance());
 
@@ -116,9 +116,9 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context)
     if (!ident.isEmpty()) {
         m_popupstr = ident;
         TQString squeezed = KStringHandler::csqueeze(ident, 30);
-        int id = popup->insertItem( i18n("Grep: %1").arg(squeezed),
+        int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed),
                            this, TQT_SLOT(slotContextGrep()) );
-        popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
+        popup->tqsetWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
                                "and sets the pattern to the text under the cursor."));
         popup->insertSeparator();
     }
diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h
index 65baced0..f33dd240 100644
--- a/parts/grepview/grepviewpart.h
+++ b/parts/grepview/grepviewpart.h
@@ -25,9 +25,10 @@ class GrepViewWidget;
 class GrepViewPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    GrepViewPart( TQObject *parent, const char *name, const TQStringList & );
+    GrepViewPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~GrepViewPart();
 
 private slots:
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index 78aa4224..e565a7d8 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -55,11 +55,11 @@ private:
 
 
 GrepListBoxItem::GrepListBoxItem(const TQString &fileName, const TQString &lineNumber, const TQString &text, bool showFilename)
-		: ProcessListBoxItem( TQString::null, Normal),
+		: ProcessListBoxItem( TQString(), Normal),
 		fileName(fileName), lineNumber(lineNumber), text(text.stripWhiteSpace()),
 		show(showFilename)
 {
-	this->text.replace( TQChar('\t'), TQString("  ") );
+	this->text.tqreplace( TQChar('\t'), TQString("  ") );
 }
 
 
@@ -73,7 +73,7 @@ void GrepListBoxItem::paint(TQPainter *p)
 {
 	TQColor base, dim, result, bkground;
 	if (listBox()) {
-		const TQColorGroup& group = listBox()->palette().active();
+		const TQColorGroup& group = listBox()->tqpalette().active();
 		if (isSelected()) {
 			bkground = group.button();
 			base = group.buttonText();
@@ -88,13 +88,13 @@ void GrepListBoxItem::paint(TQPainter *p)
 	}
 	else
 	{
-		base = Qt::black;
-		dim = Qt::darkGreen;
-		result = Qt::blue;
+		base = TQt::black;
+		dim = TQt::darkGreen;
+		result = TQt::blue;
 		if (isSelected())
-			bkground = Qt::lightGray;
+			bkground = TQt::lightGray;
 		else
-			bkground = Qt::white;
+			bkground = TQt::white;
 	}
 	TQFontMetrics fm = p->fontMetrics();
 	TQString stx = lineNumber + ":  ";
@@ -126,7 +126,7 @@ void GrepListBoxItem::paint(TQPainter *p)
 
 GrepViewWidget::GrepViewWidget(GrepViewPart *part) :  TQWidget(0, "grepview widget")
 {
-	m_layout = new TQHBoxLayout(this, 0, -1, "greplayout");
+	m_layout = new TQHBoxLayout(this, 0, -1, "greptqlayout");
 
 	m_tabWidget = new KTabWidget(this);
 
@@ -174,7 +174,7 @@ void GrepViewWidget::showDialog()
 		if(selectIface && selectIface->hasSelection())
 		{
 			TQString selText = selectIface->selection();
-			if(!selText.contains('\n'))
+			if(!selText.tqcontains('\n'))
 			{
 				grepdlg->setPattern(selText);
 			}
@@ -193,7 +193,7 @@ void GrepViewWidget::showDialog()
 	grepdlg->show();
 }
 
-// @todo - put this somewhere common - or just use Qt if possible
+// @todo - put this somewhere common - or just use TQt if possible
 static TQString escape(const TQString &str)
 {
 	TQString escaped("[]{}()\\^$?.+-*|");
@@ -201,7 +201,7 @@ static TQString escape(const TQString &str)
 
 	for (uint i=0; i < str.length(); ++i)
 	{
-		if (escaped.find(str[i]) != -1)
+		if (escaped.tqfind(str[i]) != -1)
 			res += "\\";
 		res += str[i];
 	}
@@ -305,7 +305,7 @@ void GrepViewWidget::searchActivated()
 			}
 
 			command = "cat ";
-			command += tmpFilePath.replace(' ', "\\ ");
+			command += tmpFilePath.tqreplace(' ', "\\ ");
 		}
 	}
 	else
@@ -319,7 +319,7 @@ void GrepViewWidget::searchActivated()
 				files += " -o -name " + KShellProcess::quote(*it);
 		}
 
-		TQString filepattern = "find ";
+		TQString filepattern = "tqfind ";
 		filepattern += KShellProcess::quote(grepdlg->directoryString());
 		if (!grepdlg->recursiveFlag())
 			filepattern += " -maxdepth 1";
@@ -366,9 +366,9 @@ void GrepViewWidget::searchActivated()
 	m_lastPattern = grepdlg->patternString();
 	TQString pattern = grepdlg->templateString();
 	if (grepdlg->regexpFlag())
-		pattern.replace(TQRegExp("%s"), grepdlg->patternString());
+		pattern.tqreplace(TQRegExp("%s"), grepdlg->patternString());
 	else
-		pattern.replace(TQRegExp("%s"), escape( grepdlg->patternString() ) );
+		pattern.tqreplace(TQRegExp("%s"), escape( grepdlg->patternString() ) );
 	command += KShellProcess::quote(pattern);
 	m_curOutput->startJob("", command);
 
@@ -402,11 +402,11 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line)
         {
             str = TQString::fromLocal8Bit( line );
         }
-	if ( (pos = str.find(':')) != -1)
+	if ( (pos = str.tqfind(':')) != -1)
 	{
 		filename = str.left(pos);
 		str.remove( 0, pos+1 );
-		if ( ( pos = str.find(':') ) != -1)
+		if ( ( pos = str.tqfind(':') ) != -1)
 		{
 			linenumber = str.left(pos);
 			str.remove( 0, pos+1 );
@@ -452,7 +452,7 @@ void GrepViewWidget::popupMenu(TQListBoxItem*, const TQPoint& p)
 
 void GrepViewWidget::slotKeepOutput( )
 {
-	if ( m_lastPattern == TQString::null ) return;
+	if ( m_lastPattern == TQString() ) return;
 
 	m_tabWidget->changeTab(m_curOutput, m_lastPattern);
 
diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h
index 9c232b1b..f0b57aff 100644
--- a/parts/grepview/grepviewwidget.h
+++ b/parts/grepview/grepviewwidget.h
@@ -25,8 +25,9 @@ class TQToolButton;
 class GrepViewProcessWidget : public ProcessWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {};
+	GrepViewProcessWidget(TQWidget* tqparent) : ProcessWidget(tqparent) {};
 	~GrepViewProcessWidget(){};
 	void setMatchCount(int newCount)
 	{
@@ -56,9 +57,10 @@ private:
         TQCString grepbuf;
 };
 
-class GrepViewWidget : public QWidget
+class GrepViewWidget : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	GrepViewWidget(GrepViewPart *part);
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index c103a3a8..e752335a 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -28,8 +28,8 @@ typedef KDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
 static const KDevPluginInfo data("kdevkonsoleview");
 K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data))
 
-KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
+KonsoleViewPart::KonsoleViewPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name ? name : "KonsoleViewPart")
 {
     setInstance( KonsoleViewFactory::instance() );
 
diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h
index 89047a2d..4731069b 100644
--- a/parts/konsole/konsoleviewpart.h
+++ b/parts/konsole/konsoleviewpart.h
@@ -22,8 +22,9 @@ class KDevShellWidget;
 class KonsoleViewPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &);
+    KonsoleViewPart(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~KonsoleViewPart();
 
 private slots:
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index cced1b88..ef34f3f3 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -58,7 +58,7 @@ void KonsoleViewWidget::activate()
     if (!part)
         return;
 
-    part->widget()->setFocusPolicy(TQWidget::WheelFocus);
+    part->widget()->setFocusPolicy(TQ_WheelFocus);
     setFocusProxy(part->widget());
     part->widget()->setFocus();
 
diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h
index cd3e57bc..53bfdb94 100644
--- a/parts/konsole/konsoleviewwidget.h
+++ b/parts/konsole/konsoleviewwidget.h
@@ -27,9 +27,10 @@ namespace KParts {
 class TQVBoxLayout;
 
 
-class KonsoleViewWidget : public QWidget
+class KonsoleViewWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KonsoleViewWidget(KonsoleViewPart *part);
     virtual ~KonsoleViewWidget();
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index 2f45f867..bce4df7e 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -21,8 +21,8 @@ typedef KDevGenericFactory<OpenWithPart> OpenWithFactory;
 static const KDevPluginInfo data("kdevopenwith");
 K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data))
 
-OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "OpenWithPart")
+OpenWithPart::OpenWithPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name ? name : "OpenWithPart")
 {
   setInstance( OpenWithFactory::instance() );
 
@@ -50,7 +50,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
 	KPopupMenu * openAsPopup = new KPopupMenu( popup );
 
 	int id = popup->insertItem( i18n("Open As"), openAsPopup );
-	popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
+	popup->tqsetWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
 
 	TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
 
@@ -80,19 +80,19 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
 	}
 
 	id = popup->insertItem( i18n("Open With"), openWithPopup );
-	popup->setWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file."));
+	popup->tqsetWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file."));
 
 	openWithPopup->insertSeparator();
 
 	// make sure the generic "Open with ..." entry gets appended to the submenu
 	id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog()));
-	openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file."));
+	openWithPopup->tqsetWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file."));
 }
 
 
 void OpenWithPart::openWithService()
 {
-  KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name());
+  KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
   if (ptr)
   {
     KRun::run(*ptr, m_urls);
diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h
index 230fedcd..0f72adf8 100644
--- a/parts/openwith/openwithpart.h
+++ b/parts/openwith/openwithpart.h
@@ -12,10 +12,11 @@ class Context;
 class OpenWithPart : public KDevPlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-	OpenWithPart(TQObject *parent, const char *name, const TQStringList &);
+	OpenWithPart(TQObject *tqparent, const char *name, const TQStringList &);
 	~OpenWithPart();
 
 
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index a21cf7db..1b314464 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -33,8 +33,8 @@ static const KDevPluginInfo data("kdevappoutputview");
 typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
 
-AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
+AppOutputViewPart::AppOutputViewPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevAppFrontend(&data, tqparent, name ? name : "AppOutputViewPart")
 {
     setInstance(AppViewFactory::instance());
 
@@ -100,7 +100,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin
         cmd = Settings::terminalEmulatorName( *kapp->config() );
         if ( cmd == "konsole" && !directory.isNull() ) {  // isn't setting the working directory below enough?
           // If a directory was specified, use it
-          cmd += TQString(" --workdir '%1'").arg(directory);
+          cmd += TQString(" --workdir '%1'").tqarg(directory);
         }
         cmd += " -e /bin/sh -c '";
         cmd += program;
diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h
index b0b0982a..bb26aad8 100644
--- a/parts/outputviews/appoutputviewpart.h
+++ b/parts/outputviews/appoutputviewpart.h
@@ -23,9 +23,10 @@ class AppOutputWidget;
 class AppOutputViewPart : public KDevAppFrontend
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & );
+    AppOutputViewPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~AppOutputViewPart();
 
     virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal);
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index c58065a2..89c3ced5 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -79,7 +79,7 @@ void AppOutputWidget::slotRowSelected(TQListBoxItem* row)
 	if (row) {
 		if (assertMatch.exactMatch(row->text())) {
 			m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1);
-			m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").arg(assertMatch.cap(1)), 10000);
+			m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000);
 			m_part->mainWindow()->lowerView(this);
 
 		} else if (lineInfoMatch.search(row->text()) != -1) {
@@ -180,11 +180,11 @@ bool AppOutputWidget::filterSingleLine(const TQString & line)
 
 	if ( m_filter.m_isRegExp )
 	{
-		return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
+		return ( line.tqfind( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
 	}
 	else
 	{
-		return ( line.find( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 );
+		return ( line.tqfind( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 );
 	}	
 }
 
@@ -339,7 +339,7 @@ void AppOutputWidget::copySelected()
     if (isSelected(i))
       buffer += item(i)->text() + "\n";
   }
-  kapp->clipboard()->setText(buffer, QClipboard::Clipboard);
+  kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
 }
 
 void AppOutputWidget::addPartialStderrLine(const TQCString & line)
diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h
index 0673f106..7fbe35be 100644
--- a/parts/outputviews/appoutputwidget.h
+++ b/parts/outputviews/appoutputwidget.h
@@ -22,6 +22,7 @@ class AppOutputViewPart;
 class AppOutputWidget : public ProcessWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 friend class AppOutputViewPart;
 public:
     AppOutputWidget(AppOutputViewPart* part);
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index 9d48f1c8..c365d6cf 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -53,7 +53,7 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats()
 		// ld
 		ErrorFormat( "undefined reference", 0, 0, 0 ),
 		ErrorFormat( "undefined symbol", 0, 0, 0 ),
-		ErrorFormat( "ld: cannot find", 0, 0, 0 ),
+		ErrorFormat( "ld: cannot tqfind", 0, 0, 0 ),
 		ErrorFormat( "No such file", 0, 0, 0 ),
 		// make
  		ErrorFormat( "No rule to make target", 0, 0, 0 ),
@@ -98,9 +98,9 @@ void CompileErrorFilter::processLine( const TQString& line )
 			text    = regExp.cap( format->textGroup );
 			compiler = format->compiler;
 			TQString cap = regExp.cap(3);
-			if (cap.contains("warning:", false) || cap.contains("Warnung:", false))
+			if (cap.tqcontains("warning:", false) || cap.tqcontains("Warnung:", false))
 				isWarning = true;
-			if (regExp.cap(3).contains("instantiated from", false)) {
+			if (regExp.cap(3).tqcontains("instantiated from", false)) {
 				isInstantiationInfo = true;
 			}
 			break;
@@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line )
 	if( hasmatch )
 	{
 		// Add hacks for error strings you want excluded here
-		if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
-			|| text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 )
+		if( text.tqfind( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0
+			|| text.tqfind( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 )
 		hasmatch = false;
 	}
 
diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h
index 2f67adaf..7a2fe1dc 100644
--- a/parts/outputviews/compileerrorfilter.h
+++ b/parts/outputviews/compileerrorfilter.h
@@ -22,6 +22,7 @@ class MakeItem;
 class CompileErrorFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	CompileErrorFilter( OutputFilter& );
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index 02629797..9d110533 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -85,26 +85,26 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString
 	//@todo: other translations!
 	
 	// we need a TQRegExp because KRegExp is not Utf8 aware.
-    // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-    static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
-	static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory"));
+    // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
+    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
+    static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
+	static TQRegExp enEnter(TQString::tqfromLatin1(".*: Entering directory"));
     kdDebug(9004) << "Directory filter line " << line << endl;
 
 	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
-	if(line.find(en_e) > -1 ||
-	   line.find(fr_e) > -1 ||
-	   line.find(pl_e) > -1 ||
-	   line.find(ja_e) > -1 ||
-	   line.find(ko_e) > -1 ||
-	   line.find(ko_b) > -1 ||
-	   line.find(pt_br_e) > -1 ||
-	   line.find(ru_e) > -1 ||
-	   line.find(de_e1) > -1 ||
-	   line.find(de_e2) > -1 ||
-	   line.find(es_e) > -1 ||
-	   line.find(nl_e) > -1)
+	if(line.tqfind(en_e) > -1 ||
+	   line.tqfind(fr_e) > -1 ||
+	   line.tqfind(pl_e) > -1 ||
+	   line.tqfind(ja_e) > -1 ||
+	   line.tqfind(ko_e) > -1 ||
+	   line.tqfind(ko_b) > -1 ||
+	   line.tqfind(pt_br_e) > -1 ||
+	   line.tqfind(ru_e) > -1 ||
+	   line.tqfind(de_e1) > -1 ||
+	   line.tqfind(de_e2) > -1 ||
+	   line.tqfind(es_e) > -1 ||
+	   line.tqfind(nl_e) > -1)
 	{
 		// grab the directory name
 		if(dirChange.search(line) > -1)
@@ -157,24 +157,24 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString
 	static const TQString po_l("Opuszczam katalog");
 	
     // we need a TQRegExp because KRegExp is not Utf8 aware.
-    // 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
+    // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
 
-	static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
+	static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
 
 	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
-	if(line.find(en_l) > -1 ||
-	   line.find(fr_l) > -1 ||
-	   line.find(ja_l) > -1 ||
-	   (line.find(ko_l) > -1 && line.find(ko_b) > -1) ||
-	   line.find(pt_br_l) > -1 ||
-	   line.find(ru_l) > -1 ||
-	   line.find(de_l1) > -1 ||
-	   line.find(de_l2) > -1 ||
-	   line.find(es_l) > -1 ||
-	   line.find(nl_l) > -1 ||
-	   line.find(po_l) > -1)
+	if(line.tqfind(en_l) > -1 ||
+	   line.tqfind(fr_l) > -1 ||
+	   line.tqfind(ja_l) > -1 ||
+	   (line.tqfind(ko_l) > -1 && line.tqfind(ko_b) > -1) ||
+	   line.tqfind(pt_br_l) > -1 ||
+	   line.tqfind(ru_l) > -1 ||
+	   line.tqfind(de_l1) > -1 ||
+	   line.tqfind(de_l2) > -1 ||
+	   line.tqfind(es_l) > -1 ||
+	   line.tqfind(nl_l) > -1 ||
+	   line.tqfind(po_l) > -1)
 	{
 		// grab the directory name
 		if(dirChange.search(line) > -1 )
diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h
index 0d57e52d..4abaa23e 100644
--- a/parts/outputviews/directorystatusmessagefilter.h
+++ b/parts/outputviews/directorystatusmessagefilter.h
@@ -21,6 +21,7 @@ class ExitingDirectoryItem;
 class DirectoryStatusMessageFilter :  public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	DirectoryStatusMessageFilter( OutputFilter& );
diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui
index 729af672..07e16d99 100644
--- a/parts/outputviews/filterdlg.ui
+++ b/parts/outputviews/filterdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FilterDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FilterDlg</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,14 +46,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -86,7 +86,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>filtergroup</cstring>
             </property>
@@ -103,7 +103,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>caseSensitive</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <string>C&amp;ase sensitive</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>regularExpression</cstring>
                     </property>
@@ -160,5 +160,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index 4edaae2b..ca3e843a 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -79,8 +79,8 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
 		ActionFormat( i18n("built"), 1, 1, "\\[.+%\\] Built target (.*)" ), //cmake
 		ActionFormat( i18n("generating"), 1, 1, "\\[.+%\\] Generating (.*)" ), //cmake
 
-                //moc and uic
-		ActionFormat( i18n("generating"), 1, 2, "/(moc|uic)\\b.*\\s-o\\s([^\\s;]+)"),
+                //tqmoc and uic
+		ActionFormat( i18n("generating"), 1, 2, "/(tqmoc|uic)\\b.*\\s-o\\s([^\\s;]+)"),
 		ActionFormat( i18n("generating"), 1, 2, "^generating (.*)" ), //unsermake
 
 		ActionFormat( i18n("linking"), "libtool", "/bin/sh\\s.*libtool.*--mode=link\\s.*\\s-o\\s([^\\s;]+)", 1 ),
@@ -96,7 +96,7 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
 		ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ),
 		ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake
 
-		ActionFormat( TQString::null, TQString::null, 0, 0 )
+		ActionFormat( TQString(), TQString(), 0, 0 )
 	};
 
 	return formats;
@@ -167,11 +167,11 @@ void MakeActionFilter::test()
 	static TQValueList<TestItem> testItems = TQValueList<TestItem>()
 
 	<< TestItem( // simple qmake compile
-		"g++ -c -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
+		"g++ -c -pipe -Wall -W -O2 -DTQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
 		"-I/home/john/src/kde/qt-copy/include -o test.o test.cpp",
 		"compiling", "g++", "test.cpp" )
 	<< TestItem( // simple qmake compile different option order
-		"g++ -c -o test.o -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
+		"g++ -c -o test.o -pipe -Wall -W -O2 -DTQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
 		"-I/home/john/src/kde/qt-copy/include test.cpp",
 		"compiling", "g++", "test.cpp" )
 	<< TestItem( // simple qmake link
@@ -181,7 +181,7 @@ void MakeActionFilter::test()
 	<< TestItem( // automake 1.7, srcdir != builddir
 		"if /bin/sh ../../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. "
 		"-I/home/john/src/kde/kdevelop/lib/interfaces -I../.. -I/usr/local/kde/include -I/home/john/src/kde/qt-copy/include "
-		"-I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W "
+		"-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W "
 		"-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion "
 		"-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new "
 		"-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f "
@@ -193,7 +193,7 @@ void MakeActionFilter::test()
 		"if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/kdevelop/src -I.. -I/home/john/src/kde/kdevelop/lib/interfaces "
 		"-I/home/john/src/kde/kdevelop/lib/sourceinfo -I/home/john/src/kde/kdevelop/lib/util -I/home/john/src/kde/kdevelop/lib "
 		"-I/home/john/src/kde/kdevelop/lib/qextmdi/include -I/home/john/src/kde/kdevelop/lib/structure -I/usr/local/kde/include "
-		"-I/home/john/src/kde/qt-copy/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor "
+		"-I/home/john/src/kde/qt-copy/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor "
 		"-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi "
 		"-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security "
 		"-Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -MT mainwindowideal.o -MD -MP -MF "
@@ -203,7 +203,7 @@ void MakeActionFilter::test()
 		"compiling", "g++", "mainwindowideal.cpp" )
 	<< TestItem( // automake and libtool compiling *.c files
 		"if /bin/sh ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces"
-		"-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT "
+		"-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT "
 		"-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings "
 		"-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -g3 -fno-inline -Wformat-security -Wmissing-format-attribute -MT readtags.lo "
 		"-MD -MP -MF \".deps/readtags.Tpo\" -c -o readtags.lo readtags.c; then mv -f \".deps/readtags.Tpo\" "
@@ -213,7 +213,7 @@ void MakeActionFilter::test()
 		"source='makewidget.cpp' object='makewidget.lo' libtool=yes depfile='.deps/makewidget.Plo' "
 		"tmpdepfile='.deps/makewidget.TPlo' depmode=gcc3 /bin/sh ../../admin/depcomp /bin/sh ../../libtool --mode=compile "
 		"--tag=CXX g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces -I../../lib/util -I/opt/kde3/include "
-		"-I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef "
+		"-I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef "
 		"-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE "
 		"-Wcast-align -Wconversion -fno-builtin -g -O2 -g3 -O0 -fno-exceptions -fno-check-new -c -o makewidget.lo `test -f "
 		"'makewidget.cpp' || echo './'`makewidget.cpp",
@@ -233,7 +233,7 @@ void MakeActionFilter::test()
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib  -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo "
-		"kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
+		"kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
 		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
 		"linking", "libtool", "libkfilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
@@ -241,13 +241,13 @@ void MakeActionFilter::test()
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la -rpath /opt/kde3/lib/kde3 "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib  -version-info 1:0:0 kfilereplacepart.lo "
-		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
+		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
 		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
 		"linking", "libtool", "libkfilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "
 		"-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include  "
-		"-I../../quanta/dialogs  -DQT_THREAD_SUPPORT  -D_REENTRANT -DKOMMANDER -DDESIGNER -DQT_NO_SQL -DHAVE_KDE  -Wnon-virtual-dtor "
+		"-I../../quanta/dialogs  -DTQT_THREAD_SUPPORT  -D_REENTRANT -DKOMMANDER -DDESIGNER -DTQT_NO_SQL -DHAVE_KDE  -Wnon-virtual-dtor "
 		"-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE "
 		"-Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -DKDE_NO_COMPAT -fno-exceptions -fno-check-new -fno-common  -c -o project.o "
 		"`test -f '/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp' || "
@@ -272,14 +272,14 @@ void MakeActionFilter::test()
 	"quanta_init.cpp; "
 	"then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \".deps/quanta_init.Tpo\"; "
 	"exit 1; fi",
-	"compiling", "g++", "quanta_init.cpp")
+	"compiling", "g++", "tquanta_init.cpp")
 	<< TestItem( //libtool, automake 1.8, file with full path
 	"if g++ -DHAVE_CONFIG_H -I. -I/home/andris/  "
 	"-DBUILD_KAFKAPART  -MT quanta_init.o -MD -MP -MF \".deps/quanta_init.Tpo\" -c -o quanta_init.o "
 	"/home/andris/quanta_init.cpp; "
 	"then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \".deps/quanta_init.Tpo\"; "
 	"exit 1; fi",
-	"compiling", "g++", "quanta_init.cpp")
+	"compiling", "g++", "tquanta_init.cpp")
 	;
 
 	TQValueList<TestItem>::const_iterator it = testItems.begin();
diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h
index 4f3a0e68..1809c74d 100644
--- a/parts/outputviews/makeactionfilter.h
+++ b/parts/outputviews/makeactionfilter.h
@@ -23,6 +23,7 @@ class ActionItem;
 class MakeActionFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 #ifdef DEBUG
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index 218bb894..fe1f8424 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -84,12 +84,8 @@ TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
 
 TQString MakeItem::br()
 {
-    // Qt >= 3.1 doesn't need a <br>.
-#if QT_VERSION < 0x040000
-    static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "<br>";
-#else
+    // TQt >= 3.1 doesn't need a <br>.
     static const TQString br;
-#endif
     return br;
 }
 
@@ -128,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus )
 	m_text = i18n("*** Compilation aborted ***");
 	if ( m_normalExit )
 		if (m_exitStatus )
-			m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus );
+			m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus );
         	else
 			m_text = i18n("*** Success ***");
 }
@@ -143,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true;
 TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
-		return i18n("Entering directory %1").arg( directory );
+		return i18n("Entering directory %1").tqarg( directory );
 	return m_text;
 }
 
 TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
 {
 	if ( outputLevel < eFull )
-		return i18n("Leaving directory %1").arg( directory );
+		return i18n("Leaving directory %1").tqarg( directory );
 	return m_text;
 }
 
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 7c9dcb79..cd98a3e2 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -30,8 +30,8 @@ static const KDevPluginInfo data("kdevmakeview");
 typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
 
-MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevMakeFrontend(&data, parent, name)
+MakeViewPart::MakeViewPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevMakeFrontend(&data, tqparent, name)
 {
     setInstance(MakeViewFactory::instance());
 
@@ -52,11 +52,11 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis
     mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages"));
 
     KAction *action;
-    action = new KAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()),
+    action = new KAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()),
                           actionCollection(), "view_next_error");
     action->setToolTip( i18n("Go to the next error") );
     action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from."));
-    action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_SLOT(prevError()),
+    action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()),
                           actionCollection(), "view_previous_error");
     action->setToolTip( i18n("Go to the previous error") );
     action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from."));
diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h
index 808a9208..0d70edaf 100644
--- a/parts/outputviews/makeviewpart.h
+++ b/parts/outputviews/makeviewpart.h
@@ -23,9 +23,10 @@ class MakeWidget;
 class MakeViewPart : public KDevMakeFrontend
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    MakeViewPart( TQObject *parent, const char *name, const TQStringList & );
+    MakeViewPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~MakeViewPart();
     virtual TQWidget* widget();
     virtual void updateSettingsFromConfig();
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 3ccc4608..b7d5ed2f 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -42,7 +42,7 @@
 #include <tqfileinfo.h>
 #include <tqclipboard.h>
 #include <tqpopupmenu.h>
-#include <private/qrichtext_p.h>
+#include <private/tqrichtext_p.h>
 
 #include <stdlib.h>
 #include <limits.h>
@@ -162,7 +162,7 @@ MakeWidget::MakeWidget(MakeViewPart *part)
 {
 	updateSettingsFromConfig();
 
-	setTextFormat( Qt::RichText );
+	setTextFormat( TQt::RichText );
 
 	if ( m_bLineWrapping )
 		setWordWrap(WidgetWidth);
@@ -178,7 +178,7 @@ MakeWidget::MakeWidget(MakeViewPart *part)
 
         dirstack.setAutoDelete(true);
 
-	childproc = new KProcess(this);
+	childproc = new KProcess(TQT_TQOBJECT(this));
 	procLineMaker = new ProcessLineMaker( childproc );
 
 	connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
@@ -247,20 +247,20 @@ void MakeWidget::startNextJob()
 	currentCommand = *it;
 	commandList.remove(it);
 
-	int i = currentCommand.findRev(" gmake");
+	int i = currentCommand.tqfindRev(" gmake");
 	if ( i == -1 )
-		i = currentCommand.findRev(" make");
+		i = currentCommand.tqfindRev(" make");
 	if ( i == -1 )
 		m_bCompiling = false;
 	else
 	{
 		TQString s = currentCommand.right(currentCommand.length() - i);
-		if ( s.contains("configure ")        ||
-		     s.contains(" Makefile.cvs")     ||
-		     s.contains(" clean")            ||
-		     s.contains(" distclean")        ||
-		     s.contains(" package-messages") ||
-		     s.contains(" install") )
+		if ( s.tqcontains("configure ")        ||
+		     s.tqcontains(" Makefile.cvs")     ||
+		     s.tqcontains(" clean")            ||
+		     s.tqcontains(" distclean")        ||
+		     s.tqcontains(" package-messages") ||
+		     s.tqcontains(" install") )
 		{
 		    m_bCompiling = false;
 		}
@@ -337,12 +337,12 @@ void MakeWidget::copy()
 	  selection.remove((selection.length()-1) -  removeend, removeend);
 	}
 
-	selection.replace("&lt;","<");
-	selection.replace("&gt;",">");
-	selection.replace("&quot;","\"");
-	selection.replace("&amp;","&");
+	selection.tqreplace("&lt;","<");
+	selection.tqreplace("&gt;",">");
+	selection.tqreplace("&quot;","\"");
+	selection.tqreplace("&amp;","&");
 
-	kapp->clipboard()->setText(selection, QClipboard::Clipboard);
+	kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
 }
 
 void MakeWidget::nextError()
@@ -378,11 +378,7 @@ void MakeWidget::prevError()
         if (m_lastErrorSelected != -1)
         {
             m_lastErrorSelected = -1;
-#if QT_VERSION >= 0x030100
             parag = (int)m_items.count();
-#else
-            parag = m_items.size();
-#endif
             if (!scanErrorBackward(parag))
                 KNotifyClient::beep();
         }
@@ -393,7 +389,7 @@ void MakeWidget::prevError()
 void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e )
 {
 	TQTextEdit::contentsMouseReleaseEvent(e);
-	if ( e->button() != LeftButton )
+	if ( e->button() != Qt::LeftButton )
 		return;
 	searchItem(paragraphAt(e->pos()));
 }
@@ -413,9 +409,9 @@ void MakeWidget::keyPressEvent(TQKeyEvent *e)
 // returns the current directory for parag
 TQString MakeWidget::directory(int parag) const
 {
-	TQValueVector<MakeItem*>::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
+	TQValueVector<MakeItem*>::const_iterator it = tqFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
 	if ( it == m_items.end() )
-		return TQString::null;
+		return TQString();
 	// run backwards over directories and figure out where we are
 	while ( it != m_items.begin() ) {
 		--it;
@@ -423,7 +419,7 @@ TQString MakeWidget::directory(int parag) const
 		if ( edi )
 			return edi->directory + "/";
 	}
-	return TQString::null;
+	return TQString();
 }
 
 // hackish function that will return true and put string "file" in "fName" if the file
@@ -457,7 +453,7 @@ void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const
     TQStringList files = m_part->project()->allFiles();
     for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it)
     {
-        if( (*it).contains( file ) )
+        if( (*it).tqcontains( file ) )
         {
             fName = URLUtil::canonicalPath( m_part->project()->projectDirectory() + "/" + *it );
         }
@@ -570,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *)
 	{
 		if (childproc->exitStatus())
 		{
-			KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
+			KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
 			emit m_part->commandFailed(currentCommand);
 		}
 		else
 		{
-			KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
+			KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
 			emit m_part->commandFinished(currentCommand);
 		}
 	}
@@ -584,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *)
 	insertItem( item );
         displayPendingItem();
 
-	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
+	m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(item->m_text), 3000);
 	m_part->core()->running(m_part, false);
 
 	// Defensive programming: We emit this with a single shot timer so that we go once again
@@ -692,7 +688,7 @@ void MakeWidget::insertItem( MakeItem* new_item )
 bool MakeWidget::brightBg()
 {
 	int h,s,v;
-	paletteBackgroundColor().hsv( &h, &s, &v );
+	TQColor(paletteBackgroundColor()).hsv( &h, &s, &v );
 	return (v > 127);
 }
 
@@ -704,22 +700,22 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos )
 	pMenu->insertSeparator();
 	int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) );
 	pMenu->setItemChecked(id, m_bLineWrapping);
-    pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
+    pMenu->tqsetWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
 
 	pMenu->insertSeparator();
 	id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) );
-    pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
+    pMenu->tqsetWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
 	pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort);
 	id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) );
-    pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
+    pMenu->tqsetWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
 	pMenu->setItemChecked(id, m_compilerOutputLevel == eShort);
 	id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) );
-    pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
+    pMenu->tqsetWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
 	pMenu->setItemChecked(id, m_compilerOutputLevel == eFull);
 
 	pMenu->insertSeparator();
 	id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages()));
-    pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
+    pMenu->tqsetWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
 	pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages());
 
 	return pMenu;
@@ -756,9 +752,9 @@ void MakeWidget::refill()
 
 }
 
-void MakeWidget::slotVeryShortCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eVeryShort); }
-void MakeWidget::slotShortCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eShort); }
-void MakeWidget::slotFullCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eFull);  }
+void MakeWidget::slotVeryShortCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eVeryShort); }
+void MakeWidget::slotShortCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eShort); }
+void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eFull);  }
 
 void MakeWidget::setCompilerOutputLevel(EOutputLevel level)
 {
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index bdc7d451..dd8b2b63 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -34,9 +34,10 @@ class KURL;
 
 namespace KTextEditor { class Document; }
 
-class MakeWidget : public QTextEdit
+class MakeWidget : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MakeWidget(MakeViewPart *part);
diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h
index 3494de84..57b8f643 100644
--- a/parts/outputviews/otherfilter.h
+++ b/parts/outputviews/otherfilter.h
@@ -21,6 +21,7 @@ class MakeItem;
 class OtherFilter : public TQObject, public OutputFilter
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	OtherFilter();
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index dbf2b554..5f6ae0f0 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevpartexplorer");
 typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
 
-PartExplorerPlugin::PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & )
-    : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
+PartExplorerPlugin::PartExplorerPlugin(  TQObject *tqparent, const char *name, const TQStringList & )
+    : KDevPlugin( &data, tqparent, name ? name : "PartExplorerPlugin" )
 {
     // we need an instance
     setInstance( PartExplorerPluginFactory::instance() );
diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h
index 528d2a45..826ae6ed 100644
--- a/parts/partexplorer/partexplorer_plugin.h
+++ b/parts/partexplorer/partexplorer_plugin.h
@@ -24,11 +24,12 @@ class PartExplorerForm;
 class PartExplorerPlugin : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
     * Default constructor
     */
-    PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & );
+    PartExplorerPlugin(  TQObject *tqparent, const char *name, const TQStringList & );
 
     /**
     * Destructor
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index f944b393..d8b0cccf 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -35,9 +35,9 @@ namespace PartExplorer{
 class PropertyItem : public KListViewItem
 {
 public:
-    PropertyItem( KListViewItem *parent, const TQString &propertyName,
+    PropertyItem( KListViewItem *tqparent, const TQString &propertyName,
         const TQString &propertyType, const TQString &propertyValue )
-        : KListViewItem( parent )
+        : KListViewItem( tqparent )
     {
         setText( 0, propertyName );
         setText( 1, propertyType );
@@ -47,7 +47,7 @@ public:
     TQString tipText() const
     {
         TQString tip = i18n("Name: %1 | Type: %2 | Value: %3");
-        return tip.arg( text(0) ).arg( text(1) ).arg( text(2) );
+        return tip.tqarg( text(0) ).tqarg( text(1) ).tqarg( text(2) );
     }
 };
 
@@ -58,10 +58,10 @@ public:
 
 class ResultList;
 
-class ResultsToolTip: public QToolTip
+class ResultsToolTip: public TQToolTip
 {
 public:
-    ResultsToolTip( ResultsList* parent );
+    ResultsToolTip( ResultsList* tqparent );
     virtual void maybeTip( const TQPoint& p );
 
 private:
@@ -71,8 +71,8 @@ private:
 class ResultsList : public KListView
 {
 public:
-    ResultsList( TQWidget *parent )
-        : KListView( parent, "resultslist" )
+    ResultsList( TQWidget *tqparent )
+        : KListView( tqparent, "resultslist" )
     {
         this->setShowToolTips( false );
         new ResultsToolTip( this );
@@ -86,8 +86,8 @@ public:
     }
 };
 
-ResultsToolTip::ResultsToolTip( ResultsList* parent )
-    : TQToolTip( parent->viewport() ), m_resultsList( parent )
+ResultsToolTip::ResultsToolTip( ResultsList* tqparent )
+    : TQToolTip( tqparent->viewport() ), m_resultsList( tqparent )
 {
 }
 
@@ -96,7 +96,7 @@ void ResultsToolTip::maybeTip( const TQPoint& p )
     PartExplorer::PropertyItem *item = dynamic_cast<PartExplorer::PropertyItem*>( m_resultsList->itemAt( p ) );
     if ( item )
     {
-        TQRect r = m_resultsList->itemRect( item );
+        TQRect r = m_resultsList->tqitemRect( item );
         if ( r.isValid() )
             tip( r, item->tipText() );
     }
@@ -107,8 +107,8 @@ void ResultsToolTip::maybeTip( const TQPoint& p )
 // class PartExplorerForm
 ///////////////////////////////////////////////////////////////////////////////
 
-PartExplorerForm::PartExplorerForm( TQWidget *parent )
-    : KDialogBase( parent, "parteplorerform", false,
+PartExplorerForm::PartExplorerForm( TQWidget *tqparent )
+    : KDialogBase( tqparent, "parteplorerform", false,
         i18n("Part Explorer - A Services Lister"), User1 | Close, User1, true )
 {
     m_base = new PartExplorerFormBase( this, "partexplorerformbase", 0 );
@@ -116,12 +116,12 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent )
     m_resultsList->addColumn( i18n( "Property" ) );
     m_resultsList->addColumn( i18n( "Type" ) );
     m_resultsList->addColumn( i18n( "Value" ) );
-    m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
+    m_resultsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
         (TQSizePolicy::SizeType)3, 0, 0,
         m_resultsList->sizePolicy().hasHeightForWidth() ) );
     TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") );
     m_base->resultsLabel->setBuddy(m_resultsList);
-    m_base->layout()->add( m_resultsList );
+    m_base->tqlayout()->add( m_resultsList );
     setMainWidget( m_base );
     m_base->typeCombo->lineEdit()->setFocus();
 
@@ -212,7 +212,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
             TQVariant property = service->property( propertyName );
             TQString propertyType = property.typeName();
             TQString propertyValue;
-            if (propertyType == "TQStringList") {
+            if (propertyType == TQSTRINGLIST_OBJECT_NAME_STRING) {
                 propertyValue = property.toStringList().join(", ");
             }
             else {
@@ -220,7 +220,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
             }
 
             TQString dProperty = " *** Found property < %1, %2, %3 >";
-            dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue );
+            dProperty = dProperty.tqarg( propertyName ).tqarg( propertyType ).tqarg( propertyValue );
             kdDebug( 9000 ) << dProperty << endl;
 
             new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue );
diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h
index 7ccc140d..c28c37c0 100644
--- a/parts/partexplorer/partexplorerform.h
+++ b/parts/partexplorer/partexplorerform.h
@@ -26,8 +26,9 @@ class PartExplorerFormBase;
 class PartExplorerForm : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PartExplorerForm( TQWidget *parent = 0 );
+    PartExplorerForm( TQWidget *tqparent = 0 );
     virtual ~PartExplorerForm();
 
     /**
diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui
index dd9beeb3..1928ad80 100644
--- a/parts/partexplorer/partexplorerformbase.ui
+++ b/parts/partexplorer/partexplorerformbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PartExplorerFormBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PartExplorerFormBase</cstring>
     </property>
@@ -30,7 +30,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QTextEdit">
+        <widget class="TQTextEdit">
             <property name="name">
                 <cstring>constraintsText</cstring>
             </property>
@@ -104,7 +104,7 @@
                 <string>&lt;b&gt;Constraints&lt;/b&gt;Refine your query by writing additional constraints such as &lt;i&gt;([X-KDevelop-Scope]='Global')&lt;/i&gt;).</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>resultsLabel</cstring>
             </property>
@@ -130,8 +130,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 2c1de0ce..f76701e7 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -49,8 +49,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
 
 using namespace KTextEditor;
 
-QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& )
-    : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
+QuickOpenPart::QuickOpenPart(TQObject *tqparent, const char *name, const TQStringList& )
+    : KDevQuickOpen(&data, tqparent, name ? name : "QuickOpenPart" )
 {
     setInstance(QuickOpenFactory::instance());
     setXMLFile("kdevpart_quickopen.rc");
diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h
index 19d92222..6dbfb770 100644
--- a/parts/quickopen/quickopen_part.h
+++ b/parts/quickopen/quickopen_part.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __KDEVPART_QUICKOPEN_H__
-#define __KDEVPART_QUICKOPEN_H__
+#ifndef __KDEVPART_TQUICKOPEN_H__
+#define __KDEVPART_TQUICKOPEN_H__
 
 #include <tqguardedptr.h>
 #include <kdevquickopen.h>
@@ -30,8 +30,9 @@ class KAction;
 class QuickOpenPart : public KDevQuickOpen
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    QuickOpenPart(TQObject *parent, const char *name, const TQStringList &);
+    QuickOpenPart(TQObject *tqparent, const char *name, const TQStringList &);
     virtual ~QuickOpenPart();
 
     void selectItem( ItemDom item );
diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui
index 38e0fcab..13f8f402 100644
--- a/parts/quickopen/quickopenbase.ui
+++ b/parts/quickopen/quickopenbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>QuickOpenDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>QuickOpenDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>nameLabel</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <cstring>nameEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>itemListLabel</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <cstring>itemList</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -73,14 +73,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -135,9 +135,9 @@
     </connection>
     <connection>
         <sender>itemList</sender>
-        <signal>doubleClicked(QListBoxItem*)</signal>
+        <signal>doubleClicked(TQListBoxItem*)</signal>
         <receiver>QuickOpenDialogBase</receiver>
-        <slot>slotExecuted(QListBoxItem*)</slot>
+        <slot>slotExecuted(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>nameEdit</sender>
@@ -153,7 +153,7 @@
     </connection>
     <connection>
         <sender>itemList</sender>
-        <signal>returnPressed(QListBoxItem*)</signal>
+        <signal>returnPressed(TQListBoxItem*)</signal>
         <receiver>QuickOpenDialogBase</receiver>
         <slot>slotReturnPressed()</slot>
     </connection>
@@ -164,13 +164,13 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotTextChanged( const QString &amp; )</slot>
-    <slot>executed( QListBoxItem * )</slot>
-    <slot>slotExecuted( QListBoxItem * )</slot>
+    <slot>executed( TQListBoxItem * )</slot>
+    <slot>slotExecuted( TQListBoxItem * )</slot>
     <slot>slotReturnPressed()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index b97e47a3..993ad9d6 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -35,14 +35,14 @@
 #include "quickopen_part.h"
 #include "quickopenfunctionchooseform.h"
 
-QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl)
-    : QuickOpenDialog( part, parent, name, modal, fl )
+QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    : QuickOpenDialog( part, tqparent, name, modal, fl )
 {
     nameLabel->setText( i18n("Class &name:") );
     itemListLabel->setText( i18n("Class &list:") );
 
     findAllClasses( m_items );
-    QStringList_unique( m_items );
+    TQStringList_unique( m_items );
 
     nameEdit->setFocus();
 
@@ -78,7 +78,7 @@ void QuickOpenClassDialog::accept()
             TQString fileStr;
 
             QuickOpenFunctionChooseForm fdlg( this, "" );
-            fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name()));
+            fdlg.setCaption(i18n("Select The Location of Class %1").tqarg(klasses.first()->name()));
             fdlg.textLabel2->setText(i18n("Class name:"));
 
             for( ClassList::const_iterator it = klasses.constBegin(); it != klasses.constEnd() ; ++it )
diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h
index fd01fe25..41423285 100644
--- a/parts/quickopen/quickopenclassdialog.h
+++ b/parts/quickopen/quickopenclassdialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QUICKOPENCLASSDIALOG_H
-#define QUICKOPENCLASSDIALOG_H
+#ifndef TQUICKOPENCLASSDIALOG_H
+#define TQUICKOPENCLASSDIALOG_H
 
 #include "quickopendialog.h"
 #include <codemodel.h>
@@ -30,8 +30,9 @@ class QuickOpenPart;
 class QuickOpenClassDialog : public QuickOpenDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    QuickOpenClassDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
     virtual ~QuickOpenClassDialog();
 
 public slots:
diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp
index e0d40295..bebbbc53 100644
--- a/parts/quickopen/quickopendialog.cpp
+++ b/parts/quickopen/quickopendialog.cpp
@@ -28,8 +28,8 @@
 #include "quickopendialog.h"
 #include "quickopen_part.h"
 
-QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl)
-    : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part )
+QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    : QuickOpenDialogBase( tqparent, name, modal, fl ), m_part( part )
 {
     nameEdit->installEventFilter(this);
     connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) );
@@ -58,7 +58,7 @@ void QuickOpenDialog::setFirstItemSelected()
     itemList->setCurrentItem(0);
     // We are doing this indirectly because the event handler does things for multiple
     // selections we cannot do through the public interface.
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0);
     TQApplication::sendEvent(itemList, &e);
 }
 
@@ -74,7 +74,7 @@ bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e )
     if (!watched || !e)
         return true;
 
-    if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress))
+    if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(nameEdit)) && (e->type() == TQEvent::KeyPress))
     {
         TQKeyEvent *ke = (TQKeyEvent*)e;
         if (ke->key() == Key_Up)
@@ -117,7 +117,7 @@ TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text)
     TQStringList::const_iterator it = m_items.begin();
     while( it != m_items.end() )
     {
-        if ( (*it).find( re ) != -1 )
+        if ( (*it).tqfind( re ) != -1 )
         {
             matches << *it;
         }
@@ -127,7 +127,7 @@ TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text)
     return matches;
 }
 
-void QuickOpenDialog::QStringList_unique( TQStringList & list )
+void QuickOpenDialog::TQStringList_unique( TQStringList & list )
 {
     if ( list.size() < 2 ) return;
 
diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h
index 6d441684..3b6fe84e 100644
--- a/parts/quickopen/quickopendialog.h
+++ b/parts/quickopen/quickopendialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QUICKOPENDIALOG_H
-#define QUICKOPENDIALOG_H
+#ifndef TQUICKOPENDIALOG_H
+#define TQUICKOPENDIALOG_H
 
 #include <tqstringlist.h>
 #include <tqtimer.h>
@@ -34,9 +34,10 @@ class KCompletion;
 class QuickOpenDialog : public QuickOpenDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+  QuickOpenDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
   virtual ~QuickOpenDialog();
 
   virtual bool eventFilter(TQObject *watched, TQEvent *e);
@@ -51,7 +52,7 @@ protected:
     void maybeUpdateSelection();
     void setFirstItemSelected();
     virtual void itemSelectionChanged();
-    void QStringList_unique( TQStringList & list );
+    void TQStringList_unique( TQStringList & list );
     TQStringList wildCardCompletion( const TQString & text );
     TQStringList m_items;
     QuickOpenPart* m_part;
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index adc4a919..0ceeab21 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -35,8 +35,8 @@
 #include "quickopenfiledialog.h"
 #include "quickopen_part.h"
 
-QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl)
-    : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( false )
+QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    : QuickOpenDialog( part, tqparent, name, modal, fl ), m_hasFullPaths( false )
 {
     nameLabel->setText( i18n("File &name:") );
     itemListLabel->setText( i18n("File &list:") );
@@ -50,14 +50,14 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent,
     setFirstItemSelected();
 }
 
-QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* parent, const char* name, bool modal, WFlags fl)
-    : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( true )
+QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    : QuickOpenDialog( part, tqparent, name, modal, fl ), m_hasFullPaths( true )
 {
     nameLabel->setText( i18n("File &name:") );
     itemListLabel->setText( i18n("File &list:") );
 
     m_items = urls.toStringList();
-    QStringList_unique( m_items );
+    TQStringList_unique( m_items );
 
     if (m_part->project())
     {
diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h
index 852f0f5b..69c51316 100644
--- a/parts/quickopen/quickopenfiledialog.h
+++ b/parts/quickopen/quickopenfiledialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QUICKOPENFILEDIALOG_H
-#define QUICKOPENFILEDIALOG_H
+#ifndef TQUICKOPENFILEDIALOG_H
+#define TQUICKOPENFILEDIALOG_H
 
 #include "quickopendialog.h"
 #include <tqstringlist.h>
@@ -32,9 +32,10 @@ class KCompletion;
 class QuickOpenFileDialog : public QuickOpenDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
-    QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
     virtual ~QuickOpenFileDialog();
 
 public slots:
diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp
index a8853417..63d487b8 100644
--- a/parts/quickopen/quickopenfunctionchooseform.cpp
+++ b/parts/quickopen/quickopenfunctionchooseform.cpp
@@ -28,10 +28,10 @@
 
 #include "quickopenfunctionchooseform.h"
 
-QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl)
-: QuickOpenFunctionChooseFormBase(parent,name, modal,fl)
+QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: QuickOpenFunctionChooseFormBase(tqparent,name, modal,fl)
 {
-	setCaption( i18n("Select One Argument or File of Function %1").arg( name ) );
+	setCaption( i18n("Select One Argument or File of Function %1").tqarg( name ) );
 	slotArgsChange( 0 );
 	slotFileChange( 0 );
 }
diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h
index b8d462a5..1119b4fa 100644
--- a/parts/quickopen/quickopenfunctionchooseform.h
+++ b/parts/quickopen/quickopenfunctionchooseform.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QUICKOPENFUNCTIONCHOOSEFORM_H
-#define QUICKOPENFUNCTIONCHOOSEFORM_H
+#ifndef TQUICKOPENFUNCTIONCHOOSEFORM_H
+#define TQUICKOPENFUNCTIONCHOOSEFORM_H
 
 #include "quickopenfunctionchooseformbase.h"
 
@@ -28,9 +28,10 @@
 class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  QuickOpenFunctionChooseForm(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~QuickOpenFunctionChooseForm();
 
   void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; }
diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui
index 09c872d9..81ae7d2d 100644
--- a/parts/quickopen/quickopenfunctionchooseformbase.ui
+++ b/parts/quickopen/quickopenfunctionchooseformbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>QuickOpenFunctionChooseFormBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>QuickOpenFunctionChooseFormBase</cstring>
     </property>
@@ -32,7 +32,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="3">
+        <widget class="TQPushButton" row="2" column="3">
             <property name="name">
                 <cstring>cancelBtn</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
+        <widget class="TQPushButton" row="2" column="2">
             <property name="name">
                 <cstring>okBtn</cstring>
             </property>
@@ -70,15 +70,15 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -111,22 +111,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>261</width>
                     <height>31</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -218,11 +218,11 @@
     <tabstop>okBtn</tabstop>
     <tabstop>cancelBtn</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot specifier="pure virtual">slotFileChange( int id )</slot>
     <slot specifier="pure virtual">slotArgsChange( int id )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index 8b877b8b..3887ced4 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -39,8 +39,8 @@
 #include "quickopenfunctionchooseform.h"
 #include "quickopenfunctiondialog.h"
 
-QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* parent, const char* name, bool modal, WFlags fl)
-: QuickOpenDialog(part, parent, name, modal, fl)
+QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: QuickOpenDialog(part, tqparent, name, modal, fl)
 {
         nameLabel->setText( i18n("Function &name:") );
         itemListLabel->setText( i18n("Function &list:") );
@@ -74,7 +74,7 @@ void QuickOpenFunctionDialog::fillItemList() {
 
     for( FunctionList::const_iterator it = m_functionDefList.begin(); it != m_functionDefList.end(); ++it )
       m_items << (*it)->name();
-    QStringList_unique( m_items );
+    TQStringList_unique( m_items );
 }
 
 QuickOpenFunctionDialog::~QuickOpenFunctionDialog()
@@ -207,7 +207,7 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() {
             }
             m_functionDefList = accepted;
             m_items = acceptedItems;
-            QStringList_unique( m_items );
+            TQStringList_unique( m_items );
         }
 
         m_scope = scope;
diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h
index c02a9296..24da168b 100644
--- a/parts/quickopen/quickopenfunctiondialog.h
+++ b/parts/quickopen/quickopenfunctiondialog.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef QUICKOPENFUNCTIONDLG_H
-#define QUICKOPENFUNCTIONDLG_H
+#ifndef TQUICKOPENFUNCTIONDLG_H
+#define TQUICKOPENFUNCTIONDLG_H
 
 #include <codemodel.h>
 
@@ -32,9 +32,10 @@ class QuickOpenPart;
 class QuickOpenFunctionDialog : public QuickOpenDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~QuickOpenFunctionDialog();
   
   void gotoFile( TQString name );
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 834b7a1e..5d9b6e88 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -66,23 +66,19 @@ void RegexpTestDialog::somethingChanged()
     subgroups_listview->clear();
 
     if ( qregexp_button->isChecked() || qregexp_min_button->isChecked() )
-        checkQRegExp();
+        checkTQRegExp();
     else if ( kregexp_button->isChecked() )
 	checkKRegExp();
     else
         checkPOSIX();
 }
 
-void RegexpTestDialog::checkQRegExp()
+void RegexpTestDialog::checkTQRegExp()
 {
     TQRegExp rx( pattern_edit->text() );
     rx.setMinimal( qregexp_min_button->isChecked() );
     if ( !rx.isValid() ) {
-#if QT_VERSION >= 0x030100
 	success_label->setText( rx.errorString() );
-#else
-	success_label->setText( i18n("Error compiling the regular expression.") );
-#endif
 	return;
     }
     if ( rx.search( teststring_edit->text() ) < 0 ) {
@@ -90,11 +86,7 @@ void RegexpTestDialog::checkQRegExp()
 	return;
     }
     success_label->setText( i18n("Successfully matched") );
-#if QT_VERSION >= 0x030100
     int numCaptures = rx.numCaptures() + 1;
-#else
-    int numCaptures = 10;
-#endif
     for ( int i = 0; i < numCaptures; ++i ) {
 	new TQListViewItem( subgroups_listview, TQString::number( i ), rx.cap( i ) );
     }
@@ -152,7 +144,7 @@ void RegexpTestDialog::checkPOSIX()
                 regcompMessage = i18n("Invalid collating element");
                 break;
             case REG_EPAREN:
-                regcompMessage = i18n("Unmatched parenthesis group operators");
+                regcompMessage = i18n("Unmatched tqparenthesis group operators");
                 break;
             case REG_ESUBREG:
                 regcompMessage = i18n("Invalid back reference to subexpression");
diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h
index 6b02ea02..457e53fb 100644
--- a/parts/regexptest/regexptestdlg.h
+++ b/parts/regexptest/regexptestdlg.h
@@ -20,6 +20,7 @@ class KDevPlugin;
 class RegexpTestDialog : public RegexpTestDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     RegexpTestDialog( KDevPlugin *part );
@@ -34,7 +35,7 @@ protected slots:
 private:
     virtual void somethingChanged();
     virtual void checkPOSIX();
-    virtual void checkQRegExp();
+    virtual void checkTQRegExp();
     virtual void checkKRegExp();
     virtual void insertQuoted();
 
diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui
index 7b52620a..1b5b01f9 100644
--- a/parts/regexptest/regexptestdlgbase.ui
+++ b/parts/regexptest/regexptestdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>RegexpTestDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>regexp_test_dialog</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>pattern_label</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <cstring>pattern_edit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>teststring_label</cstring>
             </property>
@@ -52,7 +52,7 @@
                 <string>Enter a string which will be matched against the regular expression</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>success_label</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -79,7 +79,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>insertbutton</cstring>
                     </property>
@@ -103,14 +103,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelbutton</cstring>
                     </property>
@@ -134,7 +134,7 @@
                 <string>enter a regular expression, for example &lt;tt&gt;KD.*&lt;/tt&gt;, which matches all strings beginning with "KD"</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>flavor_group</cstring>
             </property>
@@ -153,7 +153,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>basicposix_button</cstring>
                     </property>
@@ -167,7 +167,7 @@
                         <string>A description of this syntax can be found in the grep manpage</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>extendedposix_button</cstring>
                     </property>
@@ -178,7 +178,7 @@
                         <string>A description of this syntax can be found in the grep manpage</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>qregexp_button</cstring>
                     </property>
@@ -189,7 +189,7 @@
                         <string>A description of this syntax can be found in the documentation of the QRegExp class</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>qregexp_min_button</cstring>
                     </property>
@@ -200,7 +200,7 @@
                         <string>Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation for more details.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>kregexp_button</cstring>
                     </property>
@@ -213,7 +213,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QPushButton" row="0" column="2">
+        <widget class="TQPushButton" row="0" column="2">
             <property name="name">
                 <cstring>rxedit_button</cstring>
             </property>
@@ -224,15 +224,15 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>subgroups_label</cstring>
                     </property>
@@ -240,7 +240,7 @@
                         <string>Matched subgroups:</string>
                     </property>
                 </widget>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Group</string>
@@ -339,13 +339,13 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">insertQuoted()</slot>
     <slot>somethingChanged()</slot>
     <slot access="protected">showRegExpEditor()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 8a3c8bd5..a991171a 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -24,8 +24,8 @@ static const KDevPluginInfo data("kdevregexptest");
 typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
 
-RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
+RegexpTestPart::RegexpTestPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "RegexpTestPart")
 {
     setInstance(RegexpTestFactory::instance());
     setXMLFile("kdevregexptest.rc");
diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h
index d0446cef..5318b86e 100644
--- a/parts/regexptest/regexptestpart.h
+++ b/parts/regexptest/regexptestpart.h
@@ -22,9 +22,10 @@ class RegexpTestDialog;
 class RegexpTestPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    RegexpTestPart( TQObject *parent, const char *name, const TQStringList & );
+    RegexpTestPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~RegexpTestPart();
 
 private slots:
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 7a64cac8..ebeeb311 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -24,24 +24,24 @@
 
 #include "replace_widget.h"
 
-static const KDevPluginInfo data("kdevreplace");
+static const KDevPluginInfo data("kdevtqreplace");
 
 typedef KDevGenericFactory<ReplacePart> ReplaceFactory;
-K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data))
+K_EXPORT_COMPONENT_FACTORY(libkdevtqreplace, ReplaceFactory(data))
 
-ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& )
-        : KDevPlugin( &data, parent, name ? name : "ReplacePart" )
+ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringList& )
+        : KDevPlugin( &data, tqparent, name ? name : "ReplacePart" )
 {
     setInstance(ReplaceFactory::instance());
-    setXMLFile("kdevpart_replace.rc");
+    setXMLFile("kdevpart_tqreplace.rc");
 
     m_widget = new ReplaceWidget(this);
-    m_widget->setIcon( SmallIcon("filefind") );
+    m_widget->setIcon( SmallIcon("filetqfind") );
     m_widget->setCaption(i18n("Replace"));
 
     TQWhatsThis::add
         (m_widget, i18n("<b>Replace</b><p>"
-                        "This window shows a preview of a string replace "
+                        "This window shows a preview of a string tqreplace "
                         "operation. Uncheck a line to exclude that replacement. "
                         "Uncheck a file to exclude the whole file from the "
                         "operation. "
@@ -60,7 +60,7 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList&
                                "can enter a string or a regular expression which is then "
                                "searched for within all files in the locations "
                                "you specify. Matches will be displayed in the <b>Replace</b> window, you "
-                               "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") );
+                               "can replace them with the specified string, exclude them from replace operation or cancel the whole tqreplace.") );
 
 	connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction()));
@@ -99,9 +99,9 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context)
     if (!ident.isEmpty()) {
         m_popupstr = ident;
         TQString squeezed = KStringHandler::csqueeze(ident, 30);
-        int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed),
+        int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed),
                            this, TQT_SLOT(slotReplace()) );
-        popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
+        popup->tqsetWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
                                "and sets the pattern to the text under the cursor."));
         popup->insertSeparator();
     }
diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h
index 8fb6f5e3..efad03bd 100644
--- a/parts/replace/replace_part.h
+++ b/parts/replace/replace_part.h
@@ -25,9 +25,10 @@ class Context;
 class ReplacePart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ReplacePart(TQObject *parent, const char *name, const TQStringList &);
+    ReplacePart(TQObject *tqparent, const char *name, const TQStringList &);
     ~ReplacePart();
 
 public slots:
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index c20c3bbc..957f845a 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -65,25 +65,25 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
         _terminateOperation( false )
 {
     // setup outputview
-    TQVBoxLayout * layout = new TQVBoxLayout( this );
-    TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout );
+    TQVBoxLayout * tqlayout = new TQVBoxLayout( this );
+    TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout );
 
     _cancel = new KPushButton( KStdGuiItem::cancel(), this );
-    _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this );
+    _tqreplace = new KPushButton( KGuiItem(i18n("Replace"),"filetqfind"), this );
 
     _cancel->setEnabled( false );
-    _replace->setEnabled( false );
+    _tqreplace->setEnabled( false );
 
-    buttonlayout->addWidget( _replace );
-    buttonlayout->addWidget( _cancel );
+    buttontqlayout->addWidget( _tqreplace );
+    buttontqlayout->addWidget( _cancel );
 
     _listview = new ReplaceView( this );
-    layout->addWidget( _listview );
+    tqlayout->addWidget( _listview );
 
     //  setup signals
-    connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) );
+    connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( tqfind() ) );
 
-    connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) );
+    connect( _tqreplace, TQT_SIGNAL( clicked() ), TQT_SLOT( tqreplace() ) );
     connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) );
     connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) );
 
@@ -142,7 +142,7 @@ void ReplaceWidget::showDialog()
 }
 
 
-void ReplaceWidget::find()
+void ReplaceWidget::tqfind()
 {
     _listview->clear();
     m_part->mainWindow()->raiseView( this );
@@ -153,7 +153,7 @@ void ReplaceWidget::find()
     if ( showReplacements() )
     {
         _cancel->setEnabled( true );
-        _replace->setEnabled( true );
+        _tqreplace->setEnabled( true );
     }
     else
     {
@@ -162,7 +162,7 @@ void ReplaceWidget::find()
     }
 }
 
-void ReplaceWidget::replace()
+void ReplaceWidget::tqreplace()
 {
     makeReplacements();
     clear();
@@ -174,7 +174,7 @@ void ReplaceWidget::clear()
     _listview->clear();
 
     _cancel->setEnabled( false );
-    _replace->setEnabled( false );
+    _tqreplace->setEnabled( false );
 
     m_part->mainWindow()->setViewAvailable( this, false );
 }
@@ -215,7 +215,7 @@ bool ReplaceWidget::showReplacements()
             break;
         }
 
-        if ( openfiles.contains( *it ) )
+        if ( openfiles.tqcontains( *it ) )
         {
             if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( *it ) )
             {
@@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements()
         }
         ++it;
 
-        kapp->processEvents( 100 );
+        kapp->tqprocessEvents( 100 );
     }
 
     m_part->core()->running( m_part, false );
@@ -290,7 +290,7 @@ bool ReplaceWidget::makeReplacements()
         {
             TQString currentfile = fileitem->file();
 
-            if ( openfiles.contains( currentfile ) )
+            if ( openfiles.tqcontains( currentfile ) )
             {
                 if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( currentfile ) )
                 {
@@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements()
         }
         fileitem = fileitem->nextSibling();
 
-        kapp->processEvents( 100 );
+        kapp->tqprocessEvents( 100 );
     }
 
     // Telling the project about the edited files
@@ -343,7 +343,7 @@ bool ReplaceWidget::makeReplacements()
 
     m_part->core()->running( m_part, false );
 
-    if ( calledUrl != TQString::null )
+    if ( calledUrl != TQString() )
     {
         m_part->partController()->editDocument( calledUrl, calledLine );
         setCursorPos( m_part->partController()->activePart(), calledCol, calledLine );
@@ -437,7 +437,7 @@ TQStringList ReplaceWidget::openProjectFiles()
             if ( KTextEditor::Editor * ed = dynamic_cast<KTextEditor::Editor *>( part ) )
             {
                 TQString editorpath = ed->url().path();
-                if ( projectfiles.contains( editorpath ) )
+                if ( projectfiles.tqcontains( editorpath ) )
                 {
                     openfiles.append( editorpath );
                 }
diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h
index 771643db..ea1e3dc6 100644
--- a/parts/replace/replace_widget.h
+++ b/parts/replace/replace_widget.h
@@ -26,9 +26,10 @@ class ReplaceDlgImpl;
 class ReplaceItem;
 class ReplaceView;
 
-class ReplaceWidget : public QWidget
+class ReplaceWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ReplaceWidget(ReplacePart *part);
@@ -41,8 +42,8 @@ protected:
     virtual void focusInEvent(TQFocusEvent *e);
 
 private slots:
-    void find();
-    void replace();
+    void tqfind();
+    void tqreplace();
     void clear();
     void editDocument( const TQString & ,int );
     void setCursorPos( KParts::Part *part, uint line, uint col );
@@ -68,7 +69,7 @@ private:
 
     ReplaceView * _listview;
     TQPushButton * _cancel;
-    TQPushButton * _replace;
+    TQPushButton * _tqreplace;
 
     uint calledCol;
     uint calledLine;
diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui
index b1c7db92..81d9fd68 100644
--- a/parts/replace/replacedlg.ui
+++ b/parts/replace/replacedlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ReplaceDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ReplaceDlg</cstring>
     </property>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -33,7 +33,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>case_box</cstring>
                     </property>
@@ -55,7 +55,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>buttonGroup2</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>strings_all_radio</cstring>
                             </property>
@@ -83,7 +83,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>strings_wholewords_radio</cstring>
                             </property>
@@ -91,15 +91,15 @@
                                 <string>Whole words onl&amp;y</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>strings_regexp_radio</cstring>
                                     </property>
@@ -110,7 +110,7 @@
                                         <string>Use regexp to specify target</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>regexp_button</cstring>
                                     </property>
@@ -141,7 +141,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0">
+        <widget class="TQButtonGroup" row="2" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -152,7 +152,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>files_all_radio</cstring>
                     </property>
@@ -166,7 +166,7 @@
                         <string>All files in the project will be considered.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>files_open_radio</cstring>
                     </property>
@@ -177,7 +177,7 @@
                         <string>Only open project files will be considered.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>files_path_radio</cstring>
                     </property>
@@ -198,15 +198,15 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>expression_varning_label</cstring>
                     </property>
@@ -229,14 +229,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>find_button</cstring>
                     </property>
@@ -250,7 +250,7 @@
                         <string>Start looking for possible replacement targets.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancel_button</cstring>
                     </property>
@@ -260,7 +260,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -271,12 +271,12 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Text to find:</string>
+                        <string>&amp;Text to tqfind:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>find_combo</cstring>
@@ -290,7 +290,7 @@
                         <string>Target string</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -369,8 +369,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp
index b0c5bffd..0973e54f 100644
--- a/parts/replace/replacedlgimpl.cpp
+++ b/parts/replace/replacedlgimpl.cpp
@@ -27,7 +27,7 @@ TQString escape(const TQString &str)
 
     for (uint i=0; i < str.length(); ++i)
     {
-        if (escaped.find(str[i]) != -1)
+        if (escaped.tqfind(str[i]) != -1)
             res += "\\";
         res += str[i];
     }
@@ -37,8 +37,8 @@ TQString escape(const TQString &str)
 }
 
 
-ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, WFlags fl)
-        : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 )
+ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+        : ReplaceDlg(tqparent,name, modal,fl), _regexp_dialog( 0 )
 
 {
     connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) );
diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h
index 5ff94c75..73d49cb5 100644
--- a/parts/replace/replacedlgimpl.h
+++ b/parts/replace/replacedlgimpl.h
@@ -9,9 +9,10 @@ class TQDialog;
 class ReplaceDlgImpl : public ReplaceDlg
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ReplaceDlgImpl(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~ReplaceDlgImpl();
 
     TQRegExp expressionPattern();
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index d810e2ad..087e2b1f 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -45,18 +45,18 @@ void ReplaceItem::setChecked( bool checked )
 {
     if ( !isFile() )	// this is a child item
     {
-        if ( checked || !(parent()->hasCheckedChildren()))
+        if ( checked || !(tqparent()->hasCheckedChildren()))
         {
-            if ( parent()->isOn() != checked )
+            if ( tqparent()->isOn() != checked )
             {
-                parent()->_clicked = false;
-                parent()->setOn( checked );
+                tqparent()->_clicked = false;
+                tqparent()->setOn( checked );
             }
         }
         return;
     }
 
-    // this is a parent item, set self and children
+    // this is a tqparent item, set self and tqchildren
     ReplaceItem * item = firstChild();
     while ( item )
     {
@@ -84,13 +84,13 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
     const BackgroundMode bgmode = lv->viewport()->backgroundMode();
     const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
 
-    if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
+    if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
         p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
     else
         lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
 
     TQFontMetrics fm( lv->fontMetrics() );
-    int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+    int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
     int marg = lv->itemMargin();
     int r = marg;
 
@@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
     else
         y = (fm.height() + 2 + marg - boxsize) / 2;
 
-    lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
+    lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
                               TQRect(x, y, boxsize,
                                     fm.height() + 2 + marg),
                               cg, styleflags, TQStyleOption(this));
@@ -128,8 +128,8 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
     p->setPen( TQPen( cg.text() ) );
 
     TQColorGroup mcg = cg;
-    mcg.setColor( TQColorGroup::Text, ( isFile() ? Qt::darkGreen : Qt::blue ) );
-    mcg.setColor( TQColorGroup::HighlightedText, ( isFile() ? Qt::darkGreen : Qt::blue ) );
+    mcg.setColor( TQColorGroup::Text, ( isFile() ? TQt::darkGreen : TQt::blue ) );
+    mcg.setColor( TQColorGroup::HighlightedText, ( isFile() ? TQt::darkGreen : TQt::blue ) );
 
     TQListViewItem::paintCell( p, mcg, column, width - r, align );
 }
@@ -138,8 +138,8 @@ void ReplaceItem::activate( int, TQPoint const & localPos )
 {
     TQListView * lv = listView();
     TQCheckBox cb(0);
-    int boxsize = cb.sizeHint().width();
-//that's KDE-3.1 only    int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+    int boxsize = cb.tqsizeHint().width();
+//that's KDE-3.1 only    int boxsize = lv->style().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
     int rightside = lv->itemMargin() + boxsize + ( isFile() ? 0 : lv->treeStepSize() );
 
     // _lineclicked indicates if the click was on the line or in the checkbox
diff --git a/parts/replace/replaceitem.h b/parts/replace/replaceitem.h
index 4cea682c..8d4f3fd3 100644
--- a/parts/replace/replaceitem.h
+++ b/parts/replace/replaceitem.h
@@ -18,12 +18,12 @@
 
 #include "replaceview.h"
 
-class ReplaceItem : public QCheckListItem
+class ReplaceItem : public TQCheckListItem
 {
 public:
     // the file item
-    ReplaceItem( ReplaceView * parent, ReplaceItem * after, TQString file ) :
-            TQCheckListItem( parent,
+    ReplaceItem( ReplaceView * tqparent, ReplaceItem * after, TQString file ) :
+            TQCheckListItem( tqparent,
                             after,
                             file, TQCheckListItem::CheckBox ),
             _file( file ), _string( file ), _line( 0 ), _isfile( true ),
@@ -34,8 +34,8 @@ public:
     }
 
     // the line item
-    ReplaceItem( ReplaceItem * parent, ReplaceItem * after, TQString file, TQString string, int line ) :
-            TQCheckListItem( parent,
+    ReplaceItem( ReplaceItem * tqparent, ReplaceItem * after, TQString file, TQString string, int line ) :
+            TQCheckListItem( tqparent,
                             after,
                             TQString::number( line + 1 ) + ": " + string, TQCheckListItem::CheckBox ),
             _file( file ), _string( string ), _line( line ), _isfile( false ),
@@ -76,9 +76,9 @@ public:
         return _lineclicked;
     }
 
-    ReplaceItem * parent() const
+    ReplaceItem * tqparent() const
     {
-        return static_cast<ReplaceItem*>( TQListViewItem::parent() );
+        return static_cast<ReplaceItem*>( TQListViewItem::tqparent() );
     }
 
     ReplaceItem * firstChild() const
diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp
index 6730971a..5f5eee77 100644
--- a/parts/replace/replaceview.cpp
+++ b/parts/replace/replaceview.cpp
@@ -27,7 +27,7 @@ ReplaceItem * ReplaceView::firstChild() const
 }
 
 
-ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile( 0 )
+ReplaceView::ReplaceView( TQWidget * tqparent ) : KListView( tqparent ), _latestfile( 0 )
 {
     setSorting( -1 );
     addColumn( "" );
@@ -36,7 +36,7 @@ ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile
 
     TQPalette pal = palette();
     TQColorGroup cg = pal.active();
-    cg.setColor( TQColorGroup::Highlight, Qt::lightGray );
+    cg.setColor( TQColorGroup::Highlight, TQt::lightGray );
     pal.setActive( cg );
     setPalette( pal );
 
@@ -60,7 +60,7 @@ void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream
                 line++;
             }
             // this is the hit
-            ostream << istream.readLine().replace( _regexp, _replacement ) << "\n";
+            ostream << istream.readLine().tqreplace( _regexp, _replacement ) << "\n";
             line++;
         }
 
@@ -84,9 +84,9 @@ void ReplaceView::showReplacementsForFile( TQTextStream & stream, TQString const
     {
         TQString s = stream.readLine();
 
-        if ( s.contains( _regexp ) > 0 )
+        if ( s.tqcontains( _regexp ) > 0 )
         {
-            s.replace( _regexp, _replacement );
+            s.tqreplace( _regexp, _replacement );
 
             if ( firstline )
             {
@@ -119,7 +119,7 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po
         else if ( btn == Qt::LeftButton )
         {
             // map pos to item/column and call ReplacetItem::activate(pos)
-            item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) );
+            item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(item).top() ) );
         }
     }
 }
diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h
index 7031d80d..ceb480f3 100644
--- a/parts/replace/replaceview.h
+++ b/parts/replace/replaceview.h
@@ -24,6 +24,7 @@ class ReplaceItem;
 class ReplaceView : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 signals:
     void editDocument( const TQString &, int );
diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp
index 78749465..6314306e 100644
--- a/parts/scripting/scriptingglobalconfig.cpp
+++ b/parts/scripting/scriptingglobalconfig.cpp
@@ -24,8 +24,8 @@
 #include <keditlistbox.h>
 #include <kapplication.h>
 #include <kconfig.h>
-scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name)
-    : scriptingGlobalConfigBase(parent, name), m_part(part)
+scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent, const char *name)
+    : scriptingGlobalConfigBase(tqparent, name), m_part(part)
 {
     // read kconfig and post list to the m_dirs
     KConfig *cfg = kapp->config();
diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h
index 85343e33..3d132d58 100644
--- a/parts/scripting/scriptingglobalconfig.h
+++ b/parts/scripting/scriptingglobalconfig.h
@@ -28,8 +28,9 @@ class scriptingPart;
 class scriptingGlobalConfig: public scriptingGlobalConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0);
+    scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/scripting/scriptingglobalconfigbase.ui b/parts/scripting/scriptingglobalconfigbase.ui
index 19647501..155925f5 100644
--- a/parts/scripting/scriptingglobalconfigbase.ui
+++ b/parts/scripting/scriptingglobalconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>scriptingGlobalConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>scriptingGlobalConfigBase</cstring>
     </property>
@@ -33,7 +33,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -43,7 +43,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 496746b2..7a332fd8 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -47,8 +47,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
+scriptingPart::scriptingPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, tqparent, name ? name : "scriptingPart"), m_scripts(0L)
 {
     setInstance(scriptingFactory::instance());
     setXMLFile("kdevscripting.rc");
@@ -86,8 +86,8 @@ void scriptingPart::setupActions()
     KConfig *cfg = kapp->config();
     searchDirs += cfg->readListEntry("SearchDirs");
     
-    unplugActionList(TQString::fromLatin1( "script_actions" ));
-    plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
+    unplugActionList(TQString::tqfromLatin1( "script_actions" ));
+    plugActionList( TQString::tqfromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
 }
 
 void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h
index 5d1c2c6c..8465764d 100644
--- a/parts/scripting/scriptingpart.h
+++ b/parts/scripting/scriptingpart.h
@@ -37,8 +37,9 @@ Please read the README.dox file for more info about this part
 class scriptingPart: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    scriptingPart(TQObject *parent, const char *name, const TQStringList &args);
+    scriptingPart(TQObject *tqparent, const char *name, const TQStringList &args);
     ~scriptingPart();
 
     public slots:
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index eb1c47ac..e130d1e6 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -37,8 +37,8 @@ static const KDevPluginInfo data("kdevsnippet");
 typedef KDevGenericFactory<SnippetPart> snippetFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) )
 
-SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin(&data, parent, name ? name : "SnippetPart" )
+SnippetPart::SnippetPart(TQObject *tqparent, const char *name, const TQStringList& )
+  : KDevPlugin(&data, tqparent, name ? name : "SnippetPart" )
 {
   setInstance(snippetFactory::instance());
   setXMLFile("kdevpart_snippet.rc");
@@ -112,9 +112,9 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg )
 TQStringList SnippetPart::getAllLanguages()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
-                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
-                               ).arg( KDEVELOP_PLUGIN_VERSION ));
+        KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
+                               TQString::tqfromLatin1("[X-KDevelop-Version] == %1"
+                               ).tqarg( KDEVELOP_PLUGIN_VERSION ));
     
     TQStringList languages;
 
diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h
index c62950fc..f9f7bc93 100644
--- a/parts/snippet/snippet_part.h
+++ b/parts/snippet/snippet_part.h
@@ -27,10 +27,11 @@ For more info read the README.dox file
 class SnippetPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  SnippetPart(TQObject *parent, const char *name, const TQStringList &);
+  SnippetPart(TQObject *tqparent, const char *name, const TQStringList &);
   ~SnippetPart();
   KAboutData * aboutData();
     TQStringList getAllLanguages();
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 2c35d5c5..e555115a 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -50,7 +50,7 @@ SnippetWidget::SnippetWidget(SnippetPart *part)
 		: KListView(0, "snippet widget"), TQToolTip( viewport() ),
 		m_part( part )
 {
-    // init the QPtrList
+    // init the TQPtrList
     _list.setAutoDelete(TRUE);
 
     // init the KListView
@@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget()
   writeConfig();
   delete _cfg;
 
-  /* We need to delete the child items before the parent items
+  /* We need to delete the child items before the tqparent items
      otherwise KDevelop would crash on exiting */
   SnippetItem * item;
   while (_list.count() > 0) {
@@ -111,7 +111,7 @@ void SnippetWidget::slotAdd()
     which the selected item is a child of*/
   SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem());
   if (!group)
-    group = dynamic_cast<SnippetGroup*>(selectedItem()->parent());
+    group = dynamic_cast<SnippetGroup*>(selectedItem()->tqparent());
 
   /*fill the combobox with the names of all SnippetGroup entries*/
   for (SnippetItem *it=_list.first(); it; it=_list.next()) {
@@ -165,7 +165,7 @@ void SnippetWidget::slotRemove()
 
   if (group) {
     if (group->childCount() > 0 &&
-        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString::null,KStdGuiItem::del())
+        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString(),KStdGuiItem::del())
         == KMessageBox::Cancel)
       return;
 
@@ -218,10 +218,10 @@ void SnippetWidget::slotEdit()
     pSnippet->setName( dlg.snippetName->text() );
     pSnippet->setText( dlg.snippetText->text() );
 
-    /* if the user changed the parent we need to move the snippet */
+    /* if the user changed the tqparent we need to move the snippet */
     if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) {
       SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list));
-      pSnippet->parent()->takeItem(pSnippet);
+      pSnippet->tqparent()->takeItem(pSnippet);
       newGroup->insertItem(pSnippet);
       pSnippet->resetParent();
     }
@@ -327,9 +327,9 @@ void SnippetWidget::writeConfig()
     SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
     if (group) {
       kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
-      strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount);
-      strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount);
-      strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount);
+      strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount);
+      strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount);
+      strKeyText=TQString("snippetGroupLang_%1").tqarg(iGroupCount);
 
       _cfg->writeEntry(strKeyName, group->getName());
       _cfg->writeEntry(strKeyId, group->getId());
@@ -337,9 +337,9 @@ void SnippetWidget::writeConfig()
       iGroupCount++;
     } else if (dynamic_cast<SnippetItem*>(item)) {
       kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
-      strKeyName=TQString("snippetName_%1").arg(iSnipCount);
-      strKeyText=TQString("snippetText_%1").arg(iSnipCount);
-      strKeyId=TQString("snippetParent_%1").arg(iSnipCount);
+      strKeyName=TQString("snippetName_%1").tqarg(iSnipCount);
+      strKeyText=TQString("snippetText_%1").tqarg(iSnipCount);
+      strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount);
 
       _cfg->writeEntry(strKeyName, item->getName());
       _cfg->writeEntry(strKeyText, item->getText());
@@ -357,8 +357,8 @@ void SnippetWidget::writeConfig()
   for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) {  //write the saved variable values
     if (it.data().length()<=0) continue;  //is the saved value has no length -> no need to save it
 
-    strKeyName=TQString("snippetSavedName_%1").arg(iCount);
-    strKeyText=TQString("snippetSavedVal_%1").arg(iCount);
+    strKeyName=TQString("snippetSavedName_%1").tqarg(iCount);
+    strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount);
 
     _cfg->writeEntry(strKeyName, it.key());
     _cfg->writeEntry(strKeyText, it.data());
@@ -394,8 +394,8 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg)
   TQString strKeyName="";
   TQString strKeyText="";
   for ( int i=0; i<iCount; i++) {  //read the snippet-list
-    strKeyName=TQString("snippetName_%1").arg(i);
-    strKeyText=TQString("snippetText_%1").arg(i);
+    strKeyName=TQString("snippetName_%1").tqarg(i);
+    strKeyText=TQString("snippetText_%1").tqarg(i);
 
     TQString strNameVal="";
     TQString strTextVal="";
@@ -434,9 +434,9 @@ void SnippetWidget::initConfig()
   int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
 
   for ( int i=0; i<iCount; i++) {  //read the group-list
-    strKeyName=TQString("snippetGroupName_%1").arg(i);
-    strKeyId=TQString("snippetGroupId_%1").arg(i);
-    strKeyText=TQString("snippetGroupLang_%1").arg(i);
+    strKeyName=TQString("snippetGroupName_%1").tqarg(i);
+    strKeyId=TQString("snippetGroupId_%1").tqarg(i);
+    strKeyText=TQString("snippetGroupLang_%1").tqarg(i);
 
     TQString strNameVal="";
     int iIdVal=-1;
@@ -465,9 +465,9 @@ void SnippetWidget::initConfig()
   if (iCount != -1) {
     iCount = _cfg->readNumEntry("snippetCount", 0);
     for ( int i=0; i<iCount; i++) {  //read the snippet-list
-        strKeyName=TQString("snippetName_%1").arg(i);
-        strKeyText=TQString("snippetText_%1").arg(i);
-        strKeyId=TQString("snippetParent_%1").arg(i);
+        strKeyName=TQString("snippetName_%1").tqarg(i);
+        strKeyText=TQString("snippetText_%1").tqarg(i);
+        strKeyId=TQString("snippetParent_%1").tqarg(i);
 
         TQString strNameVal="";
         TQString strTextVal="";
@@ -491,9 +491,9 @@ void SnippetWidget::initConfig()
 
   iCount = _cfg->readNumEntry("snippetSavedCount", 0);
 
-  for ( int i=1; i<=iCount; i++) {  //read the saved-values and store in QMap
-    strKeyName=TQString("snippetSavedName_%1").arg(i);
-    strKeyText=TQString("snippetSavedVal_%1").arg(i);
+  for ( int i=1; i<=iCount; i++) {  //read the saved-values and store in TQMap
+    strKeyName=TQString("snippetSavedName_%1").tqarg(i);
+    strKeyText=TQString("snippetSavedVal_%1").tqarg(i);
 
     TQString strNameVal="";
     TQString strTextVal="";
@@ -526,7 +526,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
 	if (!item)
 	  return;
 
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if (r.isValid() &&
         _SnippetConfig.useToolTips() )
@@ -589,15 +589,15 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
   TQRect rMulti = _SnippetConfig.getMultiRect();
 
   do {
-    iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1);  //find the next variable by this QRegExp
+    iFound = text.tqfind(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1);  //find the next variable by this TQRegExp
     if (iFound >= 0) {
-      iEnd = text.find(del, iFound+1)+1;
+      iEnd = text.tqfind(del, iFound+1)+1;
       strName = text.mid(iFound, iEnd-iFound);
 
       if ( strName != del+del  ) {  //if not doubel-delimiter 
         if (iInMeth == 0) { //if input-method "single" is selected
           if ( mapVar[strName].length() <= 0 ) {  // and not already in map
-            strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
+            strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName);
             strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
             if (strNew=="")
               return ""; //user clicked Cancle
@@ -612,7 +612,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
       }
 
       if (iInMeth == 0) {  //if input-method "single" is selected
-        str.replace(strName, strNew);
+        str.tqreplace(strName, strNew);
       }
 
       mapVar[strName] = strNew;
@@ -627,13 +627,13 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
     if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) {  //generate and show the dialog
       TQMap<TQString, TQString>::Iterator it;
       for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the replacement
-        str.replace(it.key(), it.data());
+        str.tqreplace(it.key(), it.data());
       }
     } else {
       return "";
     }
 
-    rMulti.setWidth(w);   //this is a hack to save the dialog's dimensions in only one QRect
+    rMulti.setWidth(w);   //this is a hack to save the dialog's dimensions in only one TQRect
     rMulti.setHeight(bh);
     rMulti.setTop(oh);
     rMulti.setLeft(0);
@@ -671,35 +671,35 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
+  TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
+  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
+  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
   labTop->setText(i18n("Enter the replacement values for these variables:"));
-  layoutTop->addWidget(labTop, 0, 0);
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   int i = 0;                                           //walk through the variable map and add
-  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main layout
+  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main tqlayout
     if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
       continue;
 
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
+    tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    layoutVar->addWidget( te, i, 1, Qt::AlignTop );
+    tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
     i++;
   }
-  layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
   btn1->setText(i18n("&Cancel"));
-  btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
   btn2->setText(i18n("&Apply"));
   btn2->setDefault( TRUE );
-  btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
   //connect the buttons to the TQDialog default slots
@@ -742,7 +742,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   bool bReturn = false;
   //resize the textedits
   if (iWidth > 1) {
-    TQRect r = dlg.geometry();
+    TQRect r = dlg.tqgeometry();
     r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
     r.setWidth(iWidth);
     dlg.setGeometry(r);
@@ -763,9 +763,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     }
     bReturn = true;
 
-    iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
-    iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
-    iWidth = dlg.geometry().width();
+    iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
+    iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
+    iWidth = dlg.tqgeometry().width();
   }
 
   //do some cleanup
@@ -777,10 +777,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
     delete it2.data();
   mapVar2Cb.clear();
-  delete layoutTop;
-  delete layoutVar;
-  delete layoutBtn;
-  delete layout;
+  delete tqlayoutTop;
+  delete tqlayoutVar;
+  delete tqlayoutBtn;
+  delete tqlayout;
 
   if (i==0) //if nothing happened this means, that there are no variables to translate
     return true; //.. so just return OK
@@ -800,19 +800,19 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
+  TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
+  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
+  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  layoutTop->addWidget(labTop, 0, 0);
-  labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
@@ -820,8 +820,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  layoutVar->addWidget( te, 0, 1, Qt::AlignTop);
-  layoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop);
+  tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -832,18 +832,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
                             "If you use the same variable later, even in another snippet, the value entered to the right "
                             "will be the default value for that variable.") );
 
-  layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
   btn1->setText(i18n("&Cancel"));
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
   btn2->setText(i18n("&Apply"));
   btn2->setDefault( TRUE );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   te->setFocus();
   // --END-- building a dynamic dialog
 
@@ -863,7 +863,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
     strReturn = te->text();    //copy the entered values back the the given map
 
-    dlgSize = dlg.geometry();
+    dlgSize = dlg.tqgeometry();
   }
 
   //do some cleanup
@@ -872,10 +872,10 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   delete labTop;
   delete btn1;
   delete btn2;
-  delete layoutTop;
-  delete layoutVar;
-  delete layoutBtn;
-  delete layout;
+  delete tqlayoutTop;
+  delete tqlayoutVar;
+  delete tqlayoutBtn;
+  delete tqlayout;
 
   return strReturn;
 }
@@ -917,10 +917,10 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
   
   SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2);
   if (!group)
-    group = dynamic_cast<SnippetGroup *>(item2->parent());
+    group = dynamic_cast<SnippetGroup *>(item2->tqparent());
 
   TQCString dropped;
-  TQByteArray data = e->encodedData("text/plain");
+  TQByteArray data = e->tqencodedData("text/plain");
   if ( e->provides("text/plain") && data.size()>0 ) {
     //get the data from the event...
     TQString encData(data.data());
@@ -958,7 +958,7 @@ void SnippetWidget::languageChanged()
   for (SnippetItem *it=_list.first(); it; it=_list.next()) {
     SnippetGroup * group = dynamic_cast<SnippetGroup*>(it);
     if (group) {
-      if (group->getLanguage() == i18n("All") || langs.contains(group->getLanguage())) {
+      if (group->getLanguage() == i18n("All") || langs.tqcontains(group->getLanguage())) {
         group->setOpen(TRUE);
       } else {
         group->setOpen(FALSE);
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 7aa1f24e..40d77406 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -37,9 +37,10 @@ It inherits KListView and TQToolTip which is needed for showing the
 tooltips which contains the text of the snippet
 @author Robert Gruber
 */
-class SnippetWidget : public KListView, public QToolTip
+class SnippetWidget : public KListView, public TQToolTip
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class SnippetSettings; //to allow SnippetSettings to call languageChanged()
   
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index a7d4530b..acf7841b 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SnippetDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SnippetDlg</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -62,9 +62,9 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -91,14 +91,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -109,21 +109,21 @@
                         <cstring>snippetName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Snippet:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>snippetText</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabelGroup</cstring>
                     </property>
@@ -131,7 +131,7 @@
                         <string>Group:</string>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="3" column="0">
+                <widget class="TQToolButton" row="3" column="0">
                     <property name="name">
                         <cstring>toolBtnHelp</cstring>
                     </property>
@@ -200,10 +200,10 @@
 <includes>
     <include location="local" impldecl="in implementation">snippetdlg.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotHelp()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/parts/snippet/snippetdlg.ui.h b/parts/snippet/snippetdlg.ui.h
index 41ad9d8c..103a49b0 100644
--- a/parts/snippet/snippetdlg.ui.h
+++ b/parts/snippet/snippetdlg.ui.h
@@ -9,7 +9,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/parts/snippet/snippetitem.cpp b/parts/snippet/snippetitem.cpp
index e2f08a2b..69010a5d 100644
--- a/parts/snippet/snippetitem.cpp
+++ b/parts/snippet/snippetitem.cpp
@@ -11,20 +11,20 @@
 
 #include "snippetitem.h"
 
-SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text )
-			: TQListViewItem( parent, name )
+SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text )
+			: TQListViewItem( tqparent, name )
 {
   strName = name;
   strText = text;
   iParent = -1;
 }
 
-SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text)
-			: TQListViewItem( parent, name )
+SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text)
+			: TQListViewItem( tqparent, name )
 {
   strName = name;
   strText = text;
-  iParent = ((SnippetGroup *)parent)->getId();
+  iParent = ((SnippetGroup *)tqparent)->getId();
 }
 
 SnippetItem::~SnippetItem()
@@ -69,7 +69,7 @@ void SnippetItem::setName(TQString name)
 
 void SnippetItem::resetParent()
 {
-  SnippetGroup * group = dynamic_cast<SnippetGroup*>(parent());
+  SnippetGroup * group = dynamic_cast<SnippetGroup*>(tqparent());
   if (group)
     iParent = group->getId();
 }
@@ -100,8 +100,8 @@ Deklaration for class SnippetGroup
 
 int SnippetGroup::iMaxId = 1;
 
-SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id, TQString lang)
- : SnippetItem(parent, name, "GROUP")
+SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id, TQString lang)
+ : SnippetItem(tqparent, name, "GROUP")
 {
     if (id > 0) {
       iId = id;
diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h
index ee181725..d96ecd5b 100644
--- a/parts/snippet/snippetitem.h
+++ b/parts/snippet/snippetitem.h
@@ -24,7 +24,7 @@ It also holds the needed data for one snippet.
 class SnippetItem : public TQListViewItem {
 friend class SnippetGroup;
 public:
-    SnippetItem(TQListViewItem * parent, TQString name, TQString text);
+    SnippetItem(TQListViewItem * tqparent, TQString name, TQString text);
 
     ~SnippetItem();
     TQString getName();
@@ -37,7 +37,7 @@ public:
     static SnippetGroup * findGroupById(int id, TQPtrList<SnippetItem> &list);
     
 private:
-  SnippetItem(TQListView * parent, TQString name, TQString text);
+  SnippetItem(TQListView * tqparent, TQString name, TQString text);
   TQString strName;
   TQString strText;
   int iParent;
@@ -51,7 +51,7 @@ it in the main TQPtrList<SnippetItem>.
 */
 class SnippetGroup : public SnippetItem {
 public:
-    SnippetGroup(TQListView * parent, TQString name, int id, TQString lang=i18n("All"));
+    SnippetGroup(TQListView * tqparent, TQString name, int id, TQString lang=i18n("All"));
     ~SnippetGroup();
 
     int getId() { return iId; }
diff --git a/parts/snippet/snippetsettings.cpp b/parts/snippet/snippetsettings.cpp
index 8e559ba5..d66094e7 100644
--- a/parts/snippet/snippetsettings.cpp
+++ b/parts/snippet/snippetsettings.cpp
@@ -15,14 +15,14 @@
 #include "snippet_widget.h"
 
 
-SnippetSettings::SnippetSettings(TQWidget *parent, const char *name)
- : SnippetSettingsBase(parent, name)
+SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name)
+ : SnippetSettingsBase(tqparent, name)
 {
   _widget = NULL;
 }
 
-SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name)
- : SnippetSettingsBase(parent, name)
+SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name)
+ : SnippetSettingsBase(tqparent, name)
 {
   _cfg = w->getSnippetConfig();
   _widget = w;
diff --git a/parts/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h
index 2f51a823..44c84e33 100644
--- a/parts/snippet/snippetsettings.h
+++ b/parts/snippet/snippetsettings.h
@@ -24,9 +24,10 @@ same named .ui file
 class SnippetSettings : public SnippetSettingsBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    SnippetSettings(TQWidget *parent = 0, const char *name = 0);
-    SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0);
+    SnippetSettings(TQWidget *tqparent = 0, const char *name = 0);
+    SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0);
 
     ~SnippetSettings();
 
diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui
index 54b8c325..3d2b6a39 100644
--- a/parts/snippet/snippetsettingsbase.ui
+++ b/parts/snippet/snippetsettingsbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SnippetSettingsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SnippetSettingsBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>cbToolTip</cstring>
                     </property>
@@ -56,14 +56,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -74,7 +74,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup" row="1" column="0">
+                <widget class="TQButtonGroup" row="1" column="0">
                     <property name="name">
                         <cstring>btnGroup</cstring>
                     </property>
@@ -85,7 +85,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton" row="0" column="0">
+                        <widget class="TQRadioButton" row="0" column="0">
                             <property name="name">
                                 <cstring>rbSingle</cstring>
                             </property>
@@ -102,7 +102,7 @@
                                 <string>An input dialog will be displayed for every variable within a snippet</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>rbAll</cstring>
                             </property>
@@ -121,15 +121,15 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -144,7 +144,7 @@
                             <property name="name">
                                 <cstring>leDelimiter</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>40</width>
                                     <height>32767</height>
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -175,7 +175,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0">
+        <widget class="TQButtonGroup" row="2" column="0">
             <property name="name">
                 <cstring>btnGroupAutoOpen</cstring>
             </property>
@@ -186,7 +186,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>rbOpenOnActiv</cstring>
                     </property>
@@ -200,7 +200,7 @@
                         <string>&lt;qt&gt;If the group's language is the same as the project's primary language, the group will be automatically opened.&lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>rbOpenOnSupported</cstring>
                     </property>
@@ -221,7 +221,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index 332d97e3..3697b89f 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -28,8 +28,8 @@ typedef KDevGenericFactory<TextToolsPart> TextToolsFactory;
 static const KDevPluginInfo data("kdevtexttools");
 K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) )
 
-TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "TextToolsPart")
+TextToolsPart::TextToolsPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevPlugin(&data, tqparent, name ? name : "TextToolsPart")
 {
     setInstance(TextToolsFactory::instance());
     //    setXMLFile("kdevfileview.rc");
diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h
index ce348f6d..42443c48 100644
--- a/parts/texttools/texttoolspart.h
+++ b/parts/texttools/texttoolspart.h
@@ -22,9 +22,10 @@ class TextToolsWidget;
 class TextToolsPart : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TextToolsPart( TQObject *parent, const char *name, const TQStringList & );
+    TextToolsPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~TextToolsPart();
 
 private slots:
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index 630609c5..1f7c9375 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -27,14 +27,14 @@
 #include "texttoolspart.h"
 
 
-class TextStructItem : public QListViewItem
+class TextStructItem : public TQListViewItem
 {
 public:
-    TextStructItem(TQListView *parent)
-        : TQListViewItem(parent)
+    TextStructItem(TQListView *tqparent)
+        : TQListViewItem(tqparent)
     {}
-    TextStructItem(TQListViewItem *parent)
-        : TQListViewItem(parent)
+    TextStructItem(TQListViewItem *tqparent)
+        : TQListViewItem(tqparent)
     {
         TQListViewItem *item = this;
         while (item->nextSibling())
@@ -45,10 +45,10 @@ public:
     
     TQString text(int) const
     {
-        return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra);
+        return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra);
     }
-    TextStructItem *parentStructItem()
-    { return static_cast<TextStructItem*>(parent()); }
+    TextStructItem *tqparentStructItem()
+    { return static_cast<TextStructItem*>(tqparent()); }
     
     TQString tag;
     TQString extra;
@@ -57,13 +57,13 @@ public:
 };
 
 
-TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const char *name)
-    : KListView(parent, name)
+TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
 {
     setResizeMode(TQListView::LastColumn);
     setSorting(-1);
     header()->hide();
-    addColumn(TQString::null);
+    addColumn(TQString());
 
     m_part = part;
 
@@ -128,7 +128,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item)
         cursorIface->setCursorPosition(line, col);
     }
     
-    if (button == MidButton) {
+    if (button == Qt::MidButton) {
         KTextEditor::SelectionInterface *selectionIface
             = dynamic_cast<KTextEditor::SelectionInterface*>(rwpart);
         if (selectionIface) {
@@ -144,7 +144,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item)
 
 void TextToolsWidget::slotReturnPressed(TQListViewItem *item)
 {
-    slotItemPressed(LeftButton, item);
+    slotItemPressed(Qt::LeftButton, item);
 }
 
 
@@ -165,7 +165,7 @@ void TextToolsWidget::stop()
     disconnect( m_timer );
     m_relevantTags.clear();
     m_emptyTags.clear();
-    m_cachedText = TQString::null;
+    m_cachedText = TQString();
 }
 
 
@@ -291,17 +291,17 @@ void TextToolsWidget::parseXML()
                 ++endpos;
             }
 
-            if (!m_relevantTags.contains(tag)) {
+            if (!m_relevantTags.tqcontains(tag)) {
                 pos = endpos;
                 continue;
             }
             
             TextStructItem *closingItem = currentItem;
-            while (closingItem->parent() && closingItem->tag != tag)
-                closingItem = closingItem->parentStructItem();
-            if (closingItem->parent()) {
+            while (closingItem->tqparent() && closingItem->tag != tag)
+                closingItem = closingItem->tqparentStructItem();
+            if (closingItem->tqparent()) {
                 closingItem->endpos = endpos;
-                currentItem = closingItem->parentStructItem();
+                currentItem = closingItem->tqparentStructItem();
             } else {
                 kdDebug(9030) << "found no opening tag " << tag << "." << endl;
             }
@@ -327,7 +327,7 @@ void TextToolsWidget::parseXML()
                 ++endpos;
             }
 
-            if (!m_relevantTags.contains(tag)) {
+            if (!m_relevantTags.tqcontains(tag)) {
                 pos = endpos;
                 continue;
             }
@@ -337,7 +337,7 @@ void TextToolsWidget::parseXML()
             item->pos = pos;
             item->endpos = -1;
 
-            if (m_emptyTags.contains(tag))
+            if (m_emptyTags.tqcontains(tag))
                 item->endpos = endpos;
             else
                 currentItem = item;
@@ -376,9 +376,9 @@ void TextToolsWidget::parseLaTeX()
         TQString tag = re.cap(1);
         TQString title = re.cap(2);
         kdDebug(9030) << "Match with " << tag << " and title " << title << endl;
-        int level = hierarchyLevels.find(tag);
-        while (currentItem->parent() && level <= hierarchyLevels.find(currentItem->tag))
-            currentItem = currentItem->parentStructItem();
+        int level = hierarchyLevels.tqfind(tag);
+        while (currentItem->tqparent() && level <= hierarchyLevels.tqfind(currentItem->tag))
+            currentItem = currentItem->tqparentStructItem();
         
         TextStructItem *item = new TextStructItem(currentItem);
         item->tag = tag;
@@ -386,7 +386,7 @@ void TextToolsWidget::parseLaTeX()
         item->pos = pos+1;
         item->endpos = pos+re.matchedLength()-1; // lie
 
-        if (level > hierarchyLevels.find(currentItem->tag))
+        if (level > hierarchyLevels.tqfind(currentItem->tag))
             currentItem = item;
 
         pos = pos+re.matchedLength();
diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h
index 5403b736..edbd834b 100644
--- a/parts/texttools/texttoolswidget.h
+++ b/parts/texttools/texttoolswidget.h
@@ -24,11 +24,12 @@ namespace KTextEditor { class EditInterface; }
 class TextToolsWidget : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Mode { HTML, Docbook, LaTeX };
     
-    TextToolsWidget( TextToolsPart *part, TQWidget *parent=0, const char *name=0 );
+    TextToolsWidget( TextToolsPart *part, TQWidget *tqparent=0, const char *name=0 );
     ~TextToolsWidget();
 
     void setMode(Mode mode, KParts::Part *part);
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index e1de784a..02195822 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -24,8 +24,8 @@ static const KDevPluginInfo data("kdevtipofday");
 typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) )
 
-TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "TipOfDayPart")
+TipOfDayPart::TipOfDayPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name ? name : "TipOfDayPart")
 {
   setInstance(TipOfDayFactory::instance());
 
diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h
index a60856e8..faf3ca19 100644
--- a/parts/tipofday/tipofday_part.h
+++ b/parts/tipofday/tipofday_part.h
@@ -13,10 +13,11 @@
 class TipOfDayPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
    
-  TipOfDayPart(TQObject *parent, const char *name, const TQStringList &);
+  TipOfDayPart(TQObject *tqparent, const char *name, const TQStringList &);
 
 
 public slots:
diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui
index 2ec5e8b4..e17d7f37 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AddToolDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>add_tool_dialog</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>cmdlineLabel_2</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <cstring>paramEdit</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>capturedBox</cstring>
             </property>
@@ -41,7 +41,7 @@
                 <string>If this is checked, the output of the application will be shown in the application output view; otherwise, all output will be ignored.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>cmdlineLabel</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>menutextLabel</cstring>
             </property>
@@ -102,7 +102,7 @@ executed.&lt;/p&gt;</string>
                 <string>The text that appears in the Tools-Menu</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -123,14 +123,14 @@ executed.&lt;/p&gt;</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -141,7 +141,7 @@ executed.&lt;/p&gt;</string>
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -228,15 +228,15 @@ executed.&lt;/p&gt;</string>
     <include location="local" impldecl="in implementation">addtooldlg.ui.h</include>
 </includes>
 <forwards>
-    <forward>class QListViewItem;</forward>
+    <forward>class TQListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-    <slot returnType="QString">getApp()</slot>
-    <slot access="private">treeSelectionChanged( QListViewItem * lvi )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+    <slot returnType="TQString">getApp()</slot>
+    <slot access="private">treeSelectionChanged( TQListViewItem * lvi )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h
index 045e7809..fea69766 100644
--- a/parts/tools/addtooldlg.ui.h
+++ b/parts/tools/addtooldlg.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index c6517d8f..95400863 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -65,9 +65,9 @@ template class TQPtrList<TQString>;
 
 // ----------------------------------------------------------------------
 
-KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & name,
+KDevAppTreeListItem::KDevAppTreeListItem( KListView* tqparent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
-    : TQListViewItem( parent, name )
+    : TQListViewItem( tqparent, name )
 {
     init(pixmap, parse, dir, p, c, dE);
 }
@@ -75,9 +75,9 @@ KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & na
 
 // ----------------------------------------------------------------------
 
-KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name,
+KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* tqparent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
-    : TQListViewItem( parent, name )
+    : TQListViewItem( tqparent, name )
 {
     init(pixmap, parse, dir, p, c, dE);
 }
@@ -94,7 +94,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con
     exec = _exec;
     dEntry = _dEntry;
     exec.simplifyWhiteSpace();
-    exec.truncate(exec.find(' '));
+    exec.truncate(exec.tqfind(' '));
 }
 
 
@@ -104,7 +104,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con
 TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
 {
     if (directory)
-        return TQString::fromLatin1(" ") + text(column).upper();
+        return TQString::tqfromLatin1(" ") + text(column).upper();
     else
         return text(column).upper();
 }
@@ -117,8 +117,8 @@ void KDevAppTreeListItem::activate()
 
 void KDevAppTreeListItem::setOpen( bool o )
 {
-    if( o && !parsed ) { // fill the children before opening
-        ((KDevApplicationTree *) parent())->addDesktopGroup( path, this );
+    if( o && !parsed ) { // fill the tqchildren before opening
+        ((KDevApplicationTree *) tqparent())->addDesktopGroup( path, this );
         parsed = true;
     }
     TQListViewItem::setOpen( o );
@@ -131,13 +131,13 @@ bool KDevAppTreeListItem::isDirectory()
 
 // ----------------------------------------------------------------------
 
-KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name )
-    : KListView( parent, name ), currentitem(0)
+KDevApplicationTree::KDevApplicationTree( TQWidget *tqparent, const char* name )
+    : KListView( tqparent, name ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
     setRootIsDecorated( true );
 
-    addDesktopGroup( TQString::null );
+    addDesktopGroup( TQString() );
 
     connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) );
     connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) );
@@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
 {
-    setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent));
+    setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent));
     KListView::resizeEvent(e);
 }
 
diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h
index ee56a20c..2e869889 100644
--- a/parts/tools/kapplicationtree.h
+++ b/parts/tools/kapplicationtree.h
@@ -36,7 +36,7 @@ class TQStringList;
 /**
  * @internal
  */
-class KDevAppTreeListItem : public QListViewItem
+class KDevAppTreeListItem : public TQListViewItem
 {
     bool parsed;
     bool directory;
@@ -50,9 +50,9 @@ protected:
     void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry);
 
 public:
-    KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap,
+    KDevAppTreeListItem( KListView* tqparent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
-    KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
+    KDevAppTreeListItem( TQListViewItem* tqparent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
     bool isDirectory();
 
@@ -74,8 +74,9 @@ protected:
 class KDevApplicationTree : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevApplicationTree( TQWidget *parent, const char* name = 0 );
+    KDevApplicationTree( TQWidget *tqparent, const char* name = 0 );
 
     /**
      * Add a group of .desktop/.kdelnk entries
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index f9daca4b..ac1b9464 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -39,8 +39,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
 
 TQMap<int, TQString> externalToolMenuEntries;
 
-ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
-	: KDevPlugin( &data, parent, name ? name : "ToolsPart")
+ToolsPart::ToolsPart(TQObject *tqparent, const char *name, const TQStringList &)
+	: KDevPlugin( &data, tqparent, name ? name : "ToolsPart")
 {
   setInstance(ToolsFactory::instance());
 
@@ -57,7 +57,7 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
   connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
            this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-  // Apparently action lists can only be plugged after the
+  // Aptqparently action lists can only be plugged after the
   // xmlgui client has been registered
   TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu()));
 }
@@ -113,7 +113,7 @@ void ToolsPart::updateMenu()
 
 void ToolsPart::slotToolActivated()
 {
-  TQString df = sender()->name();
+  TQString df = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
   kapp->startServiceByDesktopPath(df);
 }
 
@@ -135,21 +135,21 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
     TQString word = KDevEditorUtil::currentWord( doc );
     
     // This should really be checked before inserting into the popup
-    if (cmdline.contains("%D") && projectDirectory.isNull())
+    if (cmdline.tqcontains("%D") && projectDirectory.isNull())
         return;
-    cmdline.replace(TQRegExp("%D"), projectDirectory);
+    cmdline.tqreplace(TQRegExp("%D"), projectDirectory);
     
-    if (cmdline.contains("%S") && fileName.isNull())
+    if (cmdline.tqcontains("%S") && fileName.isNull())
         return;
-    cmdline.replace(TQRegExp("%S"), fileName);
+    cmdline.tqreplace(TQRegExp("%S"), fileName);
 
-    if (cmdline.contains("%T") && selection.isNull())
+    if (cmdline.tqcontains("%T") && selection.isNull())
         return;
-    cmdline.replace(TQRegExp("%T"), selection);
+    cmdline.tqreplace(TQRegExp("%T"), selection);
 
-    if (cmdline.contains("%W") && word.isNull())
+    if (cmdline.tqcontains("%W") && word.isNull())
         return;
-    cmdline.replace(TQRegExp("%W"), word);
+    cmdline.tqreplace(TQRegExp("%W"), word);
 
     if (captured)
     {
@@ -224,7 +224,7 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context)
 
 void ToolsPart::toolsMenuActivated()
 {
-    TQString menutext = sender()->name();
+    TQString menutext = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
     KConfig *config = ToolsFactory::instance()->config();
     config->setGroup("Tool Menu " + menutext);
     TQString cmdline = config->readPathEntry("CommandLine");
@@ -236,7 +236,7 @@ void ToolsPart::toolsMenuActivated()
     if (isdesktopfile)
         kapp->startServiceByDesktopPath(cmdline);
     else
-        startCommand(cmdline, captured, TQString::null);
+        startCommand(cmdline, captured, TQString());
 }
 
 
diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h
index 5ced9a5e..5654d1ef 100644
--- a/parts/tools/tools_part.h
+++ b/parts/tools/tools_part.h
@@ -23,10 +23,11 @@ class ToolsWidget;
 class ToolsPart : public KDevPlugin
   {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    ToolsPart( TQObject *parent, const char *name, const TQStringList & );
+    ToolsPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~ToolsPart();
 
 
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index c8b4566f..915490d1 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -17,8 +17,8 @@
 #include "kapplicationtree.h"
 
 
-ToolsConfig::ToolsConfig(TQWidget *parent, const char *name)
-    : TQWidget(parent, name), _tree(0)
+ToolsConfig::ToolsConfig(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name), _tree(0)
 {
   _entries.setAutoDelete(true);
 }
@@ -30,7 +30,7 @@ void ToolsConfig::showEvent(TQShowEvent *e)
 
   if (!_tree)
     {
-      TQApplication::setOverrideCursor(Qt::waitCursor);
+      TQApplication::setOverrideCursor(TQt::waitCursor);
 
       TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
@@ -162,7 +162,7 @@ void ToolsConfig::updateList()
 	_list->insertItem(it.current()->icon, it.current()->name);
 
   _list->setUpdatesEnabled(true);
-  _list->repaint();
+  _list->tqrepaint();
 }
 
 
diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h
index 8359adff..81ae27ab 100644
--- a/parts/tools/toolsconfig.h
+++ b/parts/tools/toolsconfig.h
@@ -24,13 +24,14 @@ public:
 };
 
 
-class ToolsConfig : public QWidget
+class ToolsConfig : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    ToolsConfig(TQWidget *parent = 0, const char *name = 0);
+    ToolsConfig(TQWidget *tqparent = 0, const char *name = 0);
 
 
 public slots:
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index b4643b26..5020b123 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -41,8 +41,8 @@ struct ToolsConfigEntry
 };
 
 
-ToolsConfigWidget::ToolsConfigWidget(TQWidget *parent, const char *name)
-    : ToolsConfigWidgetBase(parent, name)
+ToolsConfigWidget::ToolsConfigWidget(TQWidget *tqparent, const char *name)
+    : ToolsConfigWidgetBase(tqparent, name)
 {
     m_toolsmenuEntries.setAutoDelete(true);
     m_filecontextEntries.setAutoDelete(true);
@@ -125,7 +125,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry
 bool ToolsConfigWidget::addEntry(ToolsConfigEntry *entry, TQDict<ToolsConfigEntry> *entryDict)
 {
     TQString menutext = entry->menutext;
-    if (entryDict->find(menutext)) {
+    if (entryDict->tqfind(menutext)) {
         delete entry;
         KMessageBox::sorry(this, i18n("An entry with this title exists already."));
         return false;
diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h
index b58c9ea4..d0b468ac 100644
--- a/parts/tools/toolsconfigwidget.h
+++ b/parts/tools/toolsconfigwidget.h
@@ -23,9 +23,10 @@ struct ToolsConfigEntry;
 class ToolsConfigWidget : public ToolsConfigWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    ToolsConfigWidget(TQWidget *parent=0, const char *name=0);
+    ToolsConfigWidget(TQWidget *tqparent=0, const char *name=0);
     ~ToolsConfigWidget();
 
 public slots:
diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui
index 5b8baab0..68fbf33e 100644
--- a/parts/tools/toolsconfigwidgetbase.ui
+++ b/parts/tools/toolsconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ToolsConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>tools_config_widget</cstring>
     </property>
@@ -25,11 +25,11 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabwidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>toolmenuTab</cstring>
                 </property>
@@ -40,12 +40,12 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListBox" row="0" column="0">
+                    <widget class="TQListBox" row="0" column="0">
                         <property name="name">
                             <cstring>toolsmenuBox</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="1">
+                    <widget class="TQLayoutWidget" row="0" column="1">
                         <property name="name">
                             <cstring>Layout4_3</cstring>
                         </property>
@@ -66,14 +66,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>toolsmenuaddButton</cstring>
                                 </property>
@@ -84,7 +84,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>toolsmenuremoveButton</cstring>
                                 </property>
@@ -105,7 +105,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -124,7 +124,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -133,7 +133,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>filecontextTab</cstring>
                 </property>
@@ -144,12 +144,12 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListBox" row="0" column="0">
+                    <widget class="TQListBox" row="0" column="0">
                         <property name="name">
                             <cstring>filecontextBox</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="1">
+                    <widget class="TQLayoutWidget" row="0" column="1">
                         <property name="name">
                             <cstring>Layout4_2</cstring>
                         </property>
@@ -170,14 +170,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>filecontextaddButton</cstring>
                                 </property>
@@ -188,7 +188,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>filecontextremoveButton</cstring>
                                 </property>
@@ -209,7 +209,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -228,7 +228,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -237,7 +237,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>dircontextTab</cstring>
                 </property>
@@ -248,12 +248,12 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListBox" row="0" column="0">
+                    <widget class="TQListBox" row="0" column="0">
                         <property name="name">
                             <cstring>dircontextBox</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="1">
+                    <widget class="TQLayoutWidget" row="0" column="1">
                         <property name="name">
                             <cstring>Layout4</cstring>
                         </property>
@@ -274,14 +274,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>dircontextaddButton</cstring>
                                 </property>
@@ -292,7 +292,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>dircontextremoveButton</cstring>
                                 </property>
@@ -313,7 +313,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -332,7 +332,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -397,14 +397,14 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">dircontextaddClicked()</slot>
     <slot access="protected">filecontextaddClicked()</slot>
     <slot access="protected">filecontextremoveClicked()</slot>
     <slot access="protected">dircontextremoveClicked()</slot>
     <slot access="protected">toolsmenuaddClicked()</slot>
     <slot access="protected">toolsmenuremoveClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui
index 149a1db1..4a5a8c98 100644
--- a/parts/uimode/uichooser.ui
+++ b/parts/uimode/uichooser.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>UIChooser</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>UIChooser</cstring>
     </property>
@@ -22,15 +22,15 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>TabModeGroup</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>AlwaysShowTabs</cstring>
                             </property>
@@ -55,7 +55,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>NeverShowTabs</cstring>
                             </property>
@@ -65,7 +65,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>HoverCloseGroup</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>DoNotCloseOnHover</cstring>
                             </property>
@@ -93,7 +93,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>DoCloseOnHover</cstring>
                             </property>
@@ -105,15 +105,15 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>IDEAlButtonGroup</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>IconsOnly</cstring>
                             </property>
@@ -135,7 +135,7 @@
                                 <string>Icons</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>TextOnly</cstring>
                             </property>
@@ -146,7 +146,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>TextAndIcons</cstring>
                             </property>
@@ -156,7 +156,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>TabbedBrowsingGroup</cstring>
                     </property>
@@ -170,7 +170,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>OpenNewTabAfterCurrent</cstring>
                             </property>
@@ -178,7 +178,7 @@
                                 <string>Open &amp;new tab after current tab</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="0">
+                        <widget class="TQCheckBox" row="1" column="0">
                             <property name="name">
                                 <cstring>ShowTabIcons</cstring>
                             </property>
@@ -186,7 +186,7 @@
                                 <string>&amp;Show icons on document tabs</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="0">
+                        <widget class="TQCheckBox" row="2" column="0">
                             <property name="name">
                                 <cstring>ShowCloseTabsButton</cstring>
                             </property>
@@ -198,7 +198,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -213,7 +213,7 @@
             <property name="text">
                 <string>Note: Changes will take effect after KDevelop is restarted</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
         </widget>
@@ -242,9 +242,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">maybeEnableCloseOnHover(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 855f4daf..64a07b70 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -18,8 +18,8 @@ typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
 static const KDevPluginInfo data("kdevuichooser");
 K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
 
-UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
+UIChooserPart::UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin( &data, tqparent, name ? name : "UIChooserPart")
 {
 	setInstance(UIChooserFactory::instance());
 
diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h
index 5f0826fa..1e48d35b 100644
--- a/parts/uimode/uichooser_part.h
+++ b/parts/uimode/uichooser_part.h
@@ -15,9 +15,10 @@ class ConfigWidgetProxy;
 class UIChooserPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  UIChooserPart(TQObject *parent, const char *name, const TQStringList &);
+  UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &);
   ~UIChooserPart();
   
 private slots:
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index 2fe6b919..064380e0 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -27,8 +27,8 @@
 #include "kdevmainwindow.h"
 #include "uichooser_widget.h"
 
-UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name)
-  : UIChooser(parent, name)
+UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *tqparent, const char *name)
+  : UIChooser(tqparent, name)
   ,m_part(part), _lastMode(0L)
 {
   load();
diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h
index e9f7a7ed..4901f1af 100644
--- a/parts/uimode/uichooser_widget.h
+++ b/parts/uimode/uichooser_widget.h
@@ -12,6 +12,7 @@ class UIChooserPart;
 class UIChooserWidget : public UIChooser
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -20,7 +21,7 @@ public:
     _NeverShowTabs          = 2
   };
 
-  UIChooserWidget( UIChooserPart * part, TQWidget *parent=0, const char *name=0 );
+  UIChooserWidget( UIChooserPart * part, TQWidget *tqparent=0, const char *name=0 );
 
 public slots:
   void accept();
diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui
index 35ded9c1..3bdd854c 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DialogWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DialogWidget</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -32,7 +32,7 @@
                         <cstring>executableEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <cstring>paramEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -61,11 +61,11 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QWidgetStack" row="1" column="0">
+        <widget class="TQWidgetStack" row="1" column="0">
             <property name="name">
                 <cstring>stack</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>WStackPage</cstring>
                 </property>
@@ -79,7 +79,7 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox2</cstring>
                         </property>
@@ -90,7 +90,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>memleakBox</cstring>
                                 </property>
@@ -101,9 +101,9 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout2</cstring>
+                                    <cstring>tqlayout2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -122,14 +122,14 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>reachableBox</cstring>
                                         </property>
@@ -139,17 +139,17 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
-                                    <cstring>childrenBox</cstring>
+                                    <cstring>tqchildrenBox</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>&amp;Trace children</string>
+                                    <string>&amp;Trace tqchildren</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout3</cstring>
+                                    <cstring>tqlayout3</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -158,7 +158,7 @@
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>textLabel5</cstring>
                                         </property>
@@ -179,7 +179,7 @@
                                             <cstring>valExecutableEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>textLabel4</cstring>
                                         </property>
@@ -196,7 +196,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>WStackPage</cstring>
                 </property>
@@ -210,7 +210,7 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox3</cstring>
                         </property>
@@ -221,9 +221,9 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget" row="1" column="0">
+                            <widget class="TQLayoutWidget" row="1" column="0">
                                 <property name="name">
-                                    <cstring>layout3_2</cstring>
+                                    <cstring>tqlayout3_2</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -232,7 +232,7 @@
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>textLabel5_2</cstring>
                                         </property>
@@ -253,7 +253,7 @@
                                             <cstring>ctExecutableEdit</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>textLabel4_2</cstring>
                                         </property>
@@ -266,17 +266,17 @@
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>ctChildrenBox</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>&amp;Trace children</string>
+                                    <string>&amp;Trace tqchildren</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -292,7 +292,7 @@
                                     <cstring>kcExecutableEdit</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel4_2_2</cstring>
                                 </property>
@@ -323,7 +323,7 @@
     <tabstop>paramEdit</tabstop>
     <tabstop>memleakBox</tabstop>
     <tabstop>reachableBox</tabstop>
-    <tabstop>childrenBox</tabstop>
+    <tabstop>tqchildrenBox</tabstop>
     <tabstop>valExecutableEdit</tabstop>
     <tabstop>valParamEdit</tabstop>
     <tabstop>ctChildrenBox</tabstop>
@@ -334,12 +334,12 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="private" specifier="non virtual">checkBoxToggled()</slot>
     <slot>init()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/valgrind/dialog_widget.ui.h b/parts/valgrind/dialog_widget.ui.h
index 9a2570ae..70f1d5f8 100644
--- a/parts/valgrind/dialog_widget.ui.h
+++ b/parts/valgrind/dialog_widget.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index 67c05c56..247eaee1 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -16,8 +16,8 @@
 #include "valgrind_dialog.moc"
 
 
-ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent )
-  : KDialogBase( parent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ),
+ValgrindDialog::ValgrindDialog( Type type, TQWidget* tqparent )
+  : KDialogBase( tqparent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ),
   m_type(type)
 {
   w = new DialogWidget( this );
@@ -89,7 +89,7 @@ void ValgrindDialog::setValExecutable( const TQString& ve )
 static const TQString memCheckParam( "--tool=memcheck" );
 static const TQString leakCheckParam( "--leak-check=yes" );
 static const TQString reachableParam( "--show-reachable=yes" );
-static const TQString childrenParam( "--trace-children=yes" );
+static const TQString tqchildrenParam( "--trace-tqchildren=yes" );
 
 TQString ValgrindDialog::valParams() const
 {
@@ -100,8 +100,8 @@ TQString ValgrindDialog::valParams() const
     params += " " + leakCheckParam;
   if ( w->reachableBox->isChecked() )
     params += " " + reachableParam;
-  if ( w->childrenBox->isChecked() )
-    params += " " + childrenParam;
+  if ( w->tqchildrenBox->isChecked() )
+    params += " " + tqchildrenParam;
 
   return params;
 }
@@ -109,18 +109,18 @@ TQString ValgrindDialog::valParams() const
 void ValgrindDialog::setValParams( const TQString& params )
 {
   TQString myParams = params;
-  if ( myParams.contains( leakCheckParam ) )
+  if ( myParams.tqcontains( leakCheckParam ) )
     w->memleakBox->setChecked( true );
-  if ( myParams.contains( reachableParam ) )
+  if ( myParams.tqcontains( reachableParam ) )
     w->reachableBox->setChecked( true );
-  if ( myParams.contains( childrenParam ) )
-    w->childrenBox->setChecked( true );
+  if ( myParams.tqcontains( tqchildrenParam ) )
+    w->tqchildrenBox->setChecked( true );
   w->init();
 
-  myParams = myParams.replace( TQRegExp( memCheckParam ), "" );
-  myParams = myParams.replace( TQRegExp( leakCheckParam ), "" );
-  myParams = myParams.replace( TQRegExp( reachableParam ), "" );
-  myParams = myParams.replace( TQRegExp( childrenParam ), "" );
+  myParams = myParams.tqreplace( TQRegExp( memCheckParam ), "" );
+  myParams = myParams.tqreplace( TQRegExp( leakCheckParam ), "" );
+  myParams = myParams.tqreplace( TQRegExp( reachableParam ), "" );
+  myParams = myParams.tqreplace( TQRegExp( tqchildrenParam ), "" );
   myParams = myParams.stripWhiteSpace();
   w->valParamEdit->setText( myParams );
 }
@@ -150,7 +150,7 @@ TQString ValgrindDialog::ctParams() const
 {
   TQString params = w->ctParamEdit->text();
   if ( w->ctChildrenBox->isChecked() )
-    params += " " + childrenParam;
+    params += " " + tqchildrenParam;
 
   return params;
 }
@@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params )
   //force --tool=callgrind if no params are given
   if (myParams.isEmpty())
     myParams = "--tool=callgrind";
-  if ( myParams.contains( childrenParam ) )
+  if ( myParams.tqcontains( tqchildrenParam ) )
     w->ctChildrenBox->setChecked( true );
   w->init();
 
-  myParams = myParams.replace( TQRegExp( childrenParam ), "" );
+  myParams = myParams.tqreplace( TQRegExp( tqchildrenParam ), "" );
   myParams = myParams.stripWhiteSpace();
   w->ctParamEdit->setText( myParams );
 }
diff --git a/parts/valgrind/valgrind_dialog.h b/parts/valgrind/valgrind_dialog.h
index a57d4529..d3422b80 100644
--- a/parts/valgrind/valgrind_dialog.h
+++ b/parts/valgrind/valgrind_dialog.h
@@ -14,10 +14,11 @@ class DialogWidget;
 class ValgrindDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
   enum Type { Memcheck = 0, Calltree = 1 };
     
-  ValgrindDialog( Type type, TQWidget* parent = 0 );
+  ValgrindDialog( Type type, TQWidget* tqparent = 0 );
   ~ValgrindDialog();
 
   // the app to check
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 801d1c2a..064129cf 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -26,8 +26,8 @@ typedef KDevGenericFactory<ValgrindPart> ValgrindFactory;
 static const KDevPluginInfo data("kdevvalgrind");
 K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) )
 
-ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin( &data, parent, name ? name : "ValgrindPart" )
+ValgrindPart::ValgrindPart( TQObject *tqparent, const char *name, const TQStringList& )
+  : KDevPlugin( &data, tqparent, name ? name : "ValgrindPart" )
 {
   setInstance( ValgrindFactory::instance() );
   setXMLFile( "kdevpart_valgrind.rc" );
@@ -87,13 +87,13 @@ void ValgrindPart::projectOpened()
 
 void ValgrindPart::loadOutput()
 {
-  TQString fName = KFileDialog::getOpenFileName(TQString::null, "*", 0, i18n("Open Valgrind Output"));
+  TQString fName = KFileDialog::getOpenFileName(TQString(), "*", 0, i18n("Open Valgrind Output"));
   if ( fName.isEmpty() )
     return;
 
   TQFile f( fName );
   if ( !f.open( IO_ReadOnly ) ) {
-    KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) );
+    KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").tqarg(fName) );
     return;
   }
 
@@ -206,9 +206,9 @@ void ValgrindPart::slotStopButtonClicked( KDevPlugin* which )
 void ValgrindPart::clear()
 {
   m_widget->clear();
-  currentMessage = TQString::null;
+  currentMessage = TQString();
   currentPid = -1;
-  lastPiece = TQString::null;
+  lastPiece = TQString();
 }
 
 void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, const TQString& valExec, const TQString& valParams )
@@ -234,7 +234,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
   DomUtil::PairList::ConstIterator it;
   for (it = run_envvars.begin(); it != run_envvars.end(); ++it)
   {
-    envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second);
+    envVarList << TQString("%1=\"%2\" ").tqarg((*it).first).tqarg((*it).second);
   }
 
   *proc << envVarList.join("") << valExec << valParams << exec << params;
@@ -269,7 +269,7 @@ void ValgrindPart::receivedString( const TQString& str )
     lastPiece = lines.back();
     lines.pop_back();
   } else {
-    lastPiece = TQString::null;
+    lastPiece = TQString();
   }
   appendMessages( lines );
 }
@@ -286,7 +286,7 @@ void ValgrindPart::appendMessages( const TQStringList& lines )
 
     if ( valRe.cap( 2 ).isEmpty() ) {
       appendMessage( currentMessage );
-      currentMessage = TQString::null;
+      currentMessage = TQString();
     } else if ( cPid != currentPid ) {
       appendMessage( currentMessage );
       currentMessage = *it;
@@ -303,8 +303,8 @@ void ValgrindPart::processExited( KProcess* p )
 {
   if ( p == proc ) {
     appendMessage( currentMessage + lastPiece );
-    currentMessage = TQString::null;
-    lastPiece = TQString::null;
+    currentMessage = TQString();
+    lastPiece = TQString();
     core()->running( this, false );
 
     if (kcInfo.runKc)
@@ -312,7 +312,7 @@ void ValgrindPart::processExited( KProcess* p )
         KProcess *kcProc = new KProcess;
 //        kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
         *kcProc << kcInfo.kcPath;
-        *kcProc << TQString("callgrind.out.%1").arg(p->pid());
+        *kcProc << TQString("callgrind.out.%1").tqarg(p->pid());
         kcProc->start(KProcess::DontCare);
     }
   }
diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h
index 6453dd8f..f7e3a4cf 100644
--- a/parts/valgrind/valgrind_part.h
+++ b/parts/valgrind/valgrind_part.h
@@ -16,9 +16,10 @@ class KProcess;
 class ValgrindPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:   
-  ValgrindPart( TQObject *parent, const char *name, const TQStringList & );
+  ValgrindPart( TQObject *tqparent, const char *name, const TQStringList & );
   ~ValgrindPart();
   
   void runValgrind( const TQString& exec, const TQString& parameters, const TQString& valExec, const TQString& valParameters );
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 39c51094..00eca21e 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -21,18 +21,18 @@
 #define VALLISTVIEWITEMRTTI 130977
 
 // helper class to sort the ListView by item number instead of the string representation of the item number
-class ValListViewItem: public QListViewItem
+class ValListViewItem: public TQListViewItem
 {
 public:
-  ValListViewItem( TQListView* parent, int key, int pid, const TQString& message ):
-    TQListViewItem( parent, TQString::number( key ), TQString::number( pid ), message ),
+  ValListViewItem( TQListView* tqparent, int key, int pid, const TQString& message ):
+    TQListViewItem( tqparent, TQString::number( key ), TQString::number( pid ), message ),
     _key( key ), _pid ( pid ), backtrace( false ), _line( -1 ), _active( false ) {}
 
-  ValListViewItem( ValListViewItem* parent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ):
-    TQListViewItem( parent, TQString::number( key ), TQString::null, message ),
+  ValListViewItem( ValListViewItem* tqparent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ):
+    TQListViewItem( tqparent, TQString::number( key ), TQString(), message ),
     _key( key ), _pid( pid ), backtrace( true ), _filename( filename ), _line( line ), _active( active )
   {
-    if ( parent->_pid != _pid && _pid > 0 )
+    if ( tqparent->_pid != _pid && _pid > 0 )
       setText( 1, TQString::number( _pid ) );
   }
 
diff --git a/parts/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h
index 8f75e7e4..ab9c1a22 100644
--- a/parts/valgrind/valgrind_widget.h
+++ b/parts/valgrind/valgrind_widget.h
@@ -12,9 +12,10 @@ class KListView;
 class TQListViewItem;
 class TQPopupMenu;
 
-class ValgrindWidget : public QWidget
+class ValgrindWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
     
 public:
   ValgrindWidget( ValgrindPart *part );
diff --git a/parts/valgrind/valgrinditem.h b/parts/valgrind/valgrinditem.h
index 14e3bb07..d2093910 100644
--- a/parts/valgrind/valgrinditem.h
+++ b/parts/valgrind/valgrinditem.h
@@ -8,7 +8,7 @@ class ValgrindBacktraceItem
 {
 public:
   enum Type { Unknown, SourceCode, Library };
-  ValgrindBacktraceItem( const TQString& rawOutput = TQString::null );
+  ValgrindBacktraceItem( const TQString& rawOutput = TQString() );
   ~ValgrindBacktraceItem();
 
   TQString message() const { return _message; }
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index 58ef9444..16cad089 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-	: KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
+VCSManagerPart::VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+	: KDevPlugin(&data, tqparent, name ? name : "VCSManagerPart")
 {
 	kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
 
@@ -95,7 +95,7 @@ void VCSManagerPart::loadVCSPlugin()
 	m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace();
 	if ( m_vcsPluginName.isEmpty() ) return;
 	
-	TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
+	TQString constraint = TQString( "DesktopEntryName=='%1'" ).tqarg( m_vcsPluginName );
 	pluginController()->loadPlugin( "KDevelop/VersionControl", constraint );
 }
 
diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h
index 2d8cf63d..2d135b73 100644
--- a/parts/vcsmanager/vcsmanagerpart.h
+++ b/parts/vcsmanager/vcsmanagerpart.h
@@ -38,8 +38,9 @@ Please read the README.dox file for more info about this part
 class VCSManagerPart: public KDevPlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args);
+	VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &args);
 	~VCSManagerPart();
 	TQString vcsPlugin();
 	void loadVCSPlugin();
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index 9a081f3a..2202484b 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -28,8 +28,8 @@
 #include "vcsmanagerprojectconfig.h"
 #include "vcsmanagerpart.h"
 
-VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent, const char *name )
-	: VCSManagerProjectConfigBase( parent, name ), m_part( part )
+VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent, const char *name )
+	: VCSManagerProjectConfigBase( tqparent, name ), m_part( part )
 {
 	setup();
 }
@@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( )
 	
 	int current = 0;
 
-	TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+	TQString constraint = TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
 	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint );
 	KTrader::OfferList::const_iterator it = offers.begin();
 	for ( int i = 1; it != offers.end(); ++it, ++i )
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h
index c452ac41..9dbe0b27 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.h
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.h
@@ -29,8 +29,9 @@ class VCSManagerPart;
 class VCSManagerProjectConfig: public VCSManagerProjectConfigBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0);
+	VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
 	void accept();
diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
index 735a018f..471e3efa 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
+++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>VCSManagerProjectConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VCSManagerProjectConfigBase</cstring>
     </property>
@@ -19,18 +19,18 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
             <property name="text">
                 <string>Version control system to use for this project:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
-        <widget class="QComboBox">
+        <widget class="TQComboBox">
             <property name="name">
                 <cstring>vcsCombo</cstring>
             </property>
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>131</height>
@@ -54,5 +54,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/core.cpp b/src/core.cpp
index c189fcf8..6dc493bf 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -46,7 +46,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client)
       if (tooltip.isEmpty())
         tooltip = action->text().remove('&');
       else {
-        int i = tooltip.findRev('(');
+        int i = tooltip.tqfindRev('(');
         if (i > 0) tooltip = tooltip.left(i).stripWhiteSpace();
       }
 
@@ -109,8 +109,8 @@ namespace MainWindowUtils{
 TQString beautifyToolTip(const TQString& text)
 {
     TQString temp = text;
-    temp.replace(TQRegExp("&"), "");
-    temp.replace(TQRegExp("\\.\\.\\."), "");
+    temp.tqreplace(TQRegExp("&"), "");
+    temp.tqreplace(TQRegExp("\\.\\.\\."), "");
     return temp;
 }
 }
diff --git a/src/core.h b/src/core.h
index a111f220..90b1e76a 100644
--- a/src/core.h
+++ b/src/core.h
@@ -20,6 +20,7 @@ Core implementation.
 class Core : public KDevCore
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -27,7 +28,7 @@ public:
   
   /**
    * Setup shourtcut tips. For every KAction with a shortcut,
-   * appends the shortcut string, in parenthesis, to the
+   * appends the shortcut string, in tqparenthesis, to the
    * actions's tooltip. If tooltip already has any text in
    * parens, it's removed and shortcut is added instead.
    *
diff --git a/src/documentationpart.h b/src/documentationpart.h
index b992bbf0..0603715f 100644
--- a/src/documentationpart.h
+++ b/src/documentationpart.h
@@ -11,6 +11,7 @@ Implements shell-dependent "duplicate" and "open in new window" actions of KDevH
 class HTMLDocumentationPart : public KDevHTMLPart
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index a0c42da3..0cf0e3f1 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -82,7 +82,7 @@ void EditorProxy::setLineNumber(KParts::Part *part, int lineNum, int col)
   {
 #if KDE_IS_VERSION(3,5,5)
 #else
-    if (!part->widget()->hasFocus()) //workaround for QXIMInputContext crashes. Keep for KDE <=3.5.4!
+    if (!part->widget()->hasFocus()) //workaround for TQXIMInputContext crashes. Keep for KDE <=3.5.4!
     {
       m_delayedPart = part;
       m_delayedLine = lineNum;
@@ -163,9 +163,9 @@ void EditorProxy::popupAboutToShow()
 	for (int index=popup->count()-1; index >= 0; --index)
 	{
 		int id = popup->idAt(index);
-		if (m_popupIds.contains(id) == 0)
+		if (m_popupIds.tqcontains(id) == 0)
 		{
-			TQMenuItem *item = popup->findItem(id);
+			TQMenuItem *item = popup->tqfindItem(id);
 			if ( item && item->popup() )
 				delete item->popup();
 			else
@@ -182,7 +182,7 @@ void EditorProxy::popupAboutToShow()
 
 	TQString wordstr;
 	TQString selection = KDevEditorUtil::currentSelection( doc );
-	if ( !selection.isEmpty() && selection.contains('\n') != 0 )
+	if ( !selection.isEmpty() && selection.tqcontains('\n') != 0 )
 	{
 		wordstr = selection;
 	}
@@ -201,7 +201,7 @@ void EditorProxy::popupAboutToShow()
 	for( uint i = 0; i < popup->count(); ) 
 	{
 		int id = popup->idAt( i );
-		if( lastWasSeparator && popup->findItem( id )->isSeparator() ) 
+		if( lastWasSeparator && popup->tqfindItem( id )->isSeparator() ) 
 		{
 			popup->removeItem( id );
 			// Since we removed an item, don't increment i
diff --git a/src/editorproxy.h b/src/editorproxy.h
index b505656f..37cbefc8 100644
--- a/src/editorproxy.h
+++ b/src/editorproxy.h
@@ -15,9 +15,10 @@ class TQTimer;
 #include <kdeversion.h>
 # include <ktexteditor/markinterfaceextension.h>
 
-class EditorProxy : public QObject
+class EditorProxy : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp
index fdc53eff..e1257537 100644
--- a/src/generalinfowidget.cpp
+++ b/src/generalinfowidget.cpp
@@ -29,8 +29,8 @@
 
 TQString makeRelativePath(const TQString& fromPath, const TQString& toPath);
 
-GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name)
-        : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) {
+GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name)
+        : GeneralInfoWidgetBase(tqparent, name), m_projectDom(projectDom) {
 
     connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)),
             this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&)));
@@ -65,8 +65,8 @@ void GeneralInfoWidget::readConfig() {
     }
     encoding_combo->setCurrentItem( 0 );
 
-//    const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null ) );
-    const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null );
+//    const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) );
+    const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() );
     for ( int i = 0; i < encoding_combo->count(); i++ )
     {
         if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding )
@@ -92,7 +92,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
     TQFile configurein(configureinpath);
 
     if ( !configurein.open( IO_ReadOnly ) ){
-        KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath));
+        KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(configureinpath));
         return;
     }
 
@@ -152,7 +152,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
     // write our changes..
     TQFile configureout(configureinpath);
     if ( !configureout.open( IO_WriteOnly ) ){
-        KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath));
+        KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath));
         return ;
     }
     TQTextStream output( &configureout);
@@ -189,7 +189,7 @@ void GeneralInfoWidget::writeConfig() {
     DomUtil::writeEntry(m_projectDom,"/general/version",version_edit->text());
     DomUtil::writeEntry(m_projectDom,"/general/description",description_edit->text());
 
-    TQString DefaultEncoding = TQString::null;
+    TQString DefaultEncoding = TQString();
     if ( encoding_combo->currentItem() > 0 )
     {
         DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() );
@@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
     else if(isProjectDirectoryAbsolute() && text[0] != '/')
     {
        setProjectDirectoryError(
-           i18n("'%1' is not an absolute path.").arg(
+           i18n("'%1' is not an absolute path.").tqarg(
                project_directory_edit->text()));
     }
     else if(!isProjectDirectoryAbsolute() && text[0] == '/')
     {
        setProjectDirectoryError(
-           i18n("'%1' is not a relative path.").arg(
+           i18n("'%1' is not a relative path.").tqarg(
                project_directory_edit->text()));
     }
     else
@@ -231,11 +231,11 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
         TQFileInfo info(projectDirectory());
         if(!info.exists())
            setProjectDirectoryError(
-               i18n("'%1' does not exist.").arg(
+               i18n("'%1' does not exist.").tqarg(
                    project_directory_edit->text()));
         else if(!info.isDir())
            setProjectDirectoryError(
-               i18n("'%1' is not a directory.").arg(
+               i18n("'%1' is not a directory.").tqarg(
                    project_directory_edit->text()));
         else
            setProjectDirectorySuccess();
@@ -261,10 +261,10 @@ void GeneralInfoWidget::setProjectDirectorySuccess() {
     project_directory_diagnostic_icon->setPixmap(SmallIcon("ok"));
     if(isProjectDirectoryAbsolute())
         project_directory_diagnostic_label->setText(
-            i18n("'%1' is a valid project directory.").arg(projectDirectory()));
+            i18n("'%1' is a valid project directory.").tqarg(projectDirectory()));
     else
         project_directory_diagnostic_label->setText(
-            i18n("'%1' is a valid project directory.").arg(projectDirectory()));
+            i18n("'%1' is a valid project directory.").tqarg(projectDirectory()));
 }
 
 TQString makeRelativePath(const TQString& fromPath, const TQString& toPath)
diff --git a/src/generalinfowidget.h b/src/generalinfowidget.h
index bb59bc5c..85f926e5 100644
--- a/src/generalinfowidget.h
+++ b/src/generalinfowidget.h
@@ -23,10 +23,11 @@ General project information widget.
 */
 class GeneralInfoWidget : public GeneralInfoWidgetBase {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0);
+    GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0);
     ~GeneralInfoWidget();
 
 public slots:
diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui
index 370c42e4..9d515c0e 100644
--- a/src/generalinfowidgetbase.ui
+++ b/src/generalinfowidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>GeneralInfoWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>general_info_widget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QComboBox" row="0" column="4">
+        <widget class="TQComboBox" row="0" column="4">
             <item>
                 <property name="text">
                     <string>Absolute Path</string>
@@ -44,14 +44,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>408</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="5" column="0" rowspan="1" colspan="5">
+        <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>description_label</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <string>Description:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>project_directory_label</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <string>Project directory:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>author_label</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <string>Author:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>email_label</cstring>
             </property>
@@ -83,7 +83,7 @@
                 <string>Email:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>version_label</cstring>
             </property>
@@ -103,7 +103,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>100</width>
                     <height>32767</height>
@@ -133,7 +133,7 @@ Placed in the AUTHORS file</string>
 Placed in the AUTHORS file</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="1">
+        <widget class="TQLabel" row="1" column="1">
             <property name="name">
                 <cstring>project_directory_diagnostic_icon</cstring>
             </property>
@@ -145,13 +145,13 @@ Placed in the AUTHORS file</string>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -189,7 +189,7 @@ Placed in the AUTHORS file</string>
                 <string>Please select a project directory</string>
             </property>
         </widget>
-        <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="7" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -197,7 +197,7 @@ Placed in the AUTHORS file</string>
                 <string>Default encoding:</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="7" column="2" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="7" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>encoding_combo</cstring>
             </property>
@@ -205,7 +205,7 @@ Placed in the AUTHORS file</string>
                 <string>Default encoding used when opening text files</string>
             </property>
         </widget>
-        <widget class="QTextEdit" row="6" column="0" rowspan="1" colspan="5">
+        <widget class="TQTextEdit" row="6" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>description_edit</cstring>
             </property>
@@ -233,8 +233,8 @@ Placed in the AUTHORS file</string>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 0c35de83..432ab2df 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -79,7 +79,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
     gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" );
 
     config->setGroup("TerminalEmulator");
-    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) );
+    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole") ) );
     bool useKDESetting = config->readBoolEntry( "UseKDESetting", true );
     gsw->useKDETerminal->setChecked( useKDESetting );
     gsw->useOtherTerminal->setChecked( !useKDESetting );
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 6c6bd357..e2af092e 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -32,13 +32,13 @@
 #include "languageselectwidget.h"
 #include "plugincontroller.h"
 
-class LangPluginItem : public QCheckListItem
+class LangPluginItem : public TQCheckListItem
 {
 public:
     // name - "Name", label - "GenericName", info - "Comment"
-    LangPluginItem( TQListView * parent, TQString const & name, TQString const & label,
+    LangPluginItem( TQListView * tqparent, TQString const & name, TQString const & label,
                 TQString const & info )
-        : TQCheckListItem( parent, label, TQCheckListItem::CheckBox),
+        : TQCheckListItem( tqparent, label, TQCheckListItem::CheckBox),
         _name( name ), _info( info )
     {}
 
@@ -52,22 +52,22 @@ private:
 
 
 LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom,
-                                   TQWidget *parent, const char *name)
-    : TQWidget(parent, name), m_projectDom(projectDom)
+                                   TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name), m_projectDom(projectDom)
 {
     init();
 }
 
 void LanguageSelectWidget::init()
 {
-    TQVBoxLayout *layout = new TQVBoxLayout(this);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 
     TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this );
     groupBox1->setColumnLayout(0, Qt::Vertical );
-    groupBox1->layout()->setSpacing( 6 );
-    groupBox1->layout()->setMargin( 11 );
-    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() );
-    groupBox1Layout->setAlignment( Qt::AlignTop );
+    groupBox1->tqlayout()->setSpacing( 6 );
+    groupBox1->tqlayout()->setMargin( 11 );
+    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() );
+    groupBox1Layout->tqsetAlignment( TQt::AlignTop );
 
     _currentLanguage = new TQLabel( "", groupBox1 );
 
@@ -78,21 +78,21 @@ void LanguageSelectWidget::init()
 
     groupBox1Layout->addWidget(_currentLanguage);
     groupBox1Layout->addWidget( _pluginList );
-    layout->addWidget( groupBox1 );
+    tqlayout->addWidget( groupBox1 );
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->layout()->setSpacing( 6 );
-    groupBox2->layout()->setMargin( 11 );
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
-    groupBox2Layout->setAlignment( Qt::AlignTop );
+    groupBox2->tqlayout()->setSpacing( 6 );
+    groupBox2->tqlayout()->setMargin( 11 );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
+    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
 
     _pluginDescription = new TQLabel( groupBox2 );
-    _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    _pluginDescription->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
     groupBox2Layout->addWidget( _pluginDescription );
 
-    layout->addWidget( groupBox2 );
+    tqlayout->addWidget( groupBox2 );
 
     connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
 
@@ -106,13 +106,13 @@ LanguageSelectWidget::~LanguageSelectWidget()
 void LanguageSelectWidget::readProjectConfig()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
-                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
-                               ).arg( KDEVELOP_PLUGIN_VERSION ));
+        KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
+                               TQString::tqfromLatin1("[X-KDevelop-Version] == %1"
+                               ).tqarg( KDEVELOP_PLUGIN_VERSION ));
 
     TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
     TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage");
-    _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").arg(language));
+    _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").tqarg(language));
 
     for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
@@ -120,7 +120,7 @@ void LanguageSelectWidget::readProjectConfig()
         if (la == language)
             continue;
         LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() );
-        item->setOn(languages.contains(la));
+        item->setOn(languages.tqcontains(la));
     }
 
     TQListViewItem * first = _pluginList->firstChild();
diff --git a/src/languageselectwidget.h b/src/languageselectwidget.h
index 95c349f7..9e7e31de 100644
--- a/src/languageselectwidget.h
+++ b/src/languageselectwidget.h
@@ -18,13 +18,14 @@
 
 class TQListView;
 
-class LanguageSelectWidget : public QWidget
+class LanguageSelectWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /* for selection of project parts */
-    LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 );
+    LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 );
     ~LanguageSelectWidget();
 
 public slots:
diff --git a/src/main.cpp b/src/main.cpp
index 467724d1..d47d7257 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,13 +47,13 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Several components, htdig indexing"), "hoelzer@kde.org");
   aboutData.addAuthor("Victor Roeder", I18N_NOOP("Help with Automake manager and persistent class store"), "victor_roeder@gmx.de");
   aboutData.addAuthor("Megan Webb", I18N_NOOP("Automake manager patches, Astyle plugin update, plugin patches and improvements"),"kdeveloper.megan@gmail.com");
-  aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to Qt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org");
-  aboutData.addAuthor("Roberto Raggi", I18N_NOOP("QEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org");
+  aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to TQt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org");
+  aboutData.addAuthor("Roberto Raggi", I18N_NOOP("TQEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org");
   aboutData.addAuthor("Simon Hausmann", I18N_NOOP("Help with KParts infrastructure"), "hausmann@kde.org");
   aboutData.addAuthor("Oliver Kellogg", I18N_NOOP("Ada support"), "okellogg@users.sourceforge.net");
-  aboutData.addAuthor("Andreas Pakulat", I18N_NOOP("QMake projectmanager, Qt4 Support"), "apaku@gmx.de");
-  aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("QMake projectmanager"), "jsgaarde@tdcspace.dk");
-  aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, QEditor, bugfixes"), "falkbr@kdevelop.org");
+  aboutData.addAuthor("Andreas Pakulat", I18N_NOOP("TQMake projectmanager, TQt4 Support"), "apaku@gmx.de");
+  aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("TQMake projectmanager"), "jsgaarde@tdcspace.dk");
+  aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, TQEditor, bugfixes"), "falkbr@kdevelop.org");
   aboutData.addAuthor("Mario Scalas", I18N_NOOP("PartExplorer, redesign of CvsPart, patches, bugs(fixes)"), "mario.scalas@libero.it");
   aboutData.addAuthor("Jens Dagerbo", I18N_NOOP("Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and patches"), "jens.dagerbo@swipnet.se");
   aboutData.addAuthor("Julian Rockey", I18N_NOOP("Filecreate part and other bits and patches"), "linux@jrockey.com");
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Marcel Turino", I18N_NOOP("Documentation index view"), "M.Turino@gmx.de");
   aboutData.addCredit("Yann Hodique", I18N_NOOP("Patches"), "Yann.Hodique@lifl.fr");
   aboutData.addCredit("Tobias Gl\303\244\303\237er" , I18N_NOOP("Documentation Finder,  qmake projectmanager patches, usability improvements, bugfixes ... "), "tobi.web@gmx.de");
-  aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("QMake project manager patches"), "koepfle@ti.uni-mannheim.de");
+  aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("TQMake project manager patches"), "koepfle@ti.uni-mannheim.de");
   aboutData.addCredit("Sascha Cunz" , I18N_NOOP("Cleanup and bugfixes for qEditor, AutoMake and much other stuff"), "sascha@kdevelop.org");
   aboutData.addCredit("Robert Gruber" , I18N_NOOP("SnippetPart, debugger and usability patches"), "rgruber@users.sourceforge.net");
   aboutData.addCredit("Zoran Karavla", I18N_NOOP("Artwork for the Ruby language"), "webmaster@the-error.net", "http://the-error.net");
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index d851447f..f9d87b84 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -44,12 +44,12 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Ian Reinhart Geiser", I18N_NOOP("Dist part, bash support, application templates"), "geiseri@yahoo.com");
   aboutData.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Several components, htdig indexing"), "hoelzer@kde.org");
   aboutData.addAuthor("Victor Roeder", I18N_NOOP("Help with Automake manager and persistent class store"), "victor_roeder@gmx.de");
-  aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to Qt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org");
-  aboutData.addAuthor("Roberto Raggi", I18N_NOOP("QEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org");
+  aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to TQt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org");
+  aboutData.addAuthor("Roberto Raggi", I18N_NOOP("TQEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org");
   aboutData.addAuthor("Simon Hausmann", I18N_NOOP("Help with KParts infrastructure"), "hausmann@kde.org");
   aboutData.addAuthor("Oliver Kellogg", I18N_NOOP("Ada support"), "okellogg@users.sourceforge.net");
-  aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("QMake projectmanager"), "jsgaarde@tdcspace.dk");
-  aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, QEditor, bugfixes"), "falkbr@kdevelop.org");
+  aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("TQMake projectmanager"), "jsgaarde@tdcspace.dk");
+  aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, TQEditor, bugfixes"), "falkbr@kdevelop.org");
   aboutData.addAuthor("Mario Scalas", I18N_NOOP("PartExplorer, redesign of CvsPart, patches, bugs(fixes)"), "mario.scalas@libero.it");
   aboutData.addAuthor("Jens Dagerbo", I18N_NOOP("Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and patches"), "jens.dagerbo@swipnet.se");
   aboutData.addAuthor("Julian Rockey", I18N_NOOP("Filecreate part and other bits and patches"), "linux@jrockey.com");
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Marcel Turino", I18N_NOOP("Documentation index view"), "M.Turino@gmx.de");
   aboutData.addCredit("Yann Hodique", I18N_NOOP("Patches"), "Yann.Hodique@lifl.fr");
   aboutData.addCredit("Tobias Gl\303\244\303\237er" , I18N_NOOP("Documentation Finder,  qmake projectmanager patches, usability improvements, bugfixes ... "), "tobi.web@gmx.de");
-  aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("QMake project manager patches"), "koepfle@ti.uni-mannheim.de");
+  aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("TQMake project manager patches"), "koepfle@ti.uni-mannheim.de");
   aboutData.addCredit("Sascha Cunz" , I18N_NOOP("Cleanup and bugfixes for qEditor, AutoMake and much other stuff"), "mail@sacu.de");
 
   KCmdLineArgs::init(argc, argv, &aboutData);
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index b725db23..8e39a63d 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -105,7 +105,7 @@ void MainWindowShare::createActions()
 {
   ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() );
 
-  KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection());
+  KStdAction::quit(this->tqparent(), TQT_SLOT(close()), m_pMainWnd->actionCollection());
 
   KAction* action;
 
@@ -127,30 +127,30 @@ void MainWindowShare::createActions()
                 this, TQT_SLOT(slotShowMenuBar()),
                 m_pMainWnd->actionCollection(), "settings_show_menubar" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you switch the menubar on/off.")));
 
   action = KStdAction::keyBindings(
                 this, TQT_SLOT(slotKeyBindings()),
                 m_pMainWnd->actionCollection(), "settings_configure_shortcuts" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure shortcut keys.")));
 
   action = KStdAction::configureToolbars(
                 this, TQT_SLOT(slotConfigureToolbars()),
                 m_pMainWnd->actionCollection(), "settings_configure_toolbars" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure toolbars.")));
 
   action = KStdAction::configureNotifications(
                 this, TQT_SLOT(slotConfigureNotifications()),
                 m_pMainWnd->actionCollection(), "settings_configure_notifications" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure system notifications.")));
 
   action = KStdAction::preferences(this, TQT_SLOT(slotSettings()),
                 m_pMainWnd->actionCollection(), "settings_configure" );
   action->setToolTip( i18n( "Configure KDevelop" ) );
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(i18n( "Configure KDevelop" )).tqarg(i18n("Lets you customize KDevelop.")));
 
   m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar");
   m_toggleStatusbar->setText(i18n("Show &Statusbar"));
@@ -439,7 +439,7 @@ void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *)
     return;
 
   int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) );
-  popup->setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off."));
+  popup->TQMenuData::setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off."));
 }
 
 void MainWindowShare::slotActivePartChanged( KParts::Part * part )
diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h
index 72a4b5ea..f56d0201 100644
--- a/src/mainwindowshare.h
+++ b/src/mainwindowshare.h
@@ -27,9 +27,10 @@ namespace KParts {
 /**
 Shared main window functionality.
 */
-class MainWindowShare : public QObject
+class MainWindowShare : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   MainWindowShare(TQObject* pParent = 0L, const char* name = 0L);
   ~MainWindowShare() {}
diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui
index 21fdbee4..2c44566c 100644
--- a/src/mimewarningdialog.ui
+++ b/src/mimewarningdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>MimeWarningDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MimeWarningDialog</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>text1</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <string>Some URL</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>text3</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <string>&lt;qt&gt;No suitable viewer was found for the &lt;b&gt;%1&lt;/b&gt; mimetype.&lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -103,7 +103,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>open_with_kde</cstring>
                     </property>
@@ -114,7 +114,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>open_as_text</cstring>
                     </property>
@@ -122,9 +122,9 @@
                         <string>Open it in KDevelop as plain text</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -140,14 +140,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>24</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>always_open_as_text</cstring>
                             </property>
@@ -168,7 +168,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -179,9 +179,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -197,14 +197,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton1</cstring>
                     </property>
@@ -212,7 +212,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton2</cstring>
                     </property>
@@ -250,5 +250,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index bd5942fc..4960d870 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -45,8 +45,8 @@
 #include <ktexteditor/document.h>
 #include <ktexteditor/viewcursorinterface.h>
 
-MultiBuffer::MultiBuffer( TQWidget *parent )
-        : TQSplitter( parent, "MultiBuffer" ),
+MultiBuffer::MultiBuffer( TQWidget *tqparent )
+        : TQSplitter( tqparent, "MultiBuffer" ),
         m_editorFactory( 0 ),
         m_delayActivate( false ),
         m_activated( false ),
@@ -84,7 +84,7 @@ KParts::Part *MultiBuffer::activeBuffer( ) const
 
 bool MultiBuffer::hasURL( const KURL &url ) const
 {
-    return m_buffers.contains( url );
+    return m_buffers.tqcontains( url );
 }
 
 int MultiBuffer::numberOfBuffers() const
@@ -124,7 +124,7 @@ KParts::Part* MultiBuffer::openURL( const KURL &url )
 
 bool MultiBuffer::closeURL( const KURL &url )
 {
-    if ( !m_buffers.contains( url ) )
+    if ( !m_buffers.tqcontains( url ) )
         return false;
 
     bool result = false;
@@ -147,7 +147,7 @@ void MultiBuffer::registerURL( const KURL &url, KParts::Part *part )
 void MultiBuffer::registerDelayedActivation( KParts::Part *part,
         int line, int col )
 {
-    m_delayedActivation[ part ] = qMakePair( line, col );
+    m_delayedActivation[ part ] = tqMakePair( line, col );
 }
 
 KParts::Part* MultiBuffer::createPart( const TQString &mimeType,
@@ -219,7 +219,7 @@ void MultiBuffer::show()
         KTextEditor::View *view = document->createView( this );
         document->setWidget( view );
 
-        // We're managing the view deletion by being its parent,
+        // We're managing the view deletion by being its tqparent,
         // don't let the part self-destruct
         disconnect( view, TQT_SIGNAL( destroyed() ),
                     document, TQT_SLOT( slotWidgetDestroyed() ) );
@@ -256,7 +256,7 @@ void MultiBuffer::setOrientation( Qt::Orientation orientation )
 
 void MultiBuffer::activePartChanged( const KURL &url )
 {
-    if ( !m_buffers.contains( url ) )
+    if ( !m_buffers.tqcontains( url ) )
         return ;
 
     m_activeBuffer = m_buffers[ url ];
@@ -300,4 +300,4 @@ void MultiBuffer::updateUrlForPart(KParts::Part *part, KURL url)
 
 #include "multibuffer.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/src/multibuffer.h b/src/multibuffer.h
index a481574f..f6f40ea6 100644
--- a/src/multibuffer.h
+++ b/src/multibuffer.h
@@ -35,13 +35,14 @@ class ReadOnlyPart;
 class KURL;
 
 typedef TQMap< KURL, KParts::Part* > BufferMap;
-typedef TQMap< KParts::Part*, QPair<int, int> > ActivationMap;
+typedef TQMap< KParts::Part*, TQPair<int, int> > ActivationMap;
 
-class MultiBuffer : public QSplitter
+class MultiBuffer : public TQSplitter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    MultiBuffer( TQWidget * parent = 0 );
+    MultiBuffer( TQWidget * tqparent = 0 );
     virtual ~MultiBuffer();
 
     KParts::Part *activeBuffer() const;
@@ -54,7 +55,7 @@ public:
     KParts::Part* createPart( const TQString &mimeType,
                               const TQString &partType,
                               const TQString &className,
-                              const TQString &preferredName = TQString::null );
+                              const TQString &preferredName = TQString() );
 
     KParts::Part* openURL( const KURL &url );
     bool closeURL( const KURL &url );
@@ -86,4 +87,4 @@ private:
 
 #endif
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 0631510e..1795b18a 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -39,32 +39,32 @@
 
 namespace Ideal {
 
-Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
+Button::Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon,
     const TQString &description)
-    :TQPushButton(icon, text, parent), m_buttonBar(parent), m_description(description),
-    m_place(parent->place()), m_realText(text), m_realIconSet(icon)
+    :TQPushButton(icon, text, tqparent), m_buttonBar(tqparent), m_description(description),
+    m_place(tqparent->place()), m_realText(text), m_realIconSet(icon)
 {
     hide();
     setFlat(true);
     setToggleButton(true);
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setDescription(m_description);
-    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-    resize(sizeHint());
+    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    resize(tqsizeHint());
     fixDimensions(Ideal::Bottom);
 
     TQToolTip::add(this, m_realText);
 
     m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0,
-        this, TQT_SLOT(assignAccel()), this);
+        TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this));
     m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0,
-        this, TQT_SLOT(clearAccel()), this);
+        TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
 
     KConfig *config = kapp->config();
     config->setGroup("UI");
-    TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
+    TQString accel = config->readEntry(TQString("button_%1").tqarg(text), "");
     if (!accel.isEmpty())
-        setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
+        setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText));
 }
 
 Button::~Button()
@@ -78,13 +78,13 @@ Button::~Button()
     if (r.search(m_realText) > -1)
     {
         TQString text = m_realText;
-        if (text.contains(r2))
+        if (text.tqcontains(r2))
             text.remove(r2);
-        config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
+        config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1));
     }
     else
     {
-        config->writeEntry(TQString("button_%1").arg(m_realText), "");
+        config->writeEntry(TQString("button_%1").tqarg(m_realText), "");
     }
 }
 
@@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
     pm.fill(eraseColor());
     TQPainter p2(&pm);
 
-    style().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
+    tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags);
 
-    style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+    tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this,
                         TQRect(0,0,pm.width(),pm.height()),
-                        colorGroup(), flags, TQStyleOption());
+                        tqcolorGroup(), flags, TQStyleOption());
 
     switch (m_place)
     {
@@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
             {
                 setFixedWidth(height());
-                setMinimumHeight(sizeHint().width());
+                setMinimumHeight(tqsizeHint().width());
                 setMaximumHeight(32767);
             }
             break;
@@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
             {
                 setFixedHeight(width());
-                setMinimumWidth(sizeHint().height());
+                setMinimumWidth(tqsizeHint().height());
                 setMaximumWidth(32767);
             }
             break;
     }
 }
 
-TQSize Button::sizeHint() const
+TQSize Button::tqsizeHint() const
 {
-    return sizeHint(text());
+    return tqsizeHint(text());
 }
 
-TQSize Button::sizeHint(const TQString &text) const
+TQSize Button::tqsizeHint(const TQString &text) const
 {
     constPolish();
     int w = 0, h = 0;
@@ -208,10 +208,10 @@ TQSize Button::sizeHint(const TQString &text) const
         int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
         int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height();
         w += iw;
-        h = QMAX( h, ih );
+        h = TQMAX( h, ih );
     }
     if ( isMenuButton() )
-        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
         w += pm->width();
@@ -220,16 +220,16 @@ TQSize Button::sizeHint(const TQString &text) const
         TQString s( text );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::fromLatin1("XXXX");
+            s = TQString::tqfromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
             w += sz.width();
         if(!empty || !h)
-            h = QMAX(h, sz.height());
+            h = TQMAX(h, sz.height());
     }
 
-    return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+    return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
             expandedTo(TQApplication::globalStrut()));
 }
 
@@ -239,12 +239,12 @@ void Button::updateSize()
     {
         case Ideal::Left:
         case Ideal::Right:
-             setMinimumHeight(sizeHint().width());
-             resize(sizeHint().height(), sizeHint().width());
+             setMinimumHeight(tqsizeHint().width());
+             resize(tqsizeHint().height(), tqsizeHint().width());
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            resize(sizeHint().width(), sizeHint().height());
+            resize(tqsizeHint().width(), tqsizeHint().height());
             break;
     }
 }
@@ -304,7 +304,7 @@ void Button::contextMenuEvent(TQContextMenuEvent *e)
     TQPopupMenu menu;
 
     m_assignAccelAction->plug(&menu);
-    if (m_realText.contains(TQRegExp("^&[0-9]\\s")))
+    if (m_realText.tqcontains(TQRegExp("^&[0-9]\\s")))
         m_clearAccelAction->plug(&menu);
 
     emit contextMenu( &menu );
@@ -319,7 +319,7 @@ void Button::assignAccel()
     if (ok)
     {
         TQString text = realTextWithoutAccel();
-        text = TQString("&%1 %2").arg(num).arg(text);
+        text = TQString("&%1 %2").tqarg(num).tqarg(text);
         setRealText(text);
     }
 }
@@ -340,7 +340,7 @@ TQString Button::realTextWithoutAccel() const
 {
     TQString text = m_realText;
     TQRegExp r("^&[0-9]\\s");
-    if (text.contains(r))
+    if (text.tqcontains(r))
         text.remove(r);
     return text;
 }
diff --git a/src/newui/button.h b/src/newui/button.h
index 86e7dbed..3dbc63ca 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -39,9 +39,10 @@ A TQPushButton derivative with a size of a TQToolBar. Button can be rotated
 */
 class Button : public TQPushButton {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(),
-        const TQString &description = TQString::null);
+    Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon = TQIconSet(),
+        const TQString &description = TQString());
 
     /**Sets the description used as a tooltip.*/
     void setDescription(const TQString &description);
@@ -53,8 +54,8 @@ public:
     /**Sets the mode of a button.*/
     void setMode(Ideal::ButtonMode mode);
 
-    TQSize sizeHint() const;
-    TQSize sizeHint(const TQString &text) const;
+    TQSize tqsizeHint() const;
+    TQSize tqsizeHint(const TQString &text) const;
 
     /**Updates size of a widget. Used after squeezing button's text.*/
     void updateSize();
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index b2a3b47c..342e3491 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -32,14 +32,14 @@ namespace Ideal {
 
 //ButtonLayout class
 
-ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spacing, const char *name)
-    :TQBoxLayout(parent, d, margin, spacing, name), m_buttonBar(parent)
+ButtonLayout::ButtonLayout(ButtonBar *tqparent, Direction d, int margin, int spacing, const char *name)
+    :TQBoxLayout(tqparent, d, margin, spacing, name), m_buttonBar(tqparent)
 {
 }
 
-TQSize ButtonLayout::minimumSize() const
+TQSize ButtonLayout::tqminimumSize() const
 {
-    TQSize size = TQBoxLayout::minimumSize();
+    TQSize size = TQBoxLayout::tqminimumSize();
 
     if (!m_buttonBar->autoResize())
         return size;
@@ -54,7 +54,7 @@ TQSize ButtonLayout::minimumSize() const
         case Ideal::Bottom:
             return TQSize(0,size.height());
     }
-    return TQBoxLayout::minimumSize();
+    return TQBoxLayout::tqminimumSize();
 }
 
 
@@ -62,8 +62,8 @@ TQSize ButtonLayout::minimumSize() const
 //ButtonBar class
 
 
-ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *parent, const char *name)
-    :TQWidget(parent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true)
+ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *tqparent, const char *name)
+    :TQWidget(tqparent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true)
 {
     switch (m_place)
     {
@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
     {
         case Ideal::Left:
         case Ideal::Right:
-            setFixedWidth(sizeHint().width());
-            setMinimumHeight(sizeHint().height());
+            setFixedWidth(tqsizeHint().width());
+            setMinimumHeight(tqsizeHint().height());
             setMaximumHeight(32767);
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            setFixedHeight(sizeHint().height());
-            setMinimumWidth(sizeHint().width());
+            setFixedHeight(tqsizeHint().height());
+            setMinimumWidth(tqsizeHint().width());
             setMaximumWidth(32767);
             break;
     }
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
     {
         case Ideal::Left:
         case Ideal::Right:
-            preferredDimension = l->TQBoxLayout::minimumSize().height();
+            preferredDimension = l->TQBoxLayout::tqminimumSize().height();
             actualDimension = size().height();
             oldDimension = ev->oldSize().height();
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            preferredDimension = l->TQBoxLayout::minimumSize().width();
+            preferredDimension = l->TQBoxLayout::tqminimumSize().width();
             actualDimension = size().width();
             oldDimension = ev->oldSize().width();
             break;
@@ -249,7 +249,7 @@ void ButtonBar::deshrink(int preferredDimension, int actualDimension)
         int i = 0;
         for (TQValueList<uint>::iterator it = texts.begin(); it != texts.end(); ++it, i++)
         {
-            if (m_buttons[i]->text().contains("..."))
+            if (m_buttons[i]->text().tqcontains("..."))
                 (*it)++;
             newTextLength += *it;
         }
@@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
     int size = 0;
     for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
     {
-        size += (*it)->sizeHint((*it)->realText()).width();
+        size += (*it)->tqsizeHint((*it)->realText()).width();
     }
     return size;
 }
@@ -309,7 +309,7 @@ Button *ButtonBar::firstButton()
 
 Button *ButtonBar::nextTo(Button *button)
 {
-    ButtonList::iterator it = m_buttons.find(button);
+    ButtonList::iterator it = m_buttons.tqfind(button);
     Button *next = 0;
     if ((*it) == m_buttons.last())
         next = m_buttons.first();
@@ -326,7 +326,7 @@ Button *ButtonBar::nextTo(Button *button)
 
 Button *ButtonBar::prevTo(Button *button)
 {
-    ButtonList::iterator it = m_buttons.find(button);
+    ButtonList::iterator it = m_buttons.tqfind(button);
     Button *prev = 0;
     if (it == m_buttons.begin())
         prev = m_buttons.last();
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index ad1cf5b6..f8f13868 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -32,14 +32,14 @@ namespace Ideal {
 class Button;
 class ButtonBar;
 
-/**@short A layout for a ButtonBar class.
+/**@short A tqlayout for a ButtonBar class.
 
-Overrides minimumSize method to allow shrinking button bar buttons.*/
-class ButtonLayout: public QBoxLayout{
+Overrides tqminimumSize method to allow shrinking button bar buttons.*/
+class ButtonLayout: public TQBoxLayout{
 public:
-    ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
+    ButtonLayout(ButtonBar *tqparent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
 
-    virtual TQSize minimumSize() const;
+    virtual TQSize tqminimumSize() const;
 
 private:
     ButtonBar *m_buttonBar;
@@ -53,9 +53,10 @@ placing on the left(right, bottom, top) corners of a window as a bar with slider
 */
 class ButtonBar : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ButtonBar(Place place, ButtonMode mode = IconsAndText,
-        TQWidget *parent = 0, const char *name = 0);
+        TQWidget *tqparent = 0, const char *name = 0);
     virtual ~ButtonBar();
 
     /**Adds a button to the bar.*/
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 5f11425d..95b36eab 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -39,9 +39,9 @@
 #include "button.h"
 #include "dmainwindow.h"
 
-DDockWindow::DDockWindow(DMainWindow *parent, Position position)
-    :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false),
-    m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0)
+DDockWindow::DDockWindow(DMainWindow *tqparent, Position position)
+    :TQDockWindow(TQDockWindow::InDock, tqparent), m_position(position), m_visible(false),
+    m_mainWindow(tqparent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0)
 {
     setMovingEnabled(false);
     setResizeEnabled(true);
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this );
-    m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this );
-    m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this );
+    m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
+    m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
+    m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
 
     setVisible(m_visible);
 
@@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
     KConfig *config = kapp->config();
-    TQString group = TQString("%1").arg(m_name);
+    TQString group = TQString("%1").tqarg(m_name);
     config->setGroup(group);
 
     if (m_visible)
@@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v)
     v ? m_widgetStack->show() : m_widgetStack->hide();
     m_visible = v;
 
-    m_internalLayout->invalidate();
+    m_internalLayout->tqinvalidate();
     if (!m_visible)
     {
         if (m_position == DDockWindow::Bottom)
-            setFixedExtentHeight(m_internalLayout->sizeHint().height());
+            setFixedExtentHeight(m_internalLayout->tqsizeHint().height());
         else
-            setFixedExtentWidth(m_internalLayout->sizeHint().width());
+            setFixedExtentWidth(m_internalLayout->tqsizeHint().width());
         emit hidden();
     }
     else
@@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v)
         int size = 0;
         if (m_position == DDockWindow::Bottom)
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().height());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height());
             setFixedExtentHeight(size);
         }
         else
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width());
             setFixedExtentWidth(size);
         }
     }
@@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
 void DDockWindow::saveSettings()
 {
     KConfig *config = kapp->config();
-    TQString group = TQString("%1").arg(m_name);
+    TQString group = TQString("%1").tqarg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
     if (config->hasKey("ViewWidth"))
@@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
         //if the widget was selected last time the dock is deleted
         //we need to show it
         KConfig *config = kapp->config();
-        TQString group = TQString("%1").arg(m_name);
+        TQString group = TQString("%1").tqarg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
         {
@@ -338,7 +338,7 @@ bool DDockWindow::isActive()
 {
     if (m_toggledButton)
     {
-        TQWidget *w = qApp->focusWidget();
+        TQWidget *w = tqApp->tqfocusWidget();
         if (!w)
             return false;
         TQWidget *toolWidget = m_widgets[m_toggledButton];
@@ -347,7 +347,7 @@ bool DDockWindow::isActive()
         else
         {
             do {
-                w = (TQWidget*)w->parent();
+                w = (TQWidget*)w->tqparent();
                 if (w && (w == toolWidget)) return true;
             } while (w);
         }
@@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget()
 
 void DDockWindow::contextMenu(TQPopupMenu * menu)
 {
-    m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) );
+    m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )) );
 
     menu->insertSeparator();
 
@@ -404,7 +404,7 @@ void DDockWindow::moveToDockBottom()
 
 void DDockWindow::moveToDock(DDockWindow::Position position )
 {
-    if (  m_widgets.contains( m_lastContextMenuButton ) )
+    if (  m_widgets.tqcontains( m_lastContextMenuButton ) )
     {
         mainWindow()->moveWidget( position, m_widgets[ m_lastContextMenuButton ], m_lastContextMenuButton->realTextWithoutAccel() );
     }
diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h
index 7653bff9..e9850d2f 100644
--- a/src/newui/ddockwindow.h
+++ b/src/newui/ddockwindow.h
@@ -40,10 +40,11 @@ namespace Ideal {
 
 class DDockWindow : public TQDockWindow {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum Position { Bottom, Left, Right };
 
-    DDockWindow(DMainWindow *parent, Position position);
+    DDockWindow(DMainWindow *tqparent, Position position);
     virtual ~DDockWindow();
 
     virtual void setVisible(bool v);
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 6e6a63d4..fb7dd14a 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -29,8 +29,8 @@
 #include "dtabwidget.h"
 #include "docksplitter.h"
 
-DMainWindow::DMainWindow(TQWidget *parent, const char *name)
-    :KParts::MainWindow(parent, name), m_firstRemoved(false), m_currentWidget(0)
+DMainWindow::DMainWindow(TQWidget *tqparent, const char *name)
+    :KParts::MainWindow(tqparent, name), m_firstRemoved(false), m_currentWidget(0)
 {
     loadSettings();
     createToolWindows();
@@ -74,16 +74,16 @@ DDockWindow *DMainWindow::toolWindow(DDockWindow::Position position) const
 void DMainWindow::createToolWindows()
 {
     m_bottomDock = new DDockWindow(this, DDockWindow::Bottom);
-    moveDockWindow(m_bottomDock, Qt::DockBottom);
+    moveDockWindow(m_bottomDock, TQt::DockBottom);
     m_leftDock = new DDockWindow(this, DDockWindow::Left);
-    moveDockWindow(m_leftDock, Qt::DockLeft);
+    moveDockWindow(m_leftDock, TQt::DockLeft);
     m_rightDock = new DDockWindow(this, DDockWindow::Right);
-    moveDockWindow(m_rightDock, Qt::DockRight);
+    moveDockWindow(m_rightDock, TQt::DockRight);
 }
 
 void DMainWindow::addWidget(TQWidget *widget, const TQString &title)
 {
-//     invalidateActiveTabWidget();
+//     tqinvalidateActiveTabWidget();
     if (m_firstRemoved && m_activeTabWidget == m_tabs.first())
     {
         m_central->addDock(0, 0, m_activeTabWidget);
@@ -116,10 +116,10 @@ void DMainWindow::addWidget(DTabWidget *tab, TQWidget *widget, const TQString &t
 
 void DMainWindow::removeWidget(TQWidget *widget)
 {
-    if (!m_widgets.contains(widget))
+    if (!m_widgets.tqcontains(widget))
         return; //not a widget in main window
 
-    if (m_widgetTabs.contains(widget))
+    if (m_widgetTabs.tqcontains(widget))
     {
         DTabWidget *tab = m_widgetTabs[widget];
         if (tab->indexOf(widget) >= 0)
@@ -133,7 +133,7 @@ void DMainWindow::removeWidget(TQWidget *widget)
                 //remove and delete tabwidget if it is not the first one
                 if (tab != m_tabs.first())
                 {
-                    QPair<uint, uint> idx = m_central->indexOf(tab);
+                    TQPair<uint, uint> idx = m_central->indexOf(tab);
                     m_tabs.remove(tab);
                     m_activeTabWidget = m_tabs.first();
                     m_central->removeDock(idx.first, idx.second, true);
@@ -175,25 +175,25 @@ DTabWidget *DMainWindow::splitHorizontal()
 
 DTabWidget *DMainWindow::splitVertical()
 {
-//     invalidateActiveTabWidget();
+//     tqinvalidateActiveTabWidget();
     int row = m_central->indexOf(m_activeTabWidget).first;
     m_activeTabWidget = createTab();
     m_central->addDock(row, m_central->numCols(row), m_activeTabWidget);
     return m_activeTabWidget;
 }
 
-void DMainWindow::invalidateActiveTabWidget()
+void DMainWindow::tqinvalidateActiveTabWidget()
 {
-/*    TQWidget *focused = m_central->focusWidget();
-    kdDebug(9000) << "invalidate: " << focused << endl;
+/*    TQWidget *focused = m_central->tqfocusWidget();
+    kdDebug(9000) << "tqinvalidate: " << focused << endl;
     if (focused == 0)
         return;
-    if (!m_widgets.contains(focused))
+    if (!m_widgets.tqcontains(focused))
     {
         kdDebug(9000) << "    focused is not in m_widgets" << endl;
         return;
     }
-    if (m_widgetTabs.contains(focused))
+    if (m_widgetTabs.tqcontains(focused))
     {
         kdDebug(9000) << "    focused is in m_widgets and m_widgetTabs" << endl;
         DTabWidget *tab = m_widgetTabs[focused];
@@ -218,7 +218,7 @@ DTabWidget *DMainWindow::createTab()
 bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev)
 {
     TQWidget *w = (TQWidget*)obj;
-    if (!m_widgets.contains(w))
+    if (!m_widgets.tqcontains(w))
         return KParts::MainWindow::eventFilter(obj, ev);
 
     if ((m_currentWidget != w) && (ev->type() == TQEvent::FocusIn))
@@ -228,7 +228,7 @@ bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev)
     }
     else if (ev->type() == TQEvent::IconChange)
     {
-        if (m_widgetTabs.contains(w))
+        if (m_widgetTabs.tqcontains(w))
         {
             DTabWidget *tab = m_widgetTabs[w];
             tab->setTabIconSet(w, w->icon() ? (*(w->icon())) : TQPixmap());
@@ -261,7 +261,7 @@ void DMainWindow::closeTab(TQWidget *)
 
 void DMainWindow::moveWidget(DDockWindow::Position position, TQWidget * view, const TQString & title)
 {
-    if (m_docks.contains(view))
+    if (m_docks.tqcontains(view))
     {
         toolWindow(m_docks[view])->removeWidget(view);
 
@@ -285,7 +285,7 @@ void DMainWindow::removeDockWidget(TQWidget *view)
 
 bool DMainWindow::hasDockWidget(TQWidget *view)
 {
-    return m_docks.contains(view);
+    return m_docks.tqcontains(view);
 }
 
 DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
@@ -295,9 +295,9 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
 
 void DMainWindow::widgetDestroyed()
 {
-    TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender()));
+    TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
 
-    if (m_docks.contains(w))
+    if (m_docks.tqcontains(w))
     {
         kdError() << "Widget destroyed before being removed from UI!" << endl;
         m_docks.remove(w);
@@ -306,4 +306,4 @@ void DMainWindow::widgetDestroyed()
 
 #include "dmainwindow.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h
index ae757678..dc7b1c42 100644
--- a/src/newui/dmainwindow.h
+++ b/src/newui/dmainwindow.h
@@ -33,8 +33,9 @@ namespace Ideal {
 /**Main window which provides simplified IDEA mode.*/
 class DMainWindow: public KParts::MainWindow {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DMainWindow(TQWidget *parent = 0, const char *name = 0);
+    DMainWindow(TQWidget *tqparent = 0, const char *name = 0);
     virtual ~DMainWindow();
 
     /**@return The tool window in given @p position.*/
@@ -106,7 +107,7 @@ protected:
     TQWidget *m_currentWidget;
 
 private slots:
-    void invalidateActiveTabWidget();
+    void tqinvalidateActiveTabWidget();
 
 };
 
diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp
index 0dc55453..c22f2723 100644
--- a/src/newui/docksplitter.cpp
+++ b/src/newui/docksplitter.cpp
@@ -23,16 +23,16 @@
 
 namespace Ideal {
 
-DockSplitter::DockSplitter(Orientation orientation, TQWidget *parent, const char *name)
-    :TQSplitter(parent, name), m_orientation(orientation)
+DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *tqparent, const char *name)
+    :TQSplitter(tqparent, name), m_orientation(orientation)
 {
     switch (m_orientation)
     {
-        case Horizontal:
-            setOrientation(Vertical);
+        case Qt::Horizontal:
+            setOrientation(Qt::Vertical);
             break;
-        case Vertical:
-            setOrientation(Horizontal);
+        case Qt::Vertical:
+            setOrientation(Qt::Horizontal);
             break;
     }
     setOpaqueResize(true);
@@ -73,11 +73,11 @@ void DockSplitter::appendSplitter()
 {
     switch (m_orientation)
     {
-        case Horizontal:
-            m_splitters.append(new TQSplitter(Horizontal, this));
+        case Qt::Horizontal:
+            m_splitters.append(new TQSplitter(Qt::Horizontal, this));
             break;
-        case Vertical:
-            m_splitters.append(new TQSplitter(Vertical, this));
+        case Qt::Vertical:
+            m_splitters.append(new TQSplitter(Qt::Vertical, this));
             break;
     }
     m_splitters[m_splitters.size()-1]->setOpaqueResize(true);
@@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
         w->hide();
     }
 
-    m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint());
+    m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint());
 
     if (isRowEmpty(row))
     {
@@ -161,13 +161,13 @@ int DockSplitter::numCols(int row) const
     return 0;
 }
 
-QPair<uint, uint> DockSplitter::indexOf(TQWidget *dock)
+TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock)
 {
     for (uint i = 0; i < m_docks.count(); ++i)
         for (uint j = 0; j < m_docks[i].count(); ++j)
             if (dock == m_docks[i][j])
-                return qMakePair(i, j);
-    return qMakePair(0u, 0u);
+                return tqMakePair(i, j);
+    return tqMakePair(0u, 0u);
 }
 
 }
diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h
index c25dd495..c5450b1a 100644
--- a/src/newui/docksplitter.h
+++ b/src/newui/docksplitter.h
@@ -32,14 +32,15 @@ class DockWidget;
 */
 class DockSplitter: public TQSplitter {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DockSplitter(Orientation orientation, TQWidget *parent = 0, const char *name = 0);
+    DockSplitter(Qt::Orientation orientation, TQWidget *tqparent = 0, const char *name = 0);
     ~DockSplitter();
     
     void addDock(uint row, uint col, TQWidget *dock);
     void removeDock(uint row, uint col, bool alsoDelete = false);
     
-    QPair<uint, uint> indexOf(TQWidget *dock);
+    TQPair<uint, uint> indexOf(TQWidget *dock);
     
     int numRows() const;
     int numCols(int row) const;
@@ -52,7 +53,7 @@ protected:
     bool isRowEmpty(int row);
     
 private:
-    Orientation m_orientation;
+    Qt::Orientation m_orientation;
     TQValueList<TQSplitter*> m_splitters;
     TQValueList<TQValueList<TQWidget*> > m_docks;
 };
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index db2e4c4e..7ee27915 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -26,10 +26,10 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 
-DTabWidget::DTabWidget(TQWidget *parent, const char *name)
-    :KTabWidget(parent, name), m_closeButton(0)
+DTabWidget::DTabWidget(TQWidget *tqparent, const char *name)
+    :KTabWidget(tqparent, name), m_closeButton(0)
 {
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setMargin(0);
 
     loadSettings();
@@ -85,7 +85,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
     KTabWidget::insertTab(child, label, index);
-    if (index != -1) tabBar()->repaint();
+    if (index != -1) tabBar()->tqrepaint();
 }
 
 void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, 
@@ -94,7 +94,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
     KTabWidget::insertTab(child, iconset, label, index);
-    if (index != -1) tabBar()->repaint();
+    if (index != -1) tabBar()->tqrepaint();
 }
 
 /*void DTabWidget::updateHistory(TQWidget *w)
diff --git a/src/newui/dtabwidget.h b/src/newui/dtabwidget.h
index beb0a466..fd480c73 100644
--- a/src/newui/dtabwidget.h
+++ b/src/newui/dtabwidget.h
@@ -26,8 +26,9 @@ class TQToolButton;
 
 class DTabWidget: public KTabWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DTabWidget(TQWidget *parent=0, const char *name=0);
+    DTabWidget(TQWidget *tqparent=0, const char *name=0);
     
     /**@return The close button at the top right corner. 
     May be 0 if the configuration do not allow close buttons or the tabbar.*/
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 379f79dc..a14417eb 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -89,8 +89,8 @@ struct ModificationData
 };
 
 
-PartController::PartController(TQWidget *parent)
-  : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false)
+PartController::PartController(TQWidget *tqparent)
+  : KDevPartController(tqparent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false)
 {
   connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) );
   connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) );
@@ -109,10 +109,10 @@ PartController::~PartController()
 }
 
 
-void PartController::createInstance(TQWidget *parent)
+void PartController::createInstance(TQWidget *tqparent)
 {
   if (!s_instance)
-    s_instance = new PartController(parent);
+    s_instance = new PartController(tqparent);
 }
 
 
@@ -131,7 +131,7 @@ void PartController::setupActions()
   newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") );
 
   m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" );
-  m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file.")));
+  m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_openRecentAction->text())).tqarg(i18n("Opens recently opened file.")));
   m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" );
 
   m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all");
@@ -146,7 +146,7 @@ void PartController::setupActions()
 
   m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close");
   m_closeWindowAction->setToolTip( i18n("Close current file") );
-  m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file.")));
+  m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_closeWindowAction->text())).tqarg(i18n("Closes current file.")));
   m_closeWindowAction->setEnabled(false);
 
   m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all");
@@ -210,7 +210,7 @@ KURL PartController::findURLInProject(const KURL& url)
 {
   TQStringList fileList = API::getInstance()->project()->allFiles();
 
-  bool filenameOnly = (url.url().find('/') == -1);
+  bool filenameOnly = (url.url().tqfind('/') == -1);
   TQString filename = filenameOnly ? "/" : "";
   filename += url.url();
 
@@ -267,7 +267,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 			{
 				ei->setEncoding( m_presetEncoding );
 			}
-			m_presetEncoding = TQString::null;
+			m_presetEncoding = TQString();
 		}
 
 		addHistoryEntry();
@@ -395,7 +395,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 		if ( dom != 0 )
 		{
 			// The global option specifies a fallback if the project
-			// has no setting or no project is open. However for Qt4
+			// has no setting or no project is open. However for TQt4
 			// projects we want to use ExternalDesigner in any case.
 			if ( DomUtil::readIntEntry( *dom, "/kdevcppsupport/qt/version", 3 ) == 4 )
 			{
@@ -434,7 +434,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 		if( designerPluginPaths.isEmpty() )
 			KRun::runCommand( designerExec+" "+url.pathOrURL() );
 		else
-			KRun::runCommand( "QT_PLUGIN_PATH=\""+designerPluginPaths.join(":")+"\" "+designerExec+" "+url.pathOrURL() );
+			KRun::runCommand( "TQT_PLUGIN_PATH=\""+designerPluginPaths.join(":")+"\" "+designerExec+" "+url.pathOrURL() );
 
 		return;
 	}
@@ -442,7 +442,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	config->setGroup("General");
 
 	TQStringList texttypeslist = config->readListEntry( "TextTypes" );
-	if ( texttypeslist.contains( MimeType->name() ) )
+	if ( texttypeslist.tqcontains( MimeType->name() ) )
 	{
 		m_openNextAsText = true;
 	}
@@ -461,7 +461,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
             if ( m_presetEncoding.isNull() && API::getInstance()->projectDom() )
             {
                 TQDomDocument * projectDom = API::getInstance()->projectDom();
-                m_presetEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString::null );
+                m_presetEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString() );
             }
 
             if ( !m_presetEncoding.isNull() )
@@ -470,7 +470,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
                 {
                     ei->setEncoding( m_presetEncoding );
                 }
-                m_presetEncoding = TQString::null;
+                m_presetEncoding = TQString();
             }
 
             addHistoryEntry();
@@ -534,8 +534,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	else
 	{
 		MimeWarningDialog dlg;
-		dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).arg(url.path()));
-		dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) );
+		dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).tqarg(url.path()));
+		dlg.text3->setText( dlg.text3->text().tqarg(MimeType->name()) );
 
 		if ( dlg.exec() == TQDialog::Accepted )
 		{
@@ -593,7 +593,7 @@ void PartController::showDocument(const KURL &url, bool newWin)
 
 KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName)
 {
-  KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").arg(partType));
+  KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").tqarg(partType));
 
   if (offers.count() > 0)
   {
@@ -694,7 +694,7 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
   // Document object and our HTMLDocumentationPart
 //  connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged()));
 
-  // Connect to the document's views newStatus() signal in order to keep track of the
+  // Connect to the document's views newtqStatus() signal in order to keep track of the
   // modified-status of the document.
 
   if (isTextEditor)
@@ -718,8 +718,8 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
       connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )),
           API::getInstance()->languageSupport(),
           TQT_SLOT(openSource(DesignerType, const TQString& )));
-      connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)),
-          this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int)));
+      connect(designerPart, TQT_SIGNAL(newtqStatus(const TQString &, int)),
+          this, TQT_SLOT(slotNewDesignertqStatus(const TQString &, int)));
   }
 }
 
@@ -787,7 +787,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc)
   TQPtrListIterator<KTextEditor::View> it( list );
   while ( it.current() )
   {
-    connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) );
+    connect( it, TQT_SIGNAL( newtqStatus() ), this, TQT_SLOT( slotNewtqStatus() ) );
     ++it;
   }
 }
@@ -830,7 +830,7 @@ void PartController::updatePartURL( KParts::ReadOnlyPart * ro_part )
 
 bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part )
 {
-	if ( _partURLMap.contains( ro_part ) && !ro_part->url().isEmpty() )
+	if ( _partURLMap.tqcontains( ro_part ) && !ro_part->url().isEmpty() )
 	{
 		if ( _partURLMap[ ro_part ] != ro_part->url() )
 		{
@@ -842,7 +842,7 @@ bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part )
 
 KURL PartController::storedURLForPart( KParts::ReadOnlyPart * ro_part )
 {
-	if ( _partURLMap.contains( ro_part ) )
+	if ( _partURLMap.tqcontains( ro_part ) )
 	{
 		return _partURLMap[ ro_part ];
 	}
@@ -1005,7 +1005,7 @@ void PartController::reloadFile( const KURL & url )
 		if ( part->isModified() )
 		{
 			if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(),
-				i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).arg( url.path() ),
+				i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).tqarg( url.path() ),
 				i18n( "File is Modified" ), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::Yes )
 			{
 				part->setModified( false );
@@ -1120,7 +1120,7 @@ bool PartController::saveFile( const KURL & url, bool force )
 		case DirtyAndModified:
 			{
 				int code = KMessageBox::warningYesNoCancel( TopLevel::getInstance()->main(),
-					i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").arg( url.path() ),
+					i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").tqarg( url.path() ),
 					i18n("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") );
 				if ( code == KMessageBox::Yes )
 				{
@@ -1216,7 +1216,7 @@ bool PartController::closeFilesDialog( KURL::List const & ignoreList )
 	while ( KParts::Part* part = it.current() )
 	{
 		KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart*>( part );
-		if ( ro_part && !ignoreList.contains( ro_part->url() ) || !ro_part )
+		if ( ro_part && !ignoreList.tqcontains( ro_part->url() ) || !ro_part )
 		{
 			closePart( part );
 		}
@@ -1276,7 +1276,7 @@ void PartController::slotOpenFile()
 	TQString DefaultEncoding;
 	if ( TQDomDocument * projectDom = API::getInstance()->projectDom() )
 	{
-		DefaultEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString::null );
+		DefaultEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString() );
 	}
 
 	if ( DefaultEncoding.isEmpty() )
@@ -1284,11 +1284,11 @@ void PartController::slotOpenFile()
 		// have a peek at katepart's settings:
 		KConfig * config = kapp->config();
 		config->setGroup("Kate Document Defaults");
-		DefaultEncoding = config->readEntry("Encoding", TQString::null );
+		DefaultEncoding = config->readEntry("Encoding", TQString() );
 	}
 
-	KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenURLsAndEncoding( DefaultEncoding, TQString::null,
-		TQString::null, TopLevel::getInstance()->main(), TQString::null );
+	KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenURLsAndEncoding( DefaultEncoding, TQString(),
+		TQString(), TopLevel::getInstance()->main(), TQString() );
 
 	for ( KURL::List::Iterator it = result.URLs.begin(); it != result.URLs.end(); ++it )
 	{
@@ -1426,7 +1426,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload )
 
 	if ( reason > 0 )
 	{
-		if ( !_dirtyDocuments.contains( doc ) )
+		if ( !_dirtyDocuments.tqcontains( doc ) )
 		{
 			_dirtyDocuments.append( doc );
 		}
@@ -1455,7 +1455,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload )
 
 bool PartController::isDirty( KURL const & url )
 {
-	return _dirtyDocuments.contains( static_cast<KTextEditor::Document*>( partForURL( url ) ) );
+	return _dirtyDocuments.tqcontains( static_cast<KTextEditor::Document*>( partForURL( url ) ) );
 }
 
 bool PartController::reactToDirty( KURL const & url, unsigned char reason )
@@ -1481,7 +1481,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	{
 		KMessageBox::sorry( TopLevel::getInstance()->main(),
 			i18n("Conflict: The file \"%1\" has changed on disk while being modified in memory.\n\n"
-					"You should investigate before saving to make sure you are not losing data.").arg( url.path() ),
+					"You should investigate before saving to make sure you are not losing data.").tqarg( url.path() ),
 			i18n("Conflict") );
 		return false;
 	}
@@ -1490,7 +1490,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	{
 		KMessageBox::sorry( TopLevel::getInstance()->main(),
 			i18n("Warning: The file \"%1\" has been deleted on disk.\n\n"
-					"If this was not your intention, make sure to save this file now.").arg( url.path() ),
+					"If this was not your intention, make sure to save this file now.").tqarg( url.path() ),
 			i18n("File Deleted") );
 		return false;
 	}
@@ -1498,7 +1498,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	if ( dirtyAction == "alert" )
 	{
 		if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(),
-	   		i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").arg( url.path() ),
+	   		i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").tqarg( url.path() ),
 			i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No )
 		{
 			return false;
@@ -1511,18 +1511,18 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	return true;
 }
 
-void PartController::slotNewDesignerStatus(const TQString &formName, int status)
+void PartController::slotNewDesignertqStatus(const TQString &formName, int status)
 {
 	kdDebug(9000) << k_funcinfo << endl;
 	kdDebug(9000) << " formName: " << formName << ", status: " << status << endl;
 	emit documentChangedState( KURL::fromPathOrURL(formName), DocumentState(status) );
 }
 
-void PartController::slotNewStatus( )
+void PartController::slotNewtqStatus( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
-	TQObject * senderobj = const_cast<TQObject*>( sender() );
+	TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
 	KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( senderobj );
 	if ( view )
 	{
@@ -1628,7 +1628,7 @@ void PartController::slotBackAboutToShow()
 	TQValueList<HistoryEntry>::ConstIterator it = m_backHistory.begin();
 	while( i < 10 && it != m_backHistory.end() )
 	{
-		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
+		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id );
 		++i;
 		++it;
 	}
@@ -1645,7 +1645,7 @@ void PartController::slotForwardAboutToShow( )
 	TQValueList<HistoryEntry>::ConstIterator it = m_forwardHistory.begin();
 	while( i < 10 && it != m_forwardHistory.end() )
 	{
-		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
+		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id );
 		++i;
 		++it;
 	}
@@ -1789,7 +1789,7 @@ KParts::ReadOnlyPart *PartController::qtDesignerPart()
 	for ( ; it.current(); ++it)
 	{
 		KInterfaceDesigner::Designer *des =  dynamic_cast<KInterfaceDesigner::Designer*>(it.current());
-		if (des && des->designerType() == KInterfaceDesigner::QtDesigner)
+		if (des && des->designerType() == KInterfaceDesigner::TQtDesigner)
 			return des;
 	}
 	return 0;
@@ -1812,7 +1812,7 @@ KTextEditor::Editor *PartController::openTextDocument( bool activate )
                 args.serviceType = TQString( "text/plain;" ) + m_presetEncoding;
                 extension->setURLArgs(args);
             }
-            m_presetEncoding = TQString::null;
+            m_presetEncoding = TQString();
         }
 
         TQWidget * widget =
@@ -1848,7 +1848,7 @@ void PartController::gotoLastEditPos()
 
 void PartController::slotDocumentUrlChanged()
 {
-    TQObject *obj = const_cast<TQObject*>(sender());
+    TQObject *obj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
     KTextEditor::Document *doc = dynamic_cast<KTextEditor::Document*>( obj );
     if (!doc)
         return;
diff --git a/src/partcontroller.h b/src/partcontroller.h
index 1c6a764d..dbb6a632 100644
--- a/src/partcontroller.h
+++ b/src/partcontroller.h
@@ -43,11 +43,12 @@ Part controler implementation.
 class PartController : public KDevPartController
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
   PartController(TQWidget *toplevel);
-  static void createInstance(TQWidget *parent);
+  static void createInstance(TQWidget *tqparent);
   static PartController *getInstance();
 
   ///// KDevPartController interface
@@ -97,7 +98,7 @@ public:
   KTextEditor::Editor *openTextDocument( bool activate = true );
   KParts::Factory *findPartFactory(const TQString &mimeType,
                                    const TQString &partType,
-                                   const TQString &preferredName = TQString::null );
+                                   const TQString &preferredName = TQString() );
 
 public slots:
 
@@ -140,8 +141,8 @@ private slots:
 
   void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason );
   void slotDocumentDirtyStepTwo( void * );
-  void slotNewStatus();
-  void slotNewDesignerStatus(const TQString &formName, int status);
+  void slotNewtqStatus();
+  void slotNewDesignertqStatus(const TQString &formName, int status);
   void textChanged();
   void gotoLastEditPos();
 
@@ -216,7 +217,7 @@ private:
 	struct LastEditPos
 	{
 		KURL url;
-		QPair<unsigned int,unsigned int> pos;
+		TQPair<unsigned int,unsigned int> pos;
 
 		LastEditPos() : pos( -1, -1) {}
 	};
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 7b7ffac1..85d0b068 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -49,7 +49,7 @@ namespace
   template <class ComponentType>
   ComponentType *loadDefaultPart( const TQString &serviceType )
   {
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION));
     KTrader::OfferList::ConstIterator serviceIt = offers.begin();
     for ( ; serviceIt != offers.end(); ++serviceIt ) {
       KService::Ptr service = *serviceIt;
@@ -79,10 +79,10 @@ PluginController *PluginController::getInstance()
 PluginController::PluginController()
   : KDevPluginController()
 {
-/*  m_defaultProfile = TQString::fromLatin1( "FullIDE" );
+/*  m_defaultProfile = TQString::tqfromLatin1( "FullIDE" );
   m_defaultProfilePath = kapp->dirs()->localkdedir() + "/" +
 			 KStandardDirs::kde_default( "data" ) +
-			 TQString::fromLatin1("/kdevelop/profiles/FullIDE");*/
+			 TQString::tqfromLatin1("/kdevelop/profiles/FullIDE");*/
 
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if( args->isSet("profile") ){
@@ -144,10 +144,10 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis
     TQString name = (*it)->desktopEntryName();
 
     // Check if it is already loaded or shouldn't be
-    if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) )
+    if( m_parts[ name ] != 0 || ignorePlugins.tqcontains( name ) )
       continue;
 
-    emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName()));
+    emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName()));
 
     KDevPlugin *plugin = loadPlugin( *it );
     if ( plugin )
@@ -218,7 +218,7 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
             0,
             i18n("<b>Could not load plugin</b><br>"
                  "Plugin %1 could not be loaded<br>"
-                 "Library loader error: %2").arg(service->name()).
+                 "Library loader error: %2").tqarg(service->name()).
             arg(KLibLoader::self()->lastErrorMessage()),
             i18n("Could not load plugin"));
     }
diff --git a/src/plugincontroller.h b/src/plugincontroller.h
index 7eae5bda..79d77511 100644
--- a/src/plugincontroller.h
+++ b/src/plugincontroller.h
@@ -23,6 +23,7 @@ Loads and unloads plugins.
 class PluginController : public KDevPluginController
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp
index 0863791c..18eef37d 100644
--- a/src/pluginselectdialog.cpp
+++ b/src/pluginselectdialog.cpp
@@ -23,13 +23,13 @@
 #include "plugincontroller.h"
 #include "pluginselectdialog.h"
 
-class PluginItem : public QCheckListItem
+class PluginItem : public TQCheckListItem
 {
 public:
 	// name - "Name", label - "GenericName", info - "Comment"
-	PluginItem( TQListView * parent, TQString const & name, TQString const & label,
-				TQString const & info, TQString const url = TQString::null )
-		: TQCheckListItem( parent, label, TQCheckListItem::CheckBox),
+	PluginItem( TQListView * tqparent, TQString const & name, TQString const & label,
+				TQString const & info, TQString const url = TQString() )
+		: TQCheckListItem( tqparent, label, TQCheckListItem::CheckBox),
 		_name( name ), _info( info ), _url( url )
 	{}
 
@@ -44,8 +44,8 @@ private:
 };
 
 
-PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool modal, WFlags fl )
-	: PluginSelectDialogBase( parent,name, modal,fl )
+PluginSelectDialog::PluginSelectDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+	: PluginSelectDialogBase( tqparent,name, modal,fl )
 {
 	plugin_list->setResizeMode( TQListView::LastColumn );
 	plugin_list->addColumn("");
@@ -137,7 +137,7 @@ void PluginSelectDialog::init( )
 		TQString Comment = (*it)->comment();
 		TQRegExp re("\\bhttp://[\\S]*");
 		re.search( Comment );
-		Comment.replace( re, "" );
+		Comment.tqreplace( re, "" );
 
 		TQString url;
 		if ( re.pos() > -1 )
@@ -146,9 +146,9 @@ void PluginSelectDialog::init( )
 		}
 
 		PluginItem *item = new PluginItem( plugin_list, (*it)->desktopEntryName(), (*it)->genericName(), Comment, url );
-		item->setOn( loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) );
+		item->setOn( loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) );
 
-		kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl;
+		kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl;
 	}
 
 	TQListViewItem * first = plugin_list->firstChild();
diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h
index e0289eb6..47316ef5 100644
--- a/src/pluginselectdialog.h
+++ b/src/pluginselectdialog.h
@@ -20,9 +20,10 @@ class PluginController;
 class PluginSelectDialog : public PluginSelectDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	PluginSelectDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~PluginSelectDialog();
 
 	TQStringList unselectedPluginNames();
diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui
index e976899a..acad67b1 100644
--- a/src/pluginselectdialogbase.ui
+++ b/src/pluginselectdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>PluginSelectDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PluginSelectDialogBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,20 +30,20 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <property name="name">
                         <cstring>plugin_list</cstring>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -51,7 +51,7 @@
                                 <string>Make this the default for this profile:</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>saveAsDefault_button</cstring>
                             </property>
@@ -66,7 +66,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -77,11 +77,11 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>plugin_description_label</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>40</height>
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -104,9 +104,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -122,14 +122,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>191</width>
                             <height>21</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ok_button</cstring>
                     </property>
@@ -137,7 +137,7 @@
                         <string>O&amp;K</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancel_button</cstring>
                     </property>
@@ -169,10 +169,10 @@
         <slot>saveAsDefault()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">saveAsDefault()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurllabel.h</includehint>
 </includehints>
diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui
index 56a46f1d..dccb234e 100644
--- a/src/profileengine/editor/addprofilewidget.ui
+++ b/src/profileengine/editor/addprofilewidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>AddProfileWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AddProfileWidget</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -33,7 +33,7 @@
                 <property name="spacing">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -51,9 +51,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -65,7 +65,7 @@
                 <property name="spacing">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -83,9 +83,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -97,7 +97,7 @@
                 <property name="spacing">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -108,7 +108,7 @@
                         <cstring>descriptionEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>descriptionEdit</cstring>
                     </property>
@@ -117,5 +117,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index 903403de..0e3fb5d4 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -40,15 +40,15 @@
 
 class ProfileItem: public KListViewItem {
 public:
-    ProfileItem(KListView *parent, Profile *profile)
-        :KListViewItem(parent), m_profile(profile)
+    ProfileItem(KListView *tqparent, Profile *profile)
+        :KListViewItem(tqparent), m_profile(profile)
     {
         setText(0, profile->genericName());
         setText(1, profile->description());
     }
     
-    ProfileItem(KListViewItem *parent, Profile *profile)
-        : KListViewItem(parent), m_profile(profile)
+    ProfileItem(KListViewItem *tqparent, Profile *profile)
+        : KListViewItem(tqparent), m_profile(profile)
     {
         setText(0, profile->genericName());
         setText(1, profile->description());
@@ -62,19 +62,19 @@ private:
 
 class EDListItem: public KListViewItem{
 public:
-    EDListItem(KListView *parent, const TQString &text, bool derived)
-        : KListViewItem(parent, text), m_derived(derived)
+    EDListItem(KListView *tqparent, const TQString &text, bool derived)
+        : KListViewItem(tqparent, text), m_derived(derived)
     {
     }
     
     bool isDerived() const { return m_derived; }
 
-    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
     {
         TQColorGroup cgNew = cg;
         if (m_derived)
             cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor());
-        KListViewItem::paintCell(p, cgNew, column, width, alignment);
+        KListViewItem::paintCell(p, cgNew, column, width, tqalignment);
     }
     
 private:
@@ -84,16 +84,16 @@ private:
 
 class ProfileListBuilding {
 public:
-    ProfileItem * operator() (ProfileItem *parent, Profile *profile)
+    ProfileItem * operator() (ProfileItem *tqparent, Profile *profile)
     {
-        parent->setOpen(true);
-        return new ProfileItem(parent, profile);
+        tqparent->setOpen(true);
+        return new ProfileItem(tqparent, profile);
     }
 };
 
 
-ProfileEditor::ProfileEditor(TQWidget *parent, const char *name)
-    :ProfileEditorBase(parent, name)
+ProfileEditor::ProfileEditor(TQWidget *tqparent, const char *name)
+    :ProfileEditorBase(tqparent, name)
 {
     refresh();
 }
@@ -115,14 +115,14 @@ void ProfileEditor::refresh()
 
 void ProfileEditor::refreshPropertyCombo()
 {
-    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"));
+    KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"));
     TQStringList props;
     for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
     {
         TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList();
         for (TQStringList::const_iterator p = currProps.constBegin(); 
                 p != currProps.constEnd(); ++p)
-            if (!props.contains(*p))
+            if (!props.tqcontains(*p))
                 props.append(*p);
     }
     props.sort();
@@ -258,7 +258,7 @@ void ProfileEditor::removeProfile()
         if (profile->remove())
         {
             TQListViewItem *item = profilesList->currentItem();
-            profilesList->setCurrentItem(item->parent());
+            profilesList->setCurrentItem(item->tqparent());
             profile->detachFromParent();
             delete profile;
             delete item;
@@ -271,8 +271,8 @@ void ProfileEditor::removeProfile()
 void ProfileEditor::addProperty()
 {
     if ( (!propertyCombo->currentText().isEmpty()) &&
-        (ownPropertiesBox->findItem(propertyCombo->currentText()) == 0) &&
-        (derivedPropertiesBox->findItem(propertyCombo->currentText()) == 0) )
+        (ownPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) &&
+        (derivedPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) )
     {
         ownPropertiesBox->insertItem(propertyCombo->currentText());
         
@@ -322,9 +322,9 @@ void ProfileEditor::addEnabled()
         text = allList->currentItem()->text(0);
     }
     
-    if (enabledList->findItem(text, 0) != 0)
+    if (enabledList->tqfindItem(text, 0) != 0)
         return;
-    if (disabledList->findItem(text, 0) != 0)
+    if (disabledList->tqfindItem(text, 0) != 0)
     {
         KMessageBox::error(this, i18n("This plugin is already contained in the list of disabled plugins."),
             i18n("Enable Plugin"));
@@ -368,9 +368,9 @@ void ProfileEditor::addDisabled()
         text = allList->currentItem()->text(0);
     }
     
-    if (disabledList->findItem(text, 0) != 0)
+    if (disabledList->tqfindItem(text, 0) != 0)
         return;
-    if (enabledList->findItem(text, 0) != 0)
+    if (enabledList->tqfindItem(text, 0) != 0)
     {
         KMessageBox::error(this, i18n("This plugin is already contained in the list of enabled plugins."),
             i18n("Disable Plugin"));
diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h
index 182195f4..aae785b1 100644
--- a/src/profileengine/editor/profileeditor.h
+++ b/src/profileengine/editor/profileeditor.h
@@ -29,8 +29,9 @@ class KListViewItem;
 
 class ProfileEditor : public ProfileEditorBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProfileEditor(TQWidget *parent = 0, const char *name = 0);
+    ProfileEditor(TQWidget *tqparent = 0, const char *name = 0);
     
 public slots:
     virtual void removeProperty();
diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui
index e91fd13d..094eeffd 100644
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ProfileEditorBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProfileEditorBase</cstring>
     </property>
@@ -19,18 +19,18 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QSplitter" row="0" column="0">
+        <widget class="TQSplitter" row="0" column="0">
             <property name="name">
                 <cstring>splitter2</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
-            <widget class="QWidgetStack">
+            <widget class="TQWidgetStack">
                 <property name="name">
                     <cstring>widgetStack1</cstring>
                 </property>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>WStackPage</cstring>
                     </property>
@@ -47,9 +47,9 @@
                         <property name="spacing">
                             <number>0</number>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -73,7 +73,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>142</height>
@@ -137,11 +137,11 @@
                     </vbox>
                 </widget>
             </widget>
-            <widget class="QTabWidget">
+            <widget class="TQTabWidget">
                 <property name="name">
                     <cstring>tabWidget2</cstring>
                 </property>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -190,9 +190,9 @@
                                 <string>Remove</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
+                        <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -204,7 +204,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -219,9 +219,9 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
+                        <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
                             <property name="name">
-                                <cstring>layout8</cstring>
+                                <cstring>tqlayout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -233,7 +233,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1_2</cstring>
                                     </property>
@@ -250,7 +250,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -261,9 +261,9 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="2" rowspan="4" colspan="1">
+                        <widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -275,7 +275,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel2</cstring>
                                     </property>
@@ -301,9 +301,9 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="4" column="2" rowspan="4" colspan="1">
+                        <widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -315,7 +315,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel2_2</cstring>
                                     </property>
@@ -359,7 +359,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -376,7 +376,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -401,16 +401,16 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget" row="0" column="0" rowspan="8" colspan="1">
+                        <widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1">
                             <property name="name">
-                                <cstring>layout10</cstring>
+                                <cstring>tqlayout10</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -422,7 +422,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel2_3</cstring>
                                     </property>
@@ -474,7 +474,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -499,7 +499,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>TabPage</cstring>
                     </property>
@@ -560,15 +560,15 @@
 <connections>
     <connection>
         <sender>profilesList</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>ProfileEditorBase</receiver>
-        <slot>profileExecuted(QListViewItem*)</slot>
+        <slot>profileExecuted(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>ownPropertiesBox</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>ProfileEditorBase</receiver>
-        <slot>propertyExecuted(QListBoxItem*)</slot>
+        <slot>propertyExecuted(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>addProfileButton</sender>
@@ -596,15 +596,15 @@
     </connection>
     <connection>
         <sender>profilesList</sender>
-        <signal>executed(QListViewItem*)</signal>
+        <signal>executed(TQListViewItem*)</signal>
         <receiver>ProfileEditorBase</receiver>
-        <slot>profileExecuted(QListViewItem*)</slot>
+        <slot>profileExecuted(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>profilesList</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>ProfileEditorBase</receiver>
-        <slot>profileExecuted(QListViewItem*)</slot>
+        <slot>profileExecuted(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>addEnabledButton</sender>
@@ -645,9 +645,9 @@
     <tabstop>disabledList</tabstop>
     <tabstop>pluginsView</tabstop>
 </tabstops>
-<slots>
-    <slot>profileExecuted(QListViewItem *item)</slot>
-    <slot>propertyExecuted(QListBoxItem *item)</slot>
+<Q_SLOTS>
+    <slot>profileExecuted(TQListViewItem *item)</slot>
+    <slot>propertyExecuted(TQListBoxItem *item)</slot>
     <slot>addProfile()</slot>
     <slot>removeProfile()</slot>
     <slot>addProperty()</slot>
@@ -656,8 +656,8 @@
     <slot>delEnabled()</slot>
     <slot>addDisabled()</slot>
     <slot>delDisabled()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp
index f07c6376..39d247bf 100644
--- a/src/profileengine/lib/profile.cpp
+++ b/src/profileengine/lib/profile.cpp
@@ -26,8 +26,8 @@
 #include <kconfig.h>
 #include <kio/netaccess.h>
 
-Profile::Profile(Profile *parent, const TQString &name)
-    :m_parent(parent), m_name(name)
+Profile::Profile(Profile *tqparent, const TQString &name)
+    :m_parent(tqparent), m_name(name)
 {
     if (m_parent)
         m_parent->addChildProfile(this);
@@ -49,8 +49,8 @@ Profile::Profile(Profile *parent, const TQString &name)
     m_explicitDisable = config.readListEntry("List");
 }
 
-Profile::Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description)
-    :m_parent(parent), m_name(name), m_genericName(genericName), m_description(description)
+Profile::Profile(Profile *tqparent, const TQString &name, const TQString &genericName, const TQString &description)
+    :m_parent(tqparent), m_name(name), m_genericName(genericName), m_description(description)
 {
     if (m_parent)
         m_parent->addChildProfile(this);
@@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN
 
 Profile::~Profile()
 {
-    for (TQValueList<Profile*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
+    for (TQValueList<Profile*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
         delete *it;
 }
 
 void Profile::addChildProfile(Profile *profile)
 {
-    m_children.append(profile);
+    m_tqchildren.append(profile);
 }
 
 void Profile::removeChildProfile(Profile *profile)
 {
-    m_children.remove(profile);
+    m_tqchildren.remove(profile);
 }
 
 TQString Profile::dirName() const
@@ -104,10 +104,10 @@ void Profile::save()
 
 Profile::EntryList Profile::list(List type)
 {
-    EntryList parentList;
+    EntryList tqparentList;
     if (m_parent)
-        parentList = m_parent->list(type);
-    EntryList list = parentList;
+        tqparentList = m_parent->list(type);
+    EntryList list = tqparentList;
     for (EntryList::iterator it = list.begin(); it != list.end(); ++it)
         (*it).derived = true;
     TQStringList &personalList = listByType(type);
@@ -119,7 +119,7 @@ Profile::EntryList Profile::list(List type)
 void Profile::addEntry(List type, const TQString &value)
 {
     TQStringList &list = listByType(type);
-    if (!list.contains(value))
+    if (!list.tqcontains(value))
         list.append(value);
 }
 
@@ -187,10 +187,10 @@ KURL::List Profile::resources(const TQString &nameFilter)
         dir = dir + "kdevelop/profiles" + dirName();
 
         TQDir d(dir);
-        const QFileInfoList *infoList = d.entryInfoList(nameFilter, TQDir::Files);
+        const TQFileInfoList *infoList = d.entryInfoList(nameFilter, TQDir::Files);
         if (!infoList)
             continue;
-        for (QFileInfoList::const_iterator infoIt = infoList->constBegin();
+        for (TQFileInfoList::const_iterator infoIt = infoList->constBegin();
              infoIt != infoList->constEnd(); ++ infoIt)
             resources.append((*infoIt)->absFilePath());
     }
diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h
index c81db7e3..30e00517 100644
--- a/src/profileengine/lib/profile.h
+++ b/src/profileengine/lib/profile.h
@@ -45,12 +45,12 @@ public:
         ExplicitDisable   /**<A list of explicitly disabled plugins (names).*/
     };
 
-    Profile(Profile *parent, const TQString &name);
-    Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description);
+    Profile(Profile *tqparent, const TQString &name);
+    Profile(Profile *tqparent, const TQString &name, const TQString &genericName, const TQString &description);
     ~Profile();
 
-    TQValueList<Profile*> children() const { return m_children; }
-    Profile *parent() const { return m_parent; }
+    TQValueList<Profile*> tqchildren() const { return m_tqchildren; }
+    Profile *tqparent() const { return m_parent; }
 
     void save();
     bool remove();
@@ -81,7 +81,7 @@ protected:
 
 private:
     Profile *m_parent;
-    TQValueList<Profile*> m_children;
+    TQValueList<Profile*> m_tqchildren;
 
     TQString m_name;
 
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index af8f2afe..7a6d65d8 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -57,7 +57,7 @@ void ProfileEngine::processDir(const TQString &dir, const TQString &currPath, TQ
         {
             TQString dirName = *eit;
             Profile *profile = 0;
-            if (passedPaths.contains(currPath + dirName))
+            if (passedPaths.tqcontains(currPath + dirName))
                 profile = passedPaths[currPath + dirName];
             else
             {
@@ -78,24 +78,24 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     if (!profile)
         return KTrader::OfferList();
 
-    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'");
             break;
     }
     TQString constraint_add = "";
     Profile::EntryList properties = profile->list(Profile::Properties);
     int i = 0;
     for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it)
-        constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
-            arg((i++)==0?"":"or").arg((*it).name);
+        constraint_add += TQString::tqfromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
+            tqarg((i++)==0?"":"or").tqarg((*it).name);
     if (!constraint_add.isEmpty())
         constraint += " and ( " + constraint_add + " ) ";
 
@@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
         << "        " << constraint << endl << endl << endl;*/
 //END debug
 
-    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+    KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
     TQStringList names;
 
 /* Wrong, this is not what we want to do.
@@ -127,11 +127,11 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     Profile::EntryList enableList = profile->list(Profile::ExplicitEnable);
     for (Profile::EntryList::const_iterator it = enableList.begin(); it != enableList.end(); ++it)
     {
-        if (names.contains((*it).name))
+        if (names.tqcontains((*it).name))
             continue;
-        TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
-        constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name);
-        KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+        TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+        constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name);
+        KTrader::OfferList enable = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
         list += enable;
     }
 
@@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
 
 KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
 {
-    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'");
             break;
     }
-    return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+    return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
 }
 
 void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile,
@@ -229,7 +229,7 @@ void ProfileEngine::diffProfiles(OfferType offerType, const TQString &profile1,
         it != offers1List.constEnd(); ++it)
     {
 //         kdDebug() << "checking: " << *it << endl;
-        if (offers2List.contains(*it))
+        if (offers2List.tqcontains(*it))
         {
 //             kdDebug() << "    keep" << endl;
             offers2.remove(offers2List[*it]);
diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h
index e790dece..9184df62 100644
--- a/src/profileengine/lib/profileengine.h
+++ b/src/profileengine/lib/profileengine.h
@@ -177,8 +177,8 @@ public:
     template<class Operation>
     void walkProfiles(Operation &op, Profile *root)
     {
-        TQValueList<Profile*> children = root->children();
-        for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it)
+        TQValueList<Profile*> tqchildren = root->tqchildren();
+        for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
         {
             op(*it);
             walkProfiles<Operation>(op, *it);
@@ -189,7 +189,7 @@ public:
     but the operation in this case returns a result of type defined by
     "Result" template parameter.
     
-    When iterating the tree, the result of operation applied to the parent profile 
+    When iterating the tree, the result of operation applied to the tqparent profile 
     is passed as @p result parameter to the recursive call for child profiles.
     
     For example, this function can be used to build another hierarcy of profiles
@@ -199,24 +199,24 @@ public:
     @code
     class ProfileListBuilding {
     public:
-        ProfileItem * operator() (ProfileItem *parent, Profile *profile)
+        ProfileItem * operator() (ProfileItem *tqparent, Profile *profile)
         {
-            parent->setOpen(true);
-            return new ProfileItem(parent, profile);
+            tqparent->setOpen(true);
+            return new ProfileItem(tqparent, profile);
         }
     };
     
     class ProfileItem: public KListViewItem {
     public:
-        ProfileItem(KListView *parent, Profile *profile)
-            :KListViewItem(parent), m_profile(profile)
+        ProfileItem(KListView *tqparent, Profile *profile)
+            :KListViewItem(tqparent), m_profile(profile)
         {
             setText(0, profile->genericName());
             setText(1, profile->description());
         }
         
-        ProfileItem(KListViewItem *parent, Profile *profile)
-            : KListViewItem(parent), m_profile(profile)
+        ProfileItem(KListViewItem *tqparent, Profile *profile)
+            : KListViewItem(tqparent), m_profile(profile)
         {
             setText(0, profile->genericName());
             setText(1, profile->description());
@@ -244,8 +244,8 @@ public:
     template<class Operation, class Result>
     void walkProfiles(Operation &op, Result *result, Profile *root)
     {
-        TQValueList<Profile*> children = root->children();
-        for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it)
+        TQValueList<Profile*> tqchildren = root->tqchildren();
+        for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
         {
             Result *newResult = op(result, *it);
             walkProfiles<Operation>(op, newResult, *it);
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 63dc88fa..42e5337d 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -221,7 +221,7 @@ bool ProjectManager::loadProject(const KURL &projectURL)
   if( projectLoaded() && url.path() == projectFile().path() )
   {
     if (KMessageBox::questionYesNo(TopLevel::getInstance()->main(),
-        i18n("Are you sure you want to reopen the current project?"), TQString::null, i18n("Reopen"), i18n("Do Not Reopen")) == KMessageBox::No)
+        i18n("Are you sure you want to reopen the current project?"), TQString(), i18n("Reopen"), i18n("Do Not Reopen")) == KMessageBox::No)
       return false;
   }
 
@@ -355,7 +355,7 @@ bool ProjectManager::loadProjectFile()
   TQString path;
   if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
-        i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
+        i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL()));
     return false;
   }
 
@@ -363,7 +363,7 @@ bool ProjectManager::loadProjectFile()
   if (!fin.open(IO_ReadOnly))
   {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
-        i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
+        i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL()));
     return false;
   }
 
@@ -374,7 +374,7 @@ bool ProjectManager::loadProjectFile()
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("This is not a valid project file.\n"
              "XML error in line %1, column %2:\n%3")
-             .arg(errorLine).arg(errorCol).arg(errorMsg));
+             .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
     fin.close();
     KIO::NetAccess::removeTempFile(path);
     return false;
@@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile()
     API::getInstance()->projectDom()->save(stream, 2);
     fout.close();
   } else {
-    KTempFile fout(TQString::fromLatin1("kdevelop3"));
+    KTempFile fout(TQString::tqfromLatin1("kdevelop3"));
     fout.setAutoDelete(true);
     if (fout.status() != 0) {
       KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file."));
@@ -486,7 +486,7 @@ bool ProjectManager::loadProjectPart()
   if (!projectService) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("No project management plugin %1 found.")
-            .arg(m_info->m_projectPlugin));
+            .tqarg(m_info->m_projectPlugin));
     return false;
   }
 
@@ -496,7 +496,7 @@ bool ProjectManager::loadProjectPart()
   if ( !projectPart ) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("Could not create project management plugin %1.")
-            .arg(m_info->m_projectPlugin));
+            .tqarg(m_info->m_projectPlugin));
     return false;
   }
 
@@ -536,13 +536,13 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
   }
 
   KTrader::OfferList languageSupportOffers =
-    KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
-                           TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
+                           TQString::tqfromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION));
 
   if (languageSupportOffers.isEmpty()) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("No language plugin for %1 found.")
-            .arg(lang));
+            .tqarg(lang));
     return false;
   }
 
@@ -556,7 +556,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
   if ( !langSupport ) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("Could not create language plugin for %1.")
-            .arg(lang));
+            .tqarg(lang));
     return false;
   }
 
@@ -648,7 +648,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
 //     for (TQStringList::const_iterator it = profileKeywords.constBegin();
 //         it != profileKeywords.constEnd(); ++it)
 //     {
-//         if (keywords.contains(*it))
+//         if (keywords.tqcontains(*it))
 //         {
 //             idx = profileKeywords.findIndex(*it);
 //             break;
diff --git a/src/projectmanager.h b/src/projectmanager.h
index 15ac4644..ed71b48c 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -40,6 +40,7 @@ Loads and unloads projects.
 class ProjectManager : public TQObject, public KXMLGUIClient
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index 1b09ca71..ae54bbfa 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -79,7 +79,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
     if (!ok) {
       KMessageBox::sorry(0L,
                          i18n("The file %1 does not contain valid XML.\n"
-                         "The loading of the session failed.").arg(sessionFileName));
+                         "The loading of the session failed.").tqarg(sessionFileName));
       initXMLTree(); // because it was now broken after failed setContent()
       return false;
     }
@@ -91,8 +91,8 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
   // Check for proper document type.
   if (domdoc.doctype().name() != "KDevPrjSession") {
     KMessageBox::sorry(0L,
-    i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").arg(sessionFileName)
-    + i18n("The document type seems to be: '%1'.").arg(domdoc.doctype().name()));
+    i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").tqarg(sessionFileName)
+    + i18n("The document type seems to be: '%1'.").tqarg(domdoc.doctype().name()));
     return false;
   }
 
@@ -112,7 +112,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
 		TQString pluginName = pPlugin->instance()->instanceName();
 		TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement();
 		if (!pluginEl.isNull()) {
-			// now plugin, load what you find!
+			// now plugin, load what you tqfind!
 			pPlugin->restorePartialProjectSession(&pluginEl);
 		}
 		++it;
@@ -128,7 +128,7 @@ void ProjectSession::recreateDocs(TQDomElement& el)
 {
 ////  TQDomElement mainframeEl = el.namedItem("Mainframe").toElement();
 ////  bool bMaxMode =initXMLTree() (bool) mainframeEl.attribute("MaximizeMode", "0").toInt();
-////  QextMdiMainFrm* pMainWidget = (QextMdiMainFrm*) qApp->mainWidget();
+////  QextMdiMainFrm* pMainWidget = (QextMdiMainFrm*) tqApp->mainWidget();
 ////  pMainWidget->setEnableMaximizedChildFrmMode(bMaxMode);
 ////  bool bTaskBarWasOn = pMainWidget->isViewTaskBarOn();
 ////  pMainWidget->hideViewTaskBar();
@@ -221,8 +221,8 @@ void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate)
   }
 ////  // restore focus
 ////  if (pFocusedView != 0L) {
-////    if (pFocusedView->parentWidget()->inherits("QextMdiChildView")) {
-////        ((QextMdiChildView*)pFocusedView->parentWidget())->activate();
+////    if (pFocusedView->tqparentWidget()->inherits("QextMdiChildView")) {
+////        ((QextMdiChildView*)pFocusedView->tqparentWidget())->activate();
 ////    }
 ////    pFocusedView->setFocus();
 ////  }
@@ -244,7 +244,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue
 ////    mainframeEl=domdoc.createElement("Mainframe");
 ////    session.appendChild( mainframeEl);
 ////  }
-////  bool bMaxMode = ((QextMdiMainFrm*)m_pDocViewMan->parent())->isInMaximizedChildFrmMode();
+////  bool bMaxMode = ((QextMdiMainFrm*)m_pDocViewMan->tqparent())->isInMaximizedChildFrmMode();
 ////  mainframeEl.setAttribute("MaximizeMode", bMaxMode);
 
 
@@ -349,7 +349,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue
         TQDomElement viewEl = domdoc.createElement( "View"+viewIdStr);
         docEl.appendChild( viewEl);
         // focus?
-////        viewEl.setAttribute("Focus", (((CEditWidget*)pView->parentWidget()) == m_pDocViewMan->currentEditView()));
+////        viewEl.setAttribute("Focus", (((CEditWidget*)pView->tqparentWidget()) == m_pDocViewMan->currentEditView()));
         viewEl.setAttribute("Type", "???");
 
     TQDomElement viewPropertiesEl = domdoc.createElement("AdditionalSettings");
diff --git a/src/projectsession.h b/src/projectsession.h
index ef8ac2df..6ddccefa 100644
--- a/src/projectsession.h
+++ b/src/projectsession.h
@@ -32,9 +32,10 @@ class KDevPlugin;
  * Session stuff that is not related to a certain project doesn't belong to here;
  * it must be saved in a program session which likely is "kdeveloprc".
  **/
-class ProjectSession : public QObject
+class ProjectSession : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 // methods
 public:
   ProjectSession();
diff --git a/src/settingswidget.ui b/src/settingswidget.ui
index eedcd231..df44b1d5 100644
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SettingsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form2</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QCheckBox" row="1" column="2" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="1" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>lastProjectCheckbox</cstring>
             </property>
@@ -36,18 +36,18 @@
                 <string>Mark this checkbox if you want to continue to work with the last project you worked on. This will cause KDevelop to automatically load this project on start-up. It will usually be shown in the state you left work so you can readily proceed.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
             <property name="text">
                 <string>&lt;qt&gt;&lt;h3&gt;Project Settings&lt;/h3&gt;&lt;/qt&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
-        <widget class="QCheckBox" row="6" column="2" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="6" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>lineWrappingCheckBox</cstring>
             </property>
@@ -61,15 +61,15 @@
                 <string>By default, KDevelop will wrap long lines around in the Messages Output View window so that valuable information will not be easily overlooked. In some cases this will clutter long message lists. Remove the checkbox mark if you do not want the lines wrap around.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="2" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="5" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>compilerLabel</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <cstring>compileOutputCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Very Short</string>
@@ -119,7 +119,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4">
+        <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -129,19 +129,19 @@
             <property name="textFormat">
                 <enum>AutoText</enum>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignBottom|AlignLeft</set>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="2" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -163,7 +163,7 @@
                         <string>Set the directory where you want your projects in.</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>By default, KDevelop uses a common parent directory for all new projects. Enter the absolute path of this common directory in the box or select it from your directory structure. KDevelop will place the any new project here as a subdirectory.</string>
+                        <string>By default, KDevelop uses a common tqparent directory for all new projects. Enter the absolute path of this common directory in the box or select it from your directory structure. KDevelop will place the any new project here as a subdirectory.</string>
                     </property>
                 </widget>
             </hbox>
@@ -178,22 +178,22 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="4" column="2" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>buttonLabel</cstring>
                     </property>
@@ -232,14 +232,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>60</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup" row="12" column="3">
+        <widget class="TQButtonGroup" row="12" column="3">
             <property name="name">
                 <cstring>terminalButtonGroup</cstring>
             </property>
@@ -253,7 +253,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>useKDETerminal</cstring>
                     </property>
@@ -270,15 +270,15 @@
                         <string>If checked, KDevelop will use the default terminal as set in KControl in KDE components, Component Chooser.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>useOtherTerminal</cstring>
                             </property>
@@ -312,14 +312,14 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="11" column="0" rowspan="1" colspan="4">
+        <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>textLabel5_2</cstring>
             </property>
             <property name="text">
                 <string>&lt;qt&gt;&lt;h3&gt;Terminal Emulation&lt;/h3&gt;&lt;/qt&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -333,7 +333,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -350,25 +350,25 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="9" column="0" rowspan="1" colspan="4">
+        <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>textLabel5</cstring>
             </property>
             <property name="text">
                 <string>&lt;qt&gt;&lt;h3&gt;UI Designer Integration&lt;/h3&gt;This will only be used when no project is opened. For the project specific setting see Project Options/C++ Specific and open the Qt tab.&lt;/qt&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="10" column="3">
+        <widget class="TQButtonGroup" row="10" column="3">
             <property name="name">
                 <cstring>designerButtonGroup</cstring>
             </property>
@@ -388,7 +388,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>embeddedDesignerRadioButton</cstring>
                     </property>
@@ -402,7 +402,7 @@
                         <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to integrate the UI designer into KDevelop.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>seperateAppRadioButton</cstring>
                     </property>
@@ -416,7 +416,7 @@
                         <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to run KDevelop's UI designer as a separate program.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>qtDesignerRadioButton</cstring>
                     </property>
@@ -432,7 +432,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="7" column="2" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>dirNavigMsgCheckBox</cstring>
             </property>
@@ -459,14 +459,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>150</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup" row="8" column="1" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="8" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup3</cstring>
             </property>
@@ -479,7 +479,7 @@
             <property name="title">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <vbox>
@@ -489,7 +489,7 @@
                 <property name="margin">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>forceCLocaleRadio</cstring>
                     </property>
@@ -497,7 +497,7 @@
                         <string>Force English compiler output</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>userLocaleRadio</cstring>
                     </property>
@@ -517,7 +517,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 73164f86..bca7766a 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -57,20 +57,20 @@
 #include "editorproxy.h"
 #include "multibuffer.h"
 
-SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name)
-    :DMainWindow(parent, name)
+SimpleMainWindow::SimpleMainWindow(TQWidget* tqparent, const char *name)
+    :DMainWindow(tqparent, name)
 {
     resize(800, 600); // starts kdevelop at 800x600 the first time
-    m_mainWindowShare = new MainWindowShare(this);
+    m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this));
 
-    connect(m_bottomDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
-    connect(m_leftDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
-    connect(m_rightDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor()));
+    connect(m_bottomDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()));
+    connect(m_leftDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()));
+    connect(m_rightDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()));
 }
 
 SimpleMainWindow::~ SimpleMainWindow( )
 {
-    TopLevel::invalidateInstance( this );
+    TopLevel::tqinvalidateInstance( this );
 }
 
 void SimpleMainWindow::init()
@@ -105,19 +105,19 @@ void SimpleMainWindow::init()
             i18n("Could Not Find Plugins") );
     }
 
-    connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(slotCoreInitialized()));
-    connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
-    connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
+    connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), TQT_TQOBJECT(this), TQT_SLOT(slotCoreInitialized()));
+    connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), TQT_TQOBJECT(this), TQT_SLOT(projectOpened()));
+    connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), TQT_TQOBJECT(this), TQT_SLOT(projectClosed()));
     connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
-        this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+        TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
     connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)),
-        this, TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * )));
+        TQT_TQOBJECT(this), TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * )));
     connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-        this, TQT_SLOT(activePartChanged(KParts::Part*)));
+        TQT_TQOBJECT(this), TQT_SLOT(activePartChanged(KParts::Part*)));
 
     connect(PartController::getInstance(),
         TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)),
-        this, TQT_SLOT(documentChangedState(const KURL&, DocumentState)));
+        TQT_TQOBJECT(this), TQT_SLOT(documentChangedState(const KURL&, DocumentState)));
 
     loadSettings();
 }
@@ -182,7 +182,7 @@ void SimpleMainWindow::contextMenu(TQPopupMenu *popupMenu, const Context *contex
             bool isOpen = true;
             for (KURL::List::const_iterator it = m_splitURLs.begin(); it != m_splitURLs.end(); ++it)
             {
-                if (!PartController::getInstance()->openURLs().contains(*it) && (*it).isValid())
+                if (!PartController::getInstance()->openURLs().tqcontains(*it) && (*it).isValid())
                 {
                     isOpen = false;
                     break;
@@ -217,7 +217,7 @@ void SimpleMainWindow::embedPartView(TQWidget *view, const TQString &title, cons
         return;
 
     TQString shortName = title;
-    shortName = shortName.right( shortName.length() - (shortName.findRev('/') +1));
+    shortName = shortName.right( shortName.length() - (shortName.tqfindRev('/') +1));
 
     addWidget(view, title);
     view->show();
@@ -322,15 +322,15 @@ void SimpleMainWindow::raiseView(TQWidget *view)
 {
     //adymo: a workaround to make editor wrappers work:
     //editor view is passed to this function but the ui library knows only
-    //of its parent which is an editor wrapper, simply replacing the view
+    //of its tqparent which is an editor wrapper, simply replacing the view
     //by its wrapper helps here
-    if (view->parent())
-        kdDebug() << view->parent()->className() << endl;
-    if (view->parent() && (view->parent()->isA("EditorWrapper") || view->parent()->isA("MultiBuffer")))
+    if (view->tqparent())
+        kdDebug() << view->tqparent()->className() << endl;
+    if (view->tqparent() && (view->tqparent()->isA("EditorWrapper") || view->tqparent()->isA("MultiBuffer")))
     {
-//         kdDebug() << "parent is editor wrapper: " <<
-//             static_cast<EditorWrapper*>(view->parent()) << endl;
-        view = (TQWidget*)view->parent();
+//         kdDebug() << "tqparent is editor wrapper: " <<
+//             static_cast<EditorWrapper*>(view->tqparent()) << endl;
+        view = (TQWidget*)view->tqparent();
     }
 
     if (hasDockWidget(view))
@@ -338,7 +338,7 @@ void SimpleMainWindow::raiseView(TQWidget *view)
         DDockWindow *dock = toolWindow(dockWidgetPosition(view));
         dock->raiseWidget(view);
     }
-    else if (m_widgets.contains(view) && m_widgetTabs.contains(view))
+    else if (m_widgets.tqcontains(view) && m_widgetTabs.tqcontains(view))
         m_widgetTabs[view]->showPage(view);
 }
 
@@ -403,64 +403,64 @@ void SimpleMainWindow::createFramework()
     PartController::createInstance( this );
 
     connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-        this, TQT_SLOT(createGUI(KParts::Part*)));
+        TQT_TQOBJECT(this), TQT_SLOT(createGUI(KParts::Part*)));
 }
 
 void SimpleMainWindow::createActions()
 {
     m_raiseEditor = new KAction(i18n("Raise &Editor"), ALT+Key_C,
-        this, TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor");
+        TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor");
     m_raiseEditor->setToolTip(i18n("Raise editor"));
     m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor."));
 
     m_lowerAllDocks = new KAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C,
-        this, TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks");
+        TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks");
 
-    new KAction(i18n("Switch to next TabWidget"), 0, this,
+    new KAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this),
         TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" );
 
     m_splitHor = new KAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T,
-        this, TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h");
+        TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h");
     m_splitHor->setIcon("view_top_bottom");
 
     m_splitVer = new KAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L,
-        this, TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v");
+        TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v");
     m_splitVer->setIcon("view_left_right");
 
     m_splitHor1 = new KAction(i18n("Split &Horizontal"), 0,
-        this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1");
+        TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1");
     m_splitHor1->setIcon("view_top_bottom");
 
     m_splitVer1 = new KAction(i18n("Split &Vertical"), 0,
-        this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1");
+        TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1");
     m_splitVer1->setIcon("view_left_right");
 
     m_splitHor2 = new KAction(i18n("Split &Horizontal and Open"), 0,
-        this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2");
+        TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2");
     m_splitHor2->setIcon("view_top_bottom");
 
     m_splitVer2 = new KAction(i18n("Split &Vertical and Open"), 0,
-        this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2");
+        TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2");
     m_splitVer2->setIcon("view_left_right");
 
     m_raiseLeftDock = new KAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L,
-        this, TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock");
+        TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock");
 
     m_raiseRightDock = new KAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R,
-        this, TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock");
+        TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock");
 
     m_raiseBottomDock = new KAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B,
-        this, TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock");
+        TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock");
 
-    KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars()),
+    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()),
         actionCollection(), "set_configure_toolbars");
 
     m_mainWindowShare->createActions();
 
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), this, TQT_SLOT(gotoNextWindow()));
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), this, TQT_SLOT(gotoPreviousWindow()));
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), this, TQT_SLOT(gotoFirstWindow()));
-    connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), this, TQT_SLOT(gotoLastWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoNextWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoPreviousWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoFirstWindow()));
+    connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoLastWindow()));
 }
 
 void SimpleMainWindow::raiseEditor()
@@ -522,7 +522,7 @@ void SimpleMainWindow::slotCoreInitialized()
 
 void SimpleMainWindow::projectOpened()
 {
-    setCaption(TQString::null);
+    setCaption(TQString());
 }
 
 void SimpleMainWindow::slotPartURLChanged(KParts::ReadOnlyPart *part)
@@ -577,9 +577,9 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state
 void SimpleMainWindow::closeTab()
 {
 //    actionCollection()->action("file_close")->activate();
-    if (sender()->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && sender()->parent()->isA("DTabWidget"))
+    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent()->isA("DTabWidget"))
     {
-        DTabWidget *tab = (DTabWidget*)sender()->parent();
+        DTabWidget *tab = (DTabWidget*)TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent();
         if (tab && tab->currentPage())
             closeTab(tab->currentPage());
     }
@@ -587,7 +587,7 @@ void SimpleMainWindow::closeTab()
 
 void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p)
 {
-    DTabWidget *tabWidget = static_cast<DTabWidget*>(const_cast<TQObject*>(sender()));
+    DTabWidget *tabWidget = static_cast<DTabWidget*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
     if (!tabWidget)
         return;
 
@@ -595,7 +595,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p)
     tabMenu.insertTitle(tabWidget->tabLabel(w));
 
     //Find the document on whose tab the user clicked
-    m_currentTabURL = TQString::null;
+    m_currentTabURL = TQString();
     TQPtrListIterator<KParts::Part> it(*PartController::getInstance()->parts());
     while (KParts::Part* part = it.current())
     {
@@ -633,7 +633,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p)
         ++it;
     }
 
-    connect(&tabMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(tabContextActivated(int)));
+    connect(&tabMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(tabContextActivated(int)));
     tabMenu.exec(p);
 }
 
@@ -668,7 +668,7 @@ void SimpleMainWindow::configureToolbars()
 {
     saveMainWindowSettings(KGlobal::config(), "SimpleMainWindow");
     KEditToolbar dlg(factory());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
+    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
     dlg.exec();
 }
 
@@ -693,7 +693,7 @@ bool SimpleMainWindow::queryExit()
 void SimpleMainWindow::setupWindowMenu()
 {
     // get the xmlgui created one instead
-    m_windowMenu = static_cast<TQPopupMenu*>(main()->child("window", "KPopupMenu"));
+    m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "KPopupMenu")));
 
     if (!m_windowMenu)
     {
@@ -707,13 +707,13 @@ void SimpleMainWindow::setupWindowMenu()
     actionCollection()->action("file_close_all")->plug(m_windowMenu);
     actionCollection()->action("file_closeother")->plug(m_windowMenu);
 
-    TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openURL(int)));
-    TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()));
+    TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(openURL(int)));
+    TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu()));
 }
 
 void SimpleMainWindow::openURL(int w)
 {
-    TQValueList<QPair<int, KURL> >::ConstIterator it = m_windowList.begin();
+    TQValueList<TQPair<int, KURL> >::ConstIterator it = m_windowList.begin();
     while (it != m_windowList.end())
     {
         if ((*it).first == w)
@@ -732,7 +732,7 @@ void SimpleMainWindow::openURL(int w)
 void SimpleMainWindow::fillWindowMenu()
 {
     // clear menu
-    TQValueList< QPair< int, KURL > >::ConstIterator it = m_windowList.begin();
+    TQValueList< TQPair< int, KURL > >::ConstIterator it = m_windowList.begin();
     while (it != m_windowList.end())
     {
         m_windowMenu->removeItem( (*it).first );
@@ -761,12 +761,12 @@ void SimpleMainWindow::fillWindowMenu()
     int i = 0;
 
     if (list.count() > 0)
-        m_windowList << qMakePair(m_windowMenu->insertSeparator(), KURL());
+        m_windowList << tqMakePair(m_windowMenu->insertSeparator(), KURL());
 
     while (itt != list.end())
     {
-        temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() );
-        m_windowList << qMakePair(temp, *itt);
+        temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").tqarg(i).tqarg((*itt).fileName()) : (*itt).fileName() );
+        m_windowList << tqMakePair(temp, *itt);
         ++i;
         ++itt;
     }
@@ -847,13 +847,13 @@ TQWidget *SimpleMainWindow::widgetForURL(KURL url)
 TQWidget *SimpleMainWindow::widgetInTab(TQWidget *w)
 {
     TQWidget *inTab = 0;
-    if (w && w->parent() && w->parent()->isA("EditorProxy"))
-        inTab = (TQWidget*)w->parent();
-    else if (w && w->parent() && w->parent()->isA("MultiBuffer")
-        && w->parent()->parent() && w->parent()->parent()->isA("EditorProxy"))
-        inTab = (TQWidget*)w->parent()->parent();
-    else if (w && w->parent() && w->parent()->isA("MultiBuffer"))
-        inTab = (TQWidget*)w->parent();
+    if (w && w->tqparent() && w->tqparent()->isA("EditorProxy"))
+        inTab = (TQWidget*)w->tqparent();
+    else if (w && w->tqparent() && w->tqparent()->isA("MultiBuffer")
+        && w->tqparent()->tqparent() && w->tqparent()->tqparent()->isA("EditorProxy"))
+        inTab = (TQWidget*)w->tqparent()->tqparent();
+    else if (w && w->tqparent() && w->tqparent()->isA("MultiBuffer"))
+        inTab = (TQWidget*)w->tqparent();
     else
         inTab = w;
     return inTab;
@@ -900,7 +900,7 @@ void SimpleMainWindow::activePartChanged(KParts::Part *part)
 
 void SimpleMainWindow::createGUI(KParts::Part *part) {
     if ( !part )
-        setCaption( TQString::null );
+        setCaption( TQString() );
     DMainWindow::createGUI(part);
 
     m_mainWindowShare->slotGUICreated( part );
@@ -943,7 +943,7 @@ void SimpleMainWindow::switchToNextTabWidget()
     TQValueList<DTabWidget*>::iterator it = tabWidgets.begin();
     while ( it != tabWidgets.end() )
     {
-        if ( !reduced.contains( *it ) )
+        if ( !reduced.tqcontains( *it ) )
         {
             reduced << *it;
         }
@@ -1003,9 +1003,9 @@ void SimpleMainWindow::setCaption(const TQString &caption)
 
 void SimpleMainWindow::projectClosed()
 {
-    DMainWindow::setCaption(TQString::null);
+    DMainWindow::setCaption(TQString());
 }
 
 #include "simplemainwindow.moc"
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h
index 684f4839..11180edb 100644
--- a/src/simplemainwindow.h
+++ b/src/simplemainwindow.h
@@ -36,11 +36,12 @@ namespace KParts {
 
 class SimpleMainWindow: public DMainWindow, public KDevMainWindow {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    SimpleMainWindow(TQWidget* parent = 0, const char *name = 0);
+    SimpleMainWindow(TQWidget* tqparent = 0, const char *name = 0);
     virtual ~SimpleMainWindow();
 
-    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null);
+    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString());
     virtual void embedSelectView(TQWidget *view, const TQString &title, const TQString &toolTip);
     virtual void embedOutputView(TQWidget *view, const TQString &title, const TQString &toolTip);
     virtual void embedSelectViewRight(TQWidget* view, const TQString& title, const TQString &toolTip);
@@ -130,11 +131,11 @@ private:
     KAction *m_raiseLeftDock;
     KAction *m_raiseRightDock;
     TQPopupMenu *m_windowMenu;
-    TQValueList<QPair<int, KURL> > m_windowList;
+    TQValueList<TQPair<int, KURL> > m_windowList;
 
     KURL::List m_splitURLs;
 };
 
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
 
 #endif
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index 25a4c811..ddfb8e62 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -29,7 +29,7 @@ KDevSplashScreen::~KDevSplashScreen()
 void KDevSplashScreen::animate()
 {
 	state = ((state + 1) % (2*progress_bar_size-1));
-	repaint();
+	tqrepaint();
 }
 
 
@@ -74,7 +74,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter)
 	// Draw version number
 	TQRect r = rect();
     r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10);
-    painter->drawText(r, Qt::AlignRight, i18n("Version %1").arg( VERSION ));
+    painter->drawText(r, TQt::AlignRight, i18n("Version %1").tqarg( VERSION ));
 
 	// Draw message at given position, limited to 43 chars
 	// If message is too long, string is truncated
diff --git a/src/splashscreen.h b/src/splashscreen.h
index acd0cb5d..317ecdc3 100644
--- a/src/splashscreen.h
+++ b/src/splashscreen.h
@@ -11,9 +11,10 @@ class TQPixmap;
 /**
 Splash screen.
 */
-class KDevSplashScreen : public QSplashScreen
+class KDevSplashScreen : public TQSplashScreen
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	KDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0);
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index 02031021..581c2fd2 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -27,8 +27,8 @@
 #include "statusbar.h"
 #include "partcontroller.h"
 
-KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
-    : KStatusBar(parent, name), _cursorIface(0), _activePart(0)
+KDevStatusBar::KDevStatusBar(TQWidget *tqparent, const char *name)
+    : KStatusBar(tqparent, name), _cursorIface(0), _activePart(0)
 {
 	TQWidget * w = new TQWidget( this );
 	addWidget( w, 1, true );
@@ -36,7 +36,7 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
 
 	_status = new TQLabel( this );
 	_status->setMinimumWidth(_status->fontMetrics().width("Line: XXXXX Col: XXX  OVR NORM * "));
-	_status->setAlignment(TQWidget::AlignCenter);
+	_status->tqsetAlignment(TQWidget::AlignCenter);
 	addWidget(_status, 0, true);
 
 	connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
@@ -61,7 +61,7 @@ void KDevStatusBar::activePartChanged(KParts::Part *part)
 		if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget())))
 		{
 			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( setStatus( const TQString & ) ) );
+				this, TQT_SLOT( settqStatus( const TQString & ) ) );
 	
 			_status->show();
 		}
@@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged()
   }
 }
 
-void KDevStatusBar::setStatus(const TQString &str)
+void KDevStatusBar::settqStatus(const TQString &str)
 {
 	_status->setText(str);
 }
@@ -98,15 +98,15 @@ void KDevStatusBar::setStatus(const TQString &str)
 
 void KDevStatusBar::setCursorPosition(int line, int col)
 {
-	_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
+	_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col));
 }
 
 void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
-	if(widget->sizeHint().height() + 4 > height())
-		setFixedHeight(widget->sizeHint().height() + 4);
+	if(widget->tqsizeHint().height() + 4 > height())
+		setFixedHeight(widget->tqsizeHint().height() + 4);
 }
 
 #include "statusbar.moc"
diff --git a/src/statusbar.h b/src/statusbar.h
index cf7a4abe..1c325fcf 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -22,21 +22,22 @@ namespace KTextEditor { class ViewCursorInterface; }
 namespace KParts { class Part; }
 
 /**
-Status bar.
+tqStatus bar.
 */
 class KDevStatusBar : public KStatusBar
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KDevStatusBar( TQWidget *parent=0, const char *name=0 );
+    KDevStatusBar( TQWidget *tqparent=0, const char *name=0 );
     ~KDevStatusBar();
     void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE );
 
 private slots:
     void cursorPositionChanged();
     void activePartChanged(KParts::Part *part);
-    void setStatus(const TQString &str);
+    void settqStatus(const TQString &str);
     void setCursorPosition(int line, int col);
 
 private:
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 048b325c..cecfa36d 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -28,7 +28,7 @@ KDevMainWindow *TopLevel::getInstance()
   return s_instance;
 }
 
-void TopLevel::invalidateInstance(KDevMainWindow *instance)
+void TopLevel::tqinvalidateInstance(KDevMainWindow *instance)
 {
   if ( s_instance == instance )
     s_instance = 0;
diff --git a/src/toplevel.h b/src/toplevel.h
index 8eb0243a..c91d5be2 100644
--- a/src/toplevel.h
+++ b/src/toplevel.h
@@ -16,7 +16,7 @@ public:
 
   static KDevMainWindow *getInstance();                                 //!< Get a pointer to the single KDevTopLevel object
   static bool mainWindowValid();
-  static void invalidateInstance(KDevMainWindow *instance);             //!< Signal that the object has been (or is about to be) destroyed
+  static void tqinvalidateInstance(KDevMainWindow *instance);             //!< Signal that the object has been (or is about to be) destroyed
 
 private:
 
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 1e18f8e1..200f7448 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -16,14 +16,14 @@
 #include <kprocess.h>
 #include <tqapplication.h>
 
-ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent)
-	: KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider")
+ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *tqparent)
+	: KDevVCSFileInfoProvider( (KDevVersionControl*) tqparent, "clearcasefileinfoprovider")
 {
     vcsInfo_ = NULL;
 
-    connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*)));
+    connect(tqparent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*)));
 
-    kdevVCS_ = parent;
+    kdevVCS_ = tqparent;
 }
 
 
@@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath
     return vcsInfo_;
 }
 
-bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
+bool ClearcaseFileinfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
  	
     VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath);
 
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index 24d38c2a..f4ac08f2 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -22,8 +22,9 @@
 class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-    ClearcaseFileinfoProvider(ClearcasePart *parent);
+    ClearcaseFileinfoProvider(ClearcasePart *tqparent);
 
     virtual ~ClearcaseFileinfoProvider();
 
@@ -31,7 +32,7 @@ public:
     const VCSFileInfoMap *status( const TQString &dirPath ) ;
 
     // -- Async interface for requesting data
-    bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
 
 private:
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 198cc1db..69e25513 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -42,8 +42,8 @@ static const KDevPluginInfo data("kdevclearcase");
 typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
 
-ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
-        : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
+ClearcasePart::ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & )
+        : KDevVersionControl( &data, tqparent, name ? name : "ClearcasePart" ),
           default_checkin(""),
           default_checkout(""),
           default_uncheckout("-rm"),
@@ -86,7 +86,7 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
         KPopupMenu *sub = new KPopupMenu(popup);
         TQString name = fi.fileName();
-        sub->insertTitle( i18n("Actions for %1").arg(name) );
+        sub->insertTitle( i18n("Actions for %1").tqarg(name) );
         sub->insertItem( i18n("Checkin"),
                          this, TQT_SLOT(slotCheckin()) );
         sub->insertItem( i18n("Checkout"),
diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h
index cafd60cd..956fc214 100644
--- a/vcs/clearcase/clearcasepart.h
+++ b/vcs/clearcase/clearcasepart.h
@@ -19,9 +19,10 @@ class TQPopupMenu;
 
 class ClearcasePart : public KDevVersionControl {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ClearcasePart( TQObject *parent, const char *name, const TQStringList & );
+    ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & );
     ~ClearcasePart();
 
     const TQString default_checkin;
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index df9fc10b..5355b3f0 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -25,21 +25,21 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
 {
   setCaption( i18n("Clearcase Comment") );
 
-  TQBoxLayout *layout = new TQVBoxLayout(this, 10);
+  TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
 
   TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
-  messagelabel->setMinimumSize(messagelabel->sizeHint());
-  layout->addWidget(messagelabel, 0);
+  messagelabel->setMinimumSize(messagelabel->tqsizeHint());
+  tqlayout->addWidget(messagelabel, 0);
 
   _edit = new TQMultiLineEdit(this);
   TQFontMetrics fm(_edit->fontMetrics());
   _edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
-  layout->addWidget(_edit, 10);
+  tqlayout->addWidget(_edit, 10);
 
-  TQBoxLayout *layout2 = new TQHBoxLayout(layout);
+  TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout);
   if(bCheckin) {
     _check = new TQCheckBox(i18n("Reserve"), this);
-    layout2->addWidget(_check);
+    tqlayout2->addWidget(_check);
   }
 
   KButtonBox *buttonbox = new KButtonBox(this);
@@ -49,10 +49,10 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
   connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
   connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
   ok->setDefault(true);
-  buttonbox->layout();
-  layout2->addWidget(buttonbox, 0);
+  buttonbox->tqlayout();
+  tqlayout2->addWidget(buttonbox, 0);
 
-  layout->activate();
+  tqlayout->activate();
   adjustSize();
 }
 
diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h
index 953a9a4e..c88ba7bd 100644
--- a/vcs/clearcase/commentdlg.h
+++ b/vcs/clearcase/commentdlg.h
@@ -16,9 +16,10 @@
 #include <tqdialog.h>
 #include <tqmultilineedit.h>
 
-class CcaseCommentDlg : public QDialog
+class CcaseCommentDlg : public TQDialog
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   CcaseCommentDlg(bool = FALSE);
   TQString logMessage() { return _edit->text(); };
diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp
index 8e89cf94..3f6f8d0e 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.cpp
+++ b/vcs/clearcase/integrator/ccintegratordlg.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "ccintegratordlg.h"
 
-CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name)
-    :CCIntegratorDlgBase(parent, name)
+CCIntegratorDlg::CCIntegratorDlg(TQWidget *tqparent, const char *name)
+    :CCIntegratorDlgBase(tqparent, name)
 {
 }
 
diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h
index bbb23955..37d73885 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.h
+++ b/vcs/clearcase/integrator/ccintegratordlg.h
@@ -25,8 +25,9 @@
 
 class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+    CCIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
     
     virtual void accept();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index ae961a9f..bafb8a96 100644
--- a/vcs/clearcase/integrator/ccintegratordlgbase.ui
+++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CCIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CCIntegratorDlgBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>437</height>
@@ -43,5 +43,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp
index 4e8c1a0b..d076abc9 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.cpp
+++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevclearcaseintegrator");
 typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) )
 
-ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name,
+ClearcaseIntegrator::ClearcaseIntegrator(TQObject* tqparent, const char* name,
     const TQStringList // args
                                          )
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -39,15 +39,15 @@ ClearcaseIntegrator::~ClearcaseIntegrator()
 {
 }
 
-VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent
+VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // tqparent
                                         )
 {
     return 0;
 }
 
-VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent)
+VCSDialog* ClearcaseIntegrator::integrator(TQWidget* tqparent)
 {
-    CCIntegratorDlg *dlg = new CCIntegratorDlg(parent);
+    CCIntegratorDlg *dlg = new CCIntegratorDlg(tqparent);
     return dlg;
 }
 
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h
index 385f1976..197638bf 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.h
+++ b/vcs/clearcase/integrator/clearcaseintegrator.h
@@ -27,12 +27,13 @@
 class ClearcaseIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    ClearcaseIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~ClearcaseIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
 
 };
 
diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am
index 04802374..a97444c2 100644
--- a/vcs/cvsservice/Makefile.am
+++ b/vcs/cvsservice/Makefile.am
@@ -1,7 +1,7 @@
 # Here resides the cvs part
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
-	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
+	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = libkdevcvsservice.la
 libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox
index c89e9422..3a102ce7 100644
--- a/vcs/cvsservice/README.dox
+++ b/vcs/cvsservice/README.dox
@@ -23,7 +23,7 @@ mailing list. Contributions are always welcome :-)
 Implementation of this component is done by:
   - class CvsServicePart, which does provide integration within kdevelop, set-up GUI
     integration, forward cvs commands to the implementation (m_impl). It does also
-    intercepts signals like "new files added to project" and "... removed from ...".
+    intercepts Q_SIGNALS like "new files added to project" and "... removed from ...".
   - class CvsServicePartImpl implements the actual feature: more general speaking
     functions (like checking for whether files are in repository, provide checks
     on file lists, ...).
@@ -73,7 +73,7 @@ Implementation of this component is done by:
 
 \todo Test with SSH repositories!
 \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/
-\todo Additional slots for more complex stuff as status, revert, patch creation, ...
+\todo Additional Q_SLOTS for more complex stuff as status, revert, patch creation, ...
 
 \faq <b>Does cvsservicepart support login with :pserver: or :ext: ?</b>
    Well, I dunno ;-) I have no ssh repositories to test so feel free to provide feedback on the subject :-)
diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp
index 2937b2bb..d61aeb72 100644
--- a/vcs/cvsservice/annotatedialog.cpp
+++ b/vcs/cvsservice/annotatedialog.cpp
@@ -23,9 +23,9 @@
 #include "annotatedialog.h"
 #include "annotatepage.h"
 
-AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
+AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int )
     : KDialogBase( Tabbed, i18n("CVS Annotate Dialog"), Close, Close,
-    parent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ),
+    tqparent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ),
     m_cvsService( cvsService )
 {
     setWFlags( getWFlags() | WDestructiveClose );
diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h
index c887264d..c6866967 100644
--- a/vcs/cvsservice/annotatedialog.h
+++ b/vcs/cvsservice/annotatedialog.h
@@ -30,8 +30,9 @@ class AnnotatePage;
 class AnnotateDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
+    AnnotateDialog( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 );
     virtual ~AnnotateDialog();
 
     /**
diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp
index 71918304..68e12f6d 100644
--- a/vcs/cvsservice/annotatepage.cpp
+++ b/vcs/cvsservice/annotatepage.cpp
@@ -32,9 +32,9 @@
 #include "annotatepage.h"
 #include "annotateview.h"
 
-AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
+AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int )
     : DCOPObject( "CvsAnnotatePageDCOPIface" ),
-    TQWidget( parent, name? name : "annotateformpage" ),
+    TQWidget( tqparent, name? name : "annotateformpage" ),
     m_cvsService( cvsService ), m_cvsAnnotateJob( 0 )
 {
     kdDebug(9006) << "AnnotatePage::AnnotatePage()" << endl;
@@ -106,7 +106,7 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus )
 
     if (!normalExit)
     {
-        KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").arg( exitStatus), i18n("Annotate Failed") );
+        KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").tqarg( exitStatus), i18n("Annotate Failed") );
         return;
     }
 
@@ -140,7 +140,7 @@ void AnnotatePage::parseAnnotateOutput(TQStringList& lines)
      * First we need to parse the output of "cvs log" which the dcop-interface delivers
      * everytime annotate is requested.
      * The TQMap m_comments stores the revisions together with the matching comments.
-     * The comments will be passed to the AnnotateView in order to display them as QToolTip
+     * The comments will be passed to the AnnotateView in order to display them as TQToolTip
      */
     TQString line, comment, rev;
 
diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h
index 0b5ab001..27a75314 100644
--- a/vcs/cvsservice/annotatepage.h
+++ b/vcs/cvsservice/annotatepage.h
@@ -37,12 +37,13 @@ class KPushButton;
 class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class AnnotateDialog;
     friend class AnnotateView;
 
 public:
-    AnnotatePage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
+    AnnotatePage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 );
     virtual ~AnnotatePage();
 
     /**
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index afc185cd..30e80a21 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -25,14 +25,14 @@
 
 #include "annotatepage.h"
 
-class AnnotateViewItem : public QListViewItem
+class AnnotateViewItem : public TQListViewItem
 {
     friend class AnnotateView;
 
 public:
     enum { LineNumberColumn, AuthorColumn, DateColumn,ContentColumn };
 
-    AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, 
+    AnnotateViewItem(AnnotateView *tqparent, TQString rev, TQString author, 
             TQDateTime date, TQString content, TQString comment, 
             bool odd, int linenumber);
 
@@ -57,10 +57,10 @@ private:
 const int AnnotateViewItem::BORDER = 4;
 
 
-AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, TQString rev, 
+AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, TQString rev, 
     TQString author, TQDateTime date, TQString content, TQString comment, 
     bool odd, int linenumber)
-    : TQListViewItem(parent)
+    : TQListViewItem(tqparent)
     , m_revision(rev)
     , m_author(author)
     , m_content(content)
@@ -96,7 +96,7 @@ TQString AnnotateViewItem::text(int col) const
         ;
     };
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -140,22 +140,22 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col
 /*****************Definition of class AnnotateView ****************************/
 /******************************************************************************/
 
-AnnotateView::AnnotateView(AnnotatePage *parent, const char *name)
-    : KListView(parent, name), TQToolTip( viewport() ), 
-    m_page(parent)
+AnnotateView::AnnotateView(AnnotatePage *tqparent, const char *name)
+    : KListView(tqparent, name), TQToolTip( viewport() ), 
+    m_page(tqparent)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
     setAllColumnsShowFocus(true);
     setShowToolTips(false);
     header()->hide();
 
-    addColumn(TQString::null);
-    addColumn(TQString::null);
-    addColumn(TQString::null);
-    addColumn(TQString::null);
+    addColumn(TQString());
+    addColumn(TQString());
+    addColumn(TQString());
+    addColumn(TQString());
 
     setSorting(AnnotateViewItem::LineNumberColumn);
-    setColumnAlignment(AnnotateViewItem::LineNumberColumn, Qt::AlignRight);
+    setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight);
 
     connect( this, TQT_SIGNAL(executed(TQListViewItem*)),
              this, TQT_SLOT(itemClicked(TQListViewItem*)) );
@@ -170,7 +170,7 @@ void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date,
 }
 
 
-TQSize AnnotateView::sizeHint() const
+TQSize AnnotateView::tqsizeHint() const
 {
     TQFontMetrics fm(fontMetrics());
     return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing());
@@ -189,7 +189,7 @@ void AnnotateView::maybeTip( const TQPoint & p )
         return;
     }
 
-    TQRect r = itemRect( item );
+    TQRect r = tqitemRect( item );
     //get the dimension of the author + the date column
     TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn);
     headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn));
diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h
index 74d19718..99d222a3 100644
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@@ -30,18 +30,19 @@ class AnnotatePage;
  * to get a new page which shows the annotate output
  * of the clicked revision.
  */
-class AnnotateView : public KListView, public QToolTip
+class AnnotateView : public KListView, public TQToolTip
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    explicit AnnotateView(AnnotatePage *parent, const char *name=0 );
+    explicit AnnotateView(AnnotatePage *tqparent, const char *name=0 );
 
     void addLine(TQString rev, TQString author, TQDateTime date, TQString content, 
             TQString comment, bool odd);
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     void maybeTip( const TQPoint & p );
 
 private:
diff --git a/vcs/cvsservice/bufferedstringreader.cpp b/vcs/cvsservice/bufferedstringreader.cpp
index bdaa26f3..f9d1ecb2 100644
--- a/vcs/cvsservice/bufferedstringreader.cpp
+++ b/vcs/cvsservice/bufferedstringreader.cpp
@@ -34,7 +34,7 @@ TQStringList BufferedStringReader::process( const TQString &otherChars )
     TQStringList strings;
     // Now find all the basic strings in the buffer
     int pos;
-    while ( (pos = m_stringBuffer.find('\n')) != -1)
+    while ( (pos = m_stringBuffer.tqfind('\n')) != -1)
     {
         TQString line = m_stringBuffer.left( pos );
         if (!line.isEmpty())
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index 1e676f43..18deee0f 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry()
     authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress );
     authorName = emailConfig.getSetting( KEMailSettings::RealName );
 
-    TQDate currDate = TQDate::currentDate();
+    TQDate currDate = TQDate::tqcurrentDate();
     date = currDate.toString( "yyyy-MM-dd" );
 }
 
diff --git a/vcs/cvsservice/changelog.h b/vcs/cvsservice/changelog.h
index a1b50ffa..ed4d165b 100644
--- a/vcs/cvsservice/changelog.h
+++ b/vcs/cvsservice/changelog.h
@@ -31,7 +31,7 @@ public:
     void addLines( const TQStringList &someLines );
     //! Pretty format for this entry: you may insert a line tag (such as tab ("\t") or 4 spaces ("    ")
     //! or whatever you want (such as "\t * ")
-    TQString toString( const TQString &startLineString = TQString::null ) const;
+    TQString toString( const TQString &startLineString = TQString() ) const;
     //! Once the entry is completed one would like to write on a file! (You may add on start of file
     //! prepend == true, or append on tail (prepend == false)
     void addToLog( const TQString &logFilePath, const bool prepend = true, const TQString &startLineString = "\t" );
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index 82c64052..098dd98e 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -68,9 +68,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 
 CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService,
-    TQWidget *parent, const char *name, WFlags ) :
+    TQWidget *tqparent, const char *name, WFlags ) :
     DCOPObject( "CheckoutDialogDCOPIface" ),
-    KDialogBase( parent, name? name : "checkoutdialog", true, i18n("CVS Checkout"),
+    KDialogBase( tqparent, name? name : "checkoutdialog", true, i18n("CVS Checkout"),
         Ok | Cancel, Ok, true ),
     m_service( cvsService ), m_job( 0 )
 {
@@ -257,7 +257,7 @@ void CheckoutDialog::fetchUserCvsRepositories()
 
 void CheckoutDialog::slotOk()
 {
-	TQString errorMessage = TQString::null;
+	TQString errorMessage = TQString();
 
 	if (!(workDir().length() > 0) && TQFile::exists( workDir() ))
 		errorMessage = i18n( "Please, choose a valid working directory" );
diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h
index 0d01de69..422290d0 100644
--- a/vcs/cvsservice/checkoutdialog.h
+++ b/vcs/cvsservice/checkoutdialog.h
@@ -30,8 +30,9 @@ class TQListViewItem;
 class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0,
+    CheckoutDialog( CvsService_stub *cvsService, TQWidget *tqparent = 0,
         const char *name = 0, WFlags f = 0 );
     virtual ~CheckoutDialog();
 
diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui
index f0ebdf8d..8b882b9e 100644
--- a/vcs/cvsservice/checkoutdialogbase.ui
+++ b/vcs/cvsservice/checkoutdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CheckoutDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CheckoutDialogBase</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -54,15 +54,15 @@
                         <cstring>workURLRequester</cstring>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QComboBox" row="1" column="1">
+                        <widget class="TQComboBox" row="1" column="1">
                             <property name="name">
                                 <cstring>serverPaths</cstring>
                             </property>
@@ -70,7 +70,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -93,7 +93,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -104,9 +104,9 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -122,14 +122,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>156</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1_4</cstring>
                             </property>
@@ -140,7 +140,7 @@
                                 <cstring>moduleEdit</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>textLabel1_3</cstring>
                             </property>
@@ -179,7 +179,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>pruneDirsCheck</cstring>
                     </property>
@@ -236,9 +236,9 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -254,14 +254,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>421</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>fetchModulesButton</cstring>
                             </property>
@@ -303,7 +303,7 @@
     <tabstop>pruneDirsCheck</tabstop>
     <tabstop>fetchModulesButton</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui
index 90e8f7b4..ee0c1ee9 100644
--- a/vcs/cvsservice/commitdialogbase.ui
+++ b/vcs/cvsservice/commitdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CommitDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CommitDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -33,22 +33,22 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>textEdit</cstring>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkAddToChangelog</cstring>
                     </property>
@@ -86,9 +86,9 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -104,14 +104,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>350</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -157,5 +157,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp
index a3988c06..9bed1119 100644
--- a/vcs/cvsservice/commitdlg.cpp
+++ b/vcs/cvsservice/commitdlg.cpp
@@ -30,8 +30,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-CommitDialog::CommitDialog( const TQString &changeLogfileNamePath,  TQWidget *parent )
-    : CommitDialogBase( parent, "commitdialog", true )
+CommitDialog::CommitDialog( const TQString &changeLogfileNamePath,  TQWidget *tqparent )
+    : CommitDialogBase( tqparent, "commitdialog", true )
 {
     connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
     connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h
index ffd40fae..edc27a64 100644
--- a/vcs/cvsservice/commitdlg.h
+++ b/vcs/cvsservice/commitdlg.h
@@ -24,8 +24,9 @@ class TQCheckBox;
 class CommitDialog : public CommitDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 );
+    CommitDialog( const TQString &changeLogfileNamePath, TQWidget *tqparent = 0 );
 
     //! Returns the text of the log
     TQStringList logMessage() const;
diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp
index 7777760a..2f174155 100644
--- a/vcs/cvsservice/cvsdiffpage.cpp
+++ b/vcs/cvsservice/cvsdiffpage.cpp
@@ -33,10 +33,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 CVSDiffPage::CVSDiffPage( CvsService_stub *cvsService,
-    TQWidget *parent, const char *name, int )
+    TQWidget *tqparent, const char *name, int )
 	// Leaving it anonymous let us to have multiple objects at the same time!
     : DCOPObject(), //  "CVSDiffPageDCOPIface"
-	TQWidget( parent, name? name : "logformdialog" ),
+	TQWidget( tqparent, name? name : "logformdialog" ),
     m_diffText( 0 ), m_cvsService( cvsService ), m_cvsDiffJob( 0 )
 {
     TQLayout *thisLayout = new TQVBoxLayout( this );
diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h
index f38512a3..879b28b2 100644
--- a/vcs/cvsservice/cvsdiffpage.h
+++ b/vcs/cvsservice/cvsdiffpage.h
@@ -29,8 +29,9 @@ Implementation for the form displaying 'cvs diff' output.
 class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
+    CVSDiffPage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 );
     virtual ~CVSDiffPage();
 
     void startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 );
diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp
index 28a4b566..80dabbe5 100644
--- a/vcs/cvsservice/cvsdir.cpp
+++ b/vcs/cvsservice/cvsdir.cpp
@@ -110,7 +110,7 @@ TQString CVSDir::repository() const
     TQString content;
 
     if (!isValid())
-        return TQString::null;
+        return TQString();
 
     TQByteArray bytes = cacheFile( repoFileName() );
     TQTextStream t( bytes, IO_ReadOnly );
@@ -129,7 +129,7 @@ TQString CVSDir::root() const
     TQString content;
 
     if (!isValid())
-        return TQString::null;
+        return TQString();
 
     TQByteArray bytes = cacheFile( repoFileName() );
     TQTextStream t( bytes, IO_ReadOnly );
@@ -173,7 +173,7 @@ TQStringList CVSDir::registeredEntryList() const
 
 bool CVSDir::isRegistered( const TQString fileName ) const
 {
-    CVSEntry entry = fileStatus( fileName );
+    CVSEntry entry = filetqStatus( fileName );
     return entry.isValid() && entry.fileName() == fileName;
 }
 
@@ -197,12 +197,12 @@ void CVSDir::refreshEntriesCache() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const
+CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) const
 {
     if (refreshCache)
         refreshEntriesCache();
 
-    if (m_cachedEntries.contains( fileName ))
+    if (m_cachedEntries.tqcontains( fileName ))
     {
         return m_cachedEntries[ fileName ];
     }
@@ -284,7 +284,7 @@ void CVSDir::doNotIgnoreFile( const TQString &fileName )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap CVSDir::dirStatus() const
+VCSFileInfoMap CVSDir::dirtqStatus() const
 {
     VCSFileInfoMap vcsInfo;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -293,7 +293,7 @@ VCSFileInfoMap CVSDir::dirStatus() const
     for ( ; it != end; ++it)
     {
         const TQString &fileName = (*it);
-        const CVSEntry entry = fileStatus( fileName );
+        const CVSEntry entry = filetqStatus( fileName );
 
         vcsInfo.insert( fileName, entry.toVCSFileInfo() );
     }
@@ -303,7 +303,7 @@ VCSFileInfoMap CVSDir::dirStatus() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap *CVSDir::cacheableDirStatus() const
+VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
 {
     VCSFileInfoMap *vcsInfo = new VCSFileInfoMap;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -312,7 +312,7 @@ VCSFileInfoMap *CVSDir::cacheableDirStatus() const
     for ( ; it != end; ++it)
     {
         const TQString &fileName = (*it);
-        const CVSEntry entry = fileStatus( fileName );
+        const CVSEntry entry = filetqStatus( fileName );
 
         vcsInfo->insert( fileName, entry.toVCSFileInfo() );
     }
diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h
index bd745d3e..dc7cb53a 100644
--- a/vcs/cvsservice/cvsdir.h
+++ b/vcs/cvsservice/cvsdir.h
@@ -23,7 +23,7 @@ Helper classes for handling CVS dirs
 
 @author Mario Scalas
 */
-class CVSDir : public QDir
+class CVSDir : public TQDir
 {
 public:
     CVSDir();
@@ -46,11 +46,11 @@ public:
     * @param refreshCache update internal cache re-parsing "<dirPath>/CVS/Entries"
     * @return an empty CVSEntry if the file is not present
     */
-    CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const;
+    CVSEntry filetqStatus( const TQString &fileName, bool refreshCache = false ) const;
     /**
     */
-    VCSFileInfoMap dirStatus() const;
-    VCSFileInfoMap *cacheableDirStatus() const;
+    VCSFileInfoMap dirtqStatus() const;
+    VCSFileInfoMap *cacheableDirtqStatus() const;
     /**
     * @return true if the file is registered into repository, false otherwise
     */
diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp
index 5db9710e..eb8ca704 100644
--- a/vcs/cvsservice/cvsentry.cpp
+++ b/vcs/cvsservice/cvsentry.cpp
@@ -91,7 +91,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir )
         m_state = Added;
     else if ( revision().length() > 3 && revision()[0] == '-' )
         m_state = Removed;
-    else if ( timeStamp().find('+') >= 0 )
+    else if ( timeStamp().tqfind('+') >= 0 )
         m_state = Conflict;
     else
     {
@@ -110,7 +110,7 @@ TQString CVSEntry::fileName() const
     if (type() != invalidEntry && m_fields.count() >= 1)
         return m_fields[0];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ TQString CVSEntry::revision() const
     if (type() != invalidEntry && m_fields.count() >= 2)
         return m_fields[1];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -130,7 +130,7 @@ TQString CVSEntry::timeStamp() const
     if (type() != invalidEntry && m_fields.count() >= 3)
         return m_fields[2];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -140,7 +140,7 @@ TQString CVSEntry::options() const
     if (type() != invalidEntry && m_fields.count() >= 4)
         return m_fields[3];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ TQString CVSEntry::tag() const
     if (type() != invalidEntry && m_fields.count() >= 5)
         return m_fields[4];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -184,4 +184,4 @@ VCSFileInfo CVSEntry::toVCSFileInfo() const
     return VCSFileInfo( fileName(), revision(), revision(), fileState );
 }
 
-//kate: space-indent on; indent-width 4; replace-tabs on;
+//kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index cbfc726f..9eb57fcf 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -31,8 +31,8 @@
 // class CVSFileInfoProvider
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService )
-    : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
+CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService )
+    : KDevVCSFileInfoProvider( tqparent, "cvsfileinfoprovider" ),
     m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 )
 {
     connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&)));
@@ -59,14 +59,14 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath )
         delete m_cachedDirEntries;
         CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath );
         m_previousDirPath = dirPath;
-        m_cachedDirEntries = cvsdir.cacheableDirStatus();
+        m_cachedDirEntries = cvsdir.cacheableDirtqStatus();
     }
     return m_cachedDirEntries;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
+bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
 {
     m_savedCallerData = callerData;
     if (m_requestStatusJob)
@@ -131,13 +131,13 @@ void CVSFileInfoProvider::propagateUpdate()
 
 void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
 {
-    m_cachedDirEntries = dir.cacheableDirStatus();
+    m_cachedDirEntries = dir.cacheableDirtqStatus();
     printOutFileInfoMap( *m_cachedDirEntries );
 
-    /* FileTree will call requestStatus() everytime the user expands a directory
-     * Unfortunatly requestStatus() will be called before the 
+    /* FileTree will call requesttqStatus() everytime the user expands a directory
+     * Unfortunatly requesttqStatus() will be called before the 
      * VCSFileTreeViewItem of the directory will be filled with the files
-     * it contains. Meaning, m_savedCallerData contains no childs at that
+     * it tqcontains. Meaning, m_savedCallerData contains no childs at that
      * time. When a dcop call is made to run "cvs status" this is no problem.
      * The dcop call takes quit long, and so FileTree has enough time the fill
      * in the childs before we report the status back.
@@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 {
     TQRegExp rx_recordStart( "^=+$" );
     TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
-    TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
+    TQRegExp rx_filetqStatus( "tqStatus: (\\.|-|\\s|\\w)+" );
     TQRegExp rx_fileWorkRev( "\\bWorking revision:" );
     TQRegExp rx_fileRepoRev( "\\bRepository revision:" );
     //TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" );
@@ -204,7 +204,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
     //TQRegExp rx_stickyOptions( "" ); //@todo
 
     TQString fileName,
-        fileStatus,
+        filetqStatus,
         workingRevision,
         repositoryRevision,
         stickyTag,
@@ -224,16 +224,16 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 
         if (rx_recordStart.exactMatch( s ))
             state = 1;
-        else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0)    // FileName
+        else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0)    // FileName
         {
-            fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
-            fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
+            fileName = rx_fileName.cap().tqreplace( "File:", "" ).stripWhiteSpace();
+            filetqStatus = rx_filetqStatus.cap().tqreplace( "tqStatus:", "" ).stripWhiteSpace();
             ++state; // Next state
-            kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl;
+            kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
         }
         else if (state == 2 && rx_fileWorkRev.search( s ) >= 0)
         {
-            workingRevision = s.replace( "Working revision:", "" ).stripWhiteSpace();
+            workingRevision = s.tqreplace( "Working revision:", "" ).stripWhiteSpace();
 
             TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" );
             if (rx_revision.search( workingRevision ) >= 0)
@@ -245,7 +245,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
         }
         else if (state == 3 && rx_fileRepoRev.search( s ) >= 0)
         {
-            repositoryRevision = s.replace( "Repository revision:", "" ).stripWhiteSpace();
+            repositoryRevision = s.tqreplace( "Repository revision:", "" ).stripWhiteSpace();
 
             TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" );
             if (rx_revision.search( s ) >= 0)
@@ -266,7 +266,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
         {
             // Package stuff, put into map and get ready for a new record
             VCSFileInfo vcsInfo( fileName, workingRevision, repositoryRevision,
-                String2EnumState( fileStatus ) );
+                String2EnumState( filetqStatus ) );
             kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl;
             vcsStates->insert( fileName, vcsInfo );
         }
@@ -311,4 +311,4 @@ void CVSFileInfoProvider::printOutFileInfoMap( const VCSFileInfoMap &map )
 }
 
 #include "cvsfileinfoprovider.moc"
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index 9b80dc8e..72f3cff0 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -31,15 +31,16 @@ Provider for CVS file information
 class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService );
+    CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService );
     virtual ~CVSFileInfoProvider();
 
 // -- Sync interface
     virtual const VCSFileInfoMap *status( const TQString &dirPath ) ;
 
 // -- Async interface for requesting data
-    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true  );
+    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true  );
 
 public slots:
     void updateStatusFor( const CVSDir& );
diff --git a/vcs/cvsservice/cvsform.cpp b/vcs/cvsservice/cvsform.cpp
index ef0521c8..e1423ef6 100644
--- a/vcs/cvsservice/cvsform.cpp
+++ b/vcs/cvsservice/cvsform.cpp
@@ -19,8 +19,8 @@
 // class CvsForm
 ///////////////////////////////////////////////////////////////////////////////
 
-CvsForm::CvsForm( TQWidget *parent, const char *name, WFlags f )
-    : CvsFormBase( parent, name, f )
+CvsForm::CvsForm( TQWidget *tqparent, const char *name, WFlags f )
+    : CvsFormBase( tqparent, name, f )
 {
     setWFlags( getWFlags() | WDestructiveClose );
 }
diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h
index a61e8473..8a9a4ef7 100644
--- a/vcs/cvsservice/cvsform.h
+++ b/vcs/cvsservice/cvsform.h
@@ -21,8 +21,9 @@ information about setting up the cvs repository.
 class CvsForm : public CvsFormBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    CvsForm( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~CvsForm();
 
     TQString module() const;
diff --git a/vcs/cvsservice/cvsformbase.ui b/vcs/cvsservice/cvsformbase.ui
index 2a7b5c42..acd4d3bf 100644
--- a/vcs/cvsservice/cvsformbase.ui
+++ b/vcs/cvsservice/cvsformbase.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CvsFormBase</class>
 <author>Yann Hodique</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CvsFormBase</cstring>
     </property>
@@ -20,7 +20,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -60,7 +60,7 @@ Most of the thime you'll just reuse the project name</string>
                 <string>Enter the vendor name</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -71,7 +71,7 @@ Most of the thime you'll just reuse the project name</string>
                 <cstring>message_edit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -82,7 +82,7 @@ Most of the thime you'll just reuse the project name</string>
                 <cstring>module_edit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -115,7 +115,7 @@ Most of the thime you'll just reuse the project name</string>
                 <string>Tag that will be associated with initial state</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -144,7 +144,7 @@ Most of the thime you'll just reuse the project name</string>
 &lt;li&gt;/home/cvsroot or&lt;/li&gt;&lt;li&gt;:pserver:me@localhost:/home/cvs&lt;/li&gt;&lt;/ul&gt;</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -161,7 +161,7 @@ Most of the thime you'll just reuse the project name</string>
                 <cstring>cvsRshComboBox</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <item>
                 <property name="text">
                     <string></string>
@@ -176,7 +176,7 @@ Most of the thime you'll just reuse the project name</string>
                 <cstring>cvsRshComboBox</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="3">
+        <widget class="TQCheckBox" row="1" column="3">
             <property name="name">
                 <cstring>init_check</cstring>
             </property>
@@ -197,7 +197,7 @@ Most of the thime you'll just reuse the project name</string>
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>51</width>
                     <height>20</height>
@@ -218,6 +218,6 @@ Most of the thime you'll just reuse the project name</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index ff36c19d..5bd230c3 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -32,9 +32,9 @@
 // class CVSLogDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
+CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int )
     : KDialogBase( Tabbed, i18n("CVS Log & Diff Dialog"), Close, Close,
-    parent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ),
+    tqparent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ),
     m_cvsLogPage( 0 ), m_cvsService( cvsService )
 {
     setWFlags( getWFlags() | WDestructiveClose );
@@ -79,7 +79,7 @@ void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString &
     kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl;
 
     // Create a new CVSDiffPage and start diffing process
-    TQString diffTitle =  i18n("Diff between %1 and %2").arg( revA ).arg( revB );
+    TQString diffTitle =  i18n("Diff between %1 and %2").tqarg( revA ).tqarg( revB );
     TQVBox *vbox = addVBoxPage( diffTitle );
     CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox );
     diffPage->startDiff( pathName, revA, revB );
diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h
index 315fea40..9f3518aa 100644
--- a/vcs/cvsservice/cvslogdialog.h
+++ b/vcs/cvsservice/cvslogdialog.h
@@ -26,8 +26,9 @@ Implementation for the form displaying 'cvs log' output.
 class CVSLogDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
+    CVSLogDialog( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 );
     virtual ~CVSLogDialog();
 
     void startLog( const TQString &workDir, const TQString &pathName );
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index c0ade68e..1f4b925e 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -32,9 +32,9 @@
 // class CVSLogPage
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int )
+CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int )
     : DCOPObject( "CvsLogPageDCOPIface" ),
-	TQWidget( parent, name? name : "logformpage" ),
+	TQWidget( tqparent, name? name : "logformpage" ),
     m_cvsService( cvsService ), m_cvsLogJob( 0 )
 {
     TQLayout *thisLayout = new TQVBoxLayout( this );
@@ -113,7 +113,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
 //    m_part->core()->running( m_part, false );
     if (!normalExit)
     {
-        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
+        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") );
         return;
     }
 
@@ -133,7 +133,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus )
             TQString dstr = "<b>" + s + "</b> ";
             int lastVer = ver.section( '.', -1 ).toInt() - 1;
             if ( lastVer > 0 ) {
-                TQString lv = ver.left( ver.findRev( "." ) + 1 ) + TQString::number( lastVer );
+                TQString lv = ver.left( ver.tqfindRev( "." ) + 1 ) + TQString::number( lastVer );
                 dstr += " [<a href=\"diff:/" + m_pathName + "/" + lv + "_" + ver + "\">diff to " + lv + "</a>]";
             }
             m_textBrowser->setTextFormat( TQTextBrowser::RichText );
@@ -172,7 +172,7 @@ void CVSLogPage::slotLinkClicked( const TQString &link )
     /// \FIXME in this way I lose the source
     m_textBrowser->setSource( m_logTextBackup );
 
-    TQString ver = link.mid( link.findRev( "/" ) + 1 );
+    TQString ver = link.mid( link.tqfindRev( "/" ) + 1 );
     TQString v1 = ver.section( '_', 0, 0 );
     TQString v2 = ver.section( '_', 1, 1 );
     if ( v1.isEmpty() || v2.isEmpty() )
diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h
index c4f27ee8..27fbd3d2 100644
--- a/vcs/cvsservice/cvslogpage.h
+++ b/vcs/cvsservice/cvslogpage.h
@@ -28,8 +28,9 @@ Implementation for the form displaying 'cvs log' output.
 class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 );
+    CVSLogPage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 );
     virtual ~CVSLogPage();
 
     void startLog( const TQString &workDir, const TQString &pathName );
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 43add3be..6f2894e6 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -24,9 +24,9 @@
 // Macros
 ///////////////////////////////////////////////////////////////////////////////
 
-#define default_revert          TQString::fromLatin1("-C")
-#define default_diff            TQString::fromLatin1("-p")
-#define default_rsh             TQString::fromLatin1("")
+#define default_revert          TQString::tqfromLatin1("-C")
+#define default_diff            TQString::tqfromLatin1("-p")
+#define default_rsh             TQString::tqfromLatin1("")
 #define default_contextLines    3
 #define default_compression     0
 
diff --git a/vcs/cvsservice/cvsoptionswidget.cpp b/vcs/cvsservice/cvsoptionswidget.cpp
index 32044dd3..eb66b773 100644
--- a/vcs/cvsservice/cvsoptionswidget.cpp
+++ b/vcs/cvsservice/cvsoptionswidget.cpp
@@ -24,8 +24,8 @@
 // class DiffDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-CvsOptionsWidget::CvsOptionsWidget( TQWidget *parent, const char *name )
-    : CvsOptionsWidgetBase( parent, name )
+CvsOptionsWidget::CvsOptionsWidget( TQWidget *tqparent, const char *name )
+    : CvsOptionsWidgetBase( tqparent, name )
 {
     readConfig();
 }
diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h
index 49039749..0dcfbba0 100644
--- a/vcs/cvsservice/cvsoptionswidget.h
+++ b/vcs/cvsservice/cvsoptionswidget.h
@@ -23,8 +23,9 @@ class TQVBoxLayout;
 class CvsOptionsWidget : public CvsOptionsWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CvsOptionsWidget( TQWidget *parent, const char *name=0 );
+    CvsOptionsWidget( TQWidget *tqparent, const char *name=0 );
     virtual ~CvsOptionsWidget();
 
     bool pruneEmptyDirWhenUpdating() const;
diff --git a/vcs/cvsservice/cvsoptionswidgetbase.ui b/vcs/cvsservice/cvsoptionswidgetbase.ui
index 4938ea4a..36cff3cd 100644
--- a/vcs/cvsservice/cvsoptionswidgetbase.ui
+++ b/vcs/cvsservice/cvsoptionswidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CvsOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>cvsOptionsWidget</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox4</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>m_rshLabel</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <string>Set this option to "ssh" to use ssh as remote shell for CVS. Note that you need password-less login (see the ssh documentation for how to generate a public/private key pair) otherwise CVS will just hang forever.</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -78,7 +78,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -89,7 +89,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>createNewDirWhenUpdateCheck</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <string>Create &amp;new directories (if any)</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>pruneEmptyDirWhenUpdateCheck</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <string>&amp;Prune empty directories</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>recursiveWhenUpdateCheck</cstring>
                     </property>
@@ -115,7 +115,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -126,7 +126,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>recursiveWhenCommitRemoveCheck</cstring>
                     </property>
@@ -136,7 +136,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -160,7 +160,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>m_diffLabel</cstring>
                     </property>
@@ -193,7 +193,7 @@
                         <number>65535</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -221,8 +221,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 30a8a700..c95d5e2e 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -80,8 +80,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
 // class CvsServicePart
 ///////////////////////////////////////////////////////////////////////////////
 
-CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
-	: KDevVersionControl( &data, parent,
+CvsServicePart::CvsServicePart( TQObject *tqparent, const char *name, const TQStringList & )
+	: KDevVersionControl( &data, tqparent,
 						  name ? name : "CvsService" ),
     actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
     actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ),
@@ -283,9 +283,9 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TQWidget* CvsServicePart::newProjectWidget( TQWidget *parent )
+TQWidget* CvsServicePart::newProjectWidget( TQWidget *tqparent )
 {
-    m_cvsConfigurationForm = new CvsForm( parent, "cvsform" );
+    m_cvsConfigurationForm = new CvsForm( tqparent, "cvsform" );
     return m_cvsConfigurationForm;
 }
 
@@ -321,47 +321,47 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context )
             popup->insertSeparator();
 
         int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
-        subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
         // CvsService let to do log and diff operations only on one file (or directory) at time
         if (m_urls.count() == 1)
         {
             id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
-            subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
+            subMenu->tqsetWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
             id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
-            subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
+            subMenu->tqsetWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
             id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) );
-            subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
+            subMenu->tqsetWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
         }
         id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) );
-        subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
         id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) );
-        subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
         id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) );
-        subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
         id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
-        subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
         id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) );
-        subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
         id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) );
-        subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
 
         subMenu->insertSeparator();
         id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) );
-        subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
         id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) );
-        subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
         id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
-        subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
         id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) );
-        subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
 
         subMenu->insertSeparator();
         id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
-        subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
         id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
-        subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
 
-        // Now insert in parent menu
+        // Now insert in tqparent menu
         popup->insertItem( i18n("CvsService"), subMenu );
 
         // If the current project doesn't support CVS, we don't
diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h
index b774d682..886d13b2 100644
--- a/vcs/cvsservice/cvspart.h
+++ b/vcs/cvsservice/cvspart.h
@@ -37,20 +37,21 @@ class CvsServicePartImpl;
 class CvsServicePart : public KDevVersionControl
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class CvsServicePartImpl;
 
 public:
     //! Standard constructor.
-    CvsServicePart( TQObject *parent, const char *name, const TQStringList & );
+    CvsServicePart( TQObject *tqparent, const char *name, const TQStringList & );
     //! Destructor.
     virtual ~CvsServicePart();
 
     /**
     * Returns the configuration widget (for properly configuring the project to
-    * use CVS), child of @p parent.
+    * use CVS), child of @p tqparent.
     */
-    virtual TQWidget *newProjectWidget( TQWidget *parent );
+    virtual TQWidget *newProjectWidget( TQWidget *tqparent );
     /**
     * Setup a directory tree for use with CVS.
     */
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index ca66e610..f038ac56 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -211,7 +211,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirect
             kdDebug(9006) << k_funcinfo << " Error: " << cvsdir.path() << " is not a valid CVS directory " << endl;
             return false;
         }
-        CVSEntry entry = cvsdir.fileStatus( url.fileName() );
+        CVSEntry entry = cvsdir.filetqStatus( url.fileName() );
         return entry.isValid();
     }
 }
@@ -318,7 +318,7 @@ KDevMainWindow *CvsServicePartImpl::mainWindow() const
 
 TQString CvsServicePartImpl::projectDirectory() const
 {
-    return m_part->project() ? m_part->project()->projectDirectory() : TQString::null;
+    return m_part->project() ? m_part->project()->projectDirectory() : TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -639,7 +639,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList )
         return;
     
     CVSDir cvsdir = CVSDir( urlList[0].directory() );
-    CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() );
+    CVSEntry entry = cvsdir.filetqStatus( urlList[0].fileName() );
 
     DiffDialog dlg(entry);
     if (dlg.exec() != TQDialog::Accepted)
@@ -971,7 +971,7 @@ void CvsServicePartImpl::slotCheckoutFinished( bool exitStatus, int )
         << exitStatus << endl;
     // Return a null string if the operation was not succesfull
     if (!exitStatus)
-        modulePath = TQString::null;
+        modulePath = TQString();
 
     kdDebug(9006) << "   I'll emit modulePath == " << modulePath << endl;
 
diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h
index 93da0ec3..18f791fd 100644
--- a/vcs/cvsservice/cvspartimpl.h
+++ b/vcs/cvsservice/cvspartimpl.h
@@ -41,11 +41,12 @@ class CVSFileInfoProvider;
 *
 * @author Mario Scalas
 */
-class CvsServicePartImpl : public QObject
+class CvsServicePartImpl : public TQObject
 {
     friend class CvsServicePart;
 
     Q_OBJECT
+  TQ_OBJECT
 public:
     //! Available Cvs operations
     enum CvsOperation
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index d2e78da6..550b76b5 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -43,13 +43,13 @@ int g_dcopErrCounter = 0;
 #endif
 
 
-CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *parent, const char *name )
+CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *tqparent, const char *name )
     : DCOPObject( "CvsProcessWidgetDCOPIface" ),
-    TQTextEdit( parent, name ),
+    TQTextEdit( tqparent, name ),
 	m_part( part ), m_service( service ), m_job( 0 )
 {
     setReadOnly( true );
-    setTextFormat( Qt::LogText );
+    setTextFormat( TQt::LogText );
 
     TQStyleSheetItem *style = 0;
     style = new TQStyleSheetItem( styleSheet(), "goodtag" );
@@ -106,8 +106,8 @@ bool CvsProcessWidget::isAlreadyWorking() const
 void CvsProcessWidget::clear()
 {
     TQTextEdit::clear();
-    this->m_errors = TQString::null;
-    this->m_output = TQString::null;
+    this->m_errors = TQString();
+    this->m_output = TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -142,7 +142,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob )
     // disconnect 3rd party slots from our signals
     disconnect( TQT_SIGNAL(jobFinished(bool, int)) );
 
-    showInfo( i18n("Started job: %1").arg( cmdLine ) );
+    showInfo( i18n("Started job: %1").tqarg( cmdLine ) );
 
 #ifdef MYDCOPDEBUG
     g_dcopExitCounter = 0;
@@ -187,7 +187,7 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
         m_job = 0;
     }
     TQString exitMsg = i18n("Job finished with exitCode == %1");
-    showInfo( exitMsg.arg( exitStatus) );
+    showInfo( exitMsg.tqarg( exitStatus) );
 
     m_part->core()->running( m_part, false );
     m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 );
@@ -264,9 +264,9 @@ void CvsProcessWidget::showOutput( const TQStringList &msg )
         //This will prevent TQTextEdit from crashing on trying to parse the tags.
         //This should fix BUG:99590
         TQString lineNew(line);
-        lineNew.replace("<", "&lt;");
-        lineNew.replace(">", "&gt;");
-        lineNew.replace("&", "&amp;");
+        lineNew.tqreplace("<", "&lt;");
+        lineNew.tqreplace(">", "&gt;");
+        lineNew.tqreplace("&", "&amp;");
 
         if (line.startsWith( "C " ))
             append( "<cvs_conflict>" + lineNew + "</cvs_conflict>" );
diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h
index 81e34f04..2377ee97 100644
--- a/vcs/cvsservice/cvsprocesswidget.h
+++ b/vcs/cvsservice/cvsprocesswidget.h
@@ -27,9 +27,10 @@ class TQStyleSheetItem;
 class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     CvsProcessWidget( CvsService_stub *service, CvsServicePart *part,
-        TQWidget *parent, const char *name );
+        TQWidget *tqparent, const char *name );
     virtual ~CvsProcessWidget();
 
     bool startJob( const DCOPRef &aJob );
diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp
index 9d592c8b..fd4ca8ef 100644
--- a/vcs/cvsservice/diffdialog.cpp
+++ b/vcs/cvsservice/diffdialog.cpp
@@ -20,8 +20,8 @@
 // class DiffDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *parent, const char *name, WFlags f )
-    : DiffDialogBase( parent, name, true, f)
+DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *tqparent, const char *name, WFlags f )
+    : DiffDialogBase( tqparent, name, true, f)
 {
     m_entry = entry;
     TQString currentRevision = entry.revision();
@@ -62,7 +62,7 @@ TQString DiffDialog::revA() const
     else  if (requestedDiff() == diffLocalHEAD)
         return "HEAD";
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@ TQString DiffDialog::revB() const
     if (requestedDiff())
         return this->revbEdit->text();
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ void DiffDialog::languageChange() {
     
     //FIXME:  We need a function in CVSEntry to return the latest revision there is in cvs
 //    if(!m_entry.revision().isNull())
-//      diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).arg( m_entry.revision()) );
+//      diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).tqarg( m_entry.revision()) );
 }
 
 #include "diffdialog.moc"
diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h
index 3caa66cf..8870ff1e 100644
--- a/vcs/cvsservice/diffdialog.h
+++ b/vcs/cvsservice/diffdialog.h
@@ -23,8 +23,9 @@
 class DiffDialog : public DiffDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    DiffDialog(const CVSEntry &entry, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~DiffDialog();
 
     TQString revA() const;
diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui
index 0290c530..d04a9a68 100644
--- a/vcs/cvsservice/diffdialogbase.ui
+++ b/vcs/cvsservice/diffdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DiffDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DiffDialog</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -33,15 +33,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="2" column="0">
+                <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>diffLocalOtherRadio</cstring>
                             </property>
@@ -59,7 +59,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>diffArbitraryRevRadio</cstring>
                     </property>
@@ -67,15 +67,15 @@
                         <string>&amp;Two arbitrary revisions/tags:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="4" column="0">
+                <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -116,7 +116,7 @@
                                 <string>First revision to compare</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -134,7 +134,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>diffLocalHeadRadio</cstring>
                     </property>
@@ -142,7 +142,7 @@
                         <string>Local cop&amp;y and HEAD</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>diffLocalBaseRadio</cstring>
                     </property>
@@ -169,9 +169,9 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -187,14 +187,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -211,7 +211,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -271,5 +271,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index 87f8494f..8c5c53c6 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -39,7 +39,7 @@ static const int POPUP_BASE = 130977;
 TQStringList KDiffTextEdit::extParts;
 TQStringList KDiffTextEdit::extPartsTranslated;
 
-KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
+KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name )
 {
   KConfig* config = kapp->config();
   config->setGroup( "Diff" );
@@ -70,7 +70,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
   int i = 0;
 
   for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
-    popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
+    popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i );
     i++;
   }
   if ( !extPartsTranslated.isEmpty() )
@@ -174,8 +174,8 @@ void KDiffTextEdit::popupActivated( int id )
   emit externalPartRequested( extParts[ id ] );
 }
 
-DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ):
-    TQWidget( parent, name, f ), tempFile( 0 )
+DiffWidget::DiffWidget( TQWidget *tqparent, const char *name, WFlags f ):
+    TQWidget( tqparent, name, f ), tempFile( 0 )
 {
   job = 0;
   extPart = 0;
@@ -186,8 +186,8 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ):
 //  te->setMinimumSize( 300, 200 );
   connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
 
-  TQVBoxLayout* layout = new TQVBoxLayout( this );
-  layout->addWidget( te );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+  tqlayout->addWidget( te );
 }
 
 DiffWidget::~DiffWidget()
@@ -222,11 +222,11 @@ void DiffWidget::loadExtPart( const TQString& partName )
   if ( !extService )
     return;
 
-  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 );
+  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 );
   if ( !extPart || !extPart->widget() )
     return;
 
-  layout()->add( extPart->widget() );
+  tqlayout()->add( extPart->widget() );
 
   setExtPartVisible( true );
 
diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h
index 37bed7ea..48b6447d 100644
--- a/vcs/cvsservice/diffwidget.h
+++ b/vcs/cvsservice/diffwidget.h
@@ -29,11 +29,12 @@ namespace KParts {
 }
 
 // Helper class that displays a modified RMB popup menu
-class KDiffTextEdit: public QTextEdit
+class KDiffTextEdit: public TQTextEdit
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 );
+  KDiffTextEdit( TQWidget* tqparent = 0, const char* name = 0 );
   virtual ~KDiffTextEdit();
   void applySyntaxHighlight();
   void clearSyntaxHighlight();
@@ -57,12 +58,13 @@ private:
   bool _highlight;
 };
 
-class DiffWidget : public QWidget
+class DiffWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DiffWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    DiffWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
     virtual ~DiffWidget();
 
 public slots:
diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp
index 5f26d100..9b796254 100644
--- a/vcs/cvsservice/editorsdialog.cpp
+++ b/vcs/cvsservice/editorsdialog.cpp
@@ -24,8 +24,8 @@
 #include <cvsjob_stub.h>
 #include <cvsservice_stub.h>
 
-EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *parent, const char *name)
-    : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, TRUE, Qt::WDestructiveClose),
+EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *tqparent, const char *name)
+    : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(tqparent, name, TRUE, TQt::WDestructiveClose),
       m_cvsService(cvsService), m_cvsJob(0)
 {
 }
@@ -61,7 +61,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus )
 {
     if (!normalExit)
     {
-        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") );
+        KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") );
         return;
     }
 
@@ -121,7 +121,7 @@ void EditorsDialog::slotReceivedOutput( TQString someOutput )
 {
     kdDebug(9006) << "OUTPUT: " << someOutput << endl;
 
-    m_output += someOutput; //append the whole output into one large QStrin
+    m_output += someOutput; //append the whole output into one large TQStrin
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h
index 0d0fc287..ffb8b555 100644
--- a/vcs/cvsservice/editorsdialog.h
+++ b/vcs/cvsservice/editorsdialog.h
@@ -22,8 +22,9 @@ class TQStringList;
 class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIface
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0);
+    EditorsDialog(CvsService_stub *cvsService, TQWidget *tqparent = 0, const char *name = 0);
     virtual ~EditorsDialog();
     
     void startjob(TQString strDir);
diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui
index b0cb925a..546224f8 100644
--- a/vcs/cvsservice/editorsdialogbase.ui
+++ b/vcs/cvsservice/editorsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>EditorsDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>EditorsDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,14 +46,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -69,7 +69,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTextBrowser" row="0" column="0">
+        <widget class="TQTextBrowser" row="0" column="0">
             <property name="name">
                 <cstring>m_textBrowser</cstring>
             </property>
@@ -84,5 +84,5 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am
index 7768aad5..fd1d6922 100644
--- a/vcs/cvsservice/integrator/Makefile.am
+++ b/vcs/cvsservice/integrator/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util \
-	$(all_includes)
+	$(all_includes) -I$(kde_includes)/kde
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libcvsserviceintegrator.la
 libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
index 1bbc3b11..13cc370e 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
@@ -28,9 +28,9 @@ static const KDevPluginInfo data("kdevcvsserviceintegrator");
 typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) )
 
-CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, 
+CVSServiceIntegrator::CVSServiceIntegrator(TQObject* tqparent, const char* name, 
     const TQStringList args)
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -38,14 +38,14 @@ CVSServiceIntegrator::~CVSServiceIntegrator( )
 {
 }
 
-VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* parent)
+VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* tqparent)
 {
     return 0;
 }
 
-VCSDialog* CVSServiceIntegrator::integrator(TQWidget* parent)
+VCSDialog* CVSServiceIntegrator::integrator(TQWidget* tqparent)
 {
-    IntegratorDlg *dlg = new IntegratorDlg(this, parent);
+    IntegratorDlg *dlg = new IntegratorDlg(this, tqparent);
     return dlg;
 }
 
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h
index c02547a4..02c94430 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.h
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h
@@ -26,12 +26,13 @@
 
 class CVSServiceIntegrator: public KDevVCSIntegrator {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    CVSServiceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     virtual ~CVSServiceIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
     
 };
 
diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui
index be0556c2..caf30c0d 100644
--- a/vcs/cvsservice/integrator/fetcherdlgbase.ui
+++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>FetcherDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FetcherDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>module</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1_2_2</cstring>
             </property>
@@ -54,7 +54,7 @@
                 <cstring>comboBox5</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <cstring>repository</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>repository</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>pushButton2</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>Fetch &amp;List</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <cstring>module</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>comboBox5</cstring>
             </property>
@@ -134,7 +134,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -149,5 +149,5 @@
     <tabstop>pushButton2</tabstop>
     <tabstop>comboBox5</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui
index 1b36ecfb..c4d0cc4a 100644
--- a/vcs/cvsservice/integrator/initdlg.ui
+++ b/vcs/cvsservice/integrator/initdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>InitDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>InitDlg</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1_2_2_2</cstring>
             </property>
@@ -53,7 +53,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -62,7 +62,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 32184c45..3561f7ad 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -40,8 +40,8 @@
 
 #include "initdlg.h"
 
-IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent, const char *name)
-    :IntegratorDlgBase(parent, name), m_integrator(integrator)
+IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent, const char *name)
+    :IntegratorDlgBase(tqparent, name), m_integrator(integrator)
 {
     TQFile cvspass(TQDir::homeDirPath() + "/.cvspass");
     if (cvspass.open(IO_ReadOnly))
@@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked()
         if (!proc->normalExit())
             KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
         else if (proc->exitStatus() != 0)
-            KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
+            KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
         else
         {
-            repository->insertItem(TQString(":local:%1").arg(url));
-            repository->setCurrentText(TQString(":local:%1").arg(url));
+            repository->insertItem(TQString(":local:%1").tqarg(url));
+            repository->setCurrentText(TQString(":local:%1").tqarg(url));
         }
     }
 }
@@ -122,13 +122,13 @@ void IntegratorDlg::accept()
     proc->setWorkingDirectory(m_projectLocation);
     *proc << "cvs";
     *proc << "-d" << repository->currentText() << "import"
-        << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
+        << "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text()
         << vendorTag->text() << releaseTag->text();
     proc->start(KProcess::Block);
     if (!proc->normalExit())
         KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
     else if (proc->exitStatus() != 0)
-        KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
+        KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
     else
     {
         kdDebug() << "Project is in: " << m_projectLocation << endl;
diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h
index 5a9ab3a8..72ae30fd 100644
--- a/vcs/cvsservice/integrator/integratordlg.h
+++ b/vcs/cvsservice/integrator/integratordlg.h
@@ -27,8 +27,9 @@ class TQDomDocument;
 
 class IntegratorDlg: public IntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0);
+    IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent = 0, const char *name = 0);
 
     virtual TQWidget *self();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui
index e17f44e1..a20b7a75 100644
--- a/vcs/cvsservice/integrator/integratordlgbase.ui
+++ b/vcs/cvsservice/integrator/integratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>IntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>IntegratorDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>createModule</cstring>
             </property>
@@ -27,9 +27,9 @@
                 <string>Create module in the repository</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -46,7 +46,7 @@
                         <string>vendor</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="4">
+                <widget class="TQPushButton" row="1" column="4">
                     <property name="name">
                         <cstring>init</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>repository</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="3">
+                <widget class="TQPushButton" row="1" column="3">
                     <property name="name">
                         <cstring>login</cstring>
                     </property>
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -135,7 +135,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>moduleLabel</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <cstring>module</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>vendorLabel</cstring>
                     </property>
@@ -179,7 +179,7 @@
                         <cstring>vendorTag</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>releaseLabel</cstring>
                     </property>
@@ -201,7 +201,7 @@
                         <cstring>releaseTag</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>commentLabel</cstring>
                     </property>
@@ -223,7 +223,7 @@
                         <cstring>comment</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>repositoryLabel</cstring>
                     </property>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -389,10 +389,10 @@
     <tabstop>login</tabstop>
     <tabstop>init</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>init_clicked()</slot>
     <slot>login_clicked()</slot>
     <slot>createModule_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/releaseinputdialog.cpp b/vcs/cvsservice/releaseinputdialog.cpp
index 91685a29..83df254c 100644
--- a/vcs/cvsservice/releaseinputdialog.cpp
+++ b/vcs/cvsservice/releaseinputdialog.cpp
@@ -20,8 +20,8 @@
 // class ReleaseInputDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-ReleaseInputDialog::ReleaseInputDialog( TQWidget* parent)
-    : ReleaseInputDialogBase( parent, "releaseinputdialog", true, 0 )
+ReleaseInputDialog::ReleaseInputDialog( TQWidget* tqparent)
+    : ReleaseInputDialogBase( tqparent, "releaseinputdialog", true, 0 )
 {
 }
 
@@ -47,7 +47,7 @@ TQString ReleaseInputDialog::release() const
     else if (type() == byDate)
         return " -D " + dateEdit->text();
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h
index e00b0b04..ef8757bb 100644
--- a/vcs/cvsservice/releaseinputdialog.h
+++ b/vcs/cvsservice/releaseinputdialog.h
@@ -21,13 +21,14 @@
 class ReleaseInputDialog : public ReleaseInputDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
     * C-tor
-    * @param parent
+    * @param tqparent
     */
-    ReleaseInputDialog( TQWidget* parent = 0 );
+    ReleaseInputDialog( TQWidget* tqparent = 0 );
     /**
     * Destructor
     */
diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui
index be5bf136..b56ab9ad 100644
--- a/vcs/cvsservice/releaseinputdialogbase.ui
+++ b/vcs/cvsservice/releaseinputdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ReleaseInputDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ReleaseInputDialogBase</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -37,14 +37,14 @@
             <property name="title">
                 <string>Revision</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>headRadio</cstring>
                     </property>
@@ -55,15 +55,15 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>revisionRadio</cstring>
                             </property>
@@ -90,15 +90,15 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>dateRadio</cstring>
                             </property>
@@ -121,7 +121,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -132,7 +132,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>revertCheck</cstring>
                     </property>
@@ -156,9 +156,9 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -174,14 +174,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>140</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -198,7 +198,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -242,5 +242,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/tagdialog.cpp b/vcs/cvsservice/tagdialog.cpp
index 33aca057..b3d3a42e 100644
--- a/vcs/cvsservice/tagdialog.cpp
+++ b/vcs/cvsservice/tagdialog.cpp
@@ -18,8 +18,8 @@
 // class TagDialog
 ///////////////////////////////////////////////////////////////////////////////
 
-TagDialog::TagDialog( const TQString &caption, TQWidget *parent, const char *name )
-    : TagDialogBase( parent, name ? name : "tagdialog", true )
+TagDialog::TagDialog( const TQString &caption, TQWidget *tqparent, const char *name )
+    : TagDialogBase( tqparent, name ? name : "tagdialog", true )
 {
     if (!caption.isEmpty())
     {
diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h
index 6c34cfe9..e58b912d 100644
--- a/vcs/cvsservice/tagdialog.h
+++ b/vcs/cvsservice/tagdialog.h
@@ -23,8 +23,9 @@
 class TagDialog : public TagDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 );
+    TagDialog( const TQString &caption, TQWidget *tqparent = 0, const char *name = 0 );
     virtual ~TagDialog();
 
     /**
diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui
index ce816c2d..db85f0cc 100644
--- a/vcs/cvsservice/tagdialogbase.ui
+++ b/vcs/cvsservice/tagdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>TagDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TagDialogBase</cstring>
     </property>
@@ -22,15 +22,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -48,7 +48,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>tagAsBranchCheck</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <string>Tag as &amp;branch</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>forceCheck</cstring>
             </property>
@@ -81,9 +81,9 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -99,14 +99,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>200</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -155,5 +155,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index a6aa98b9..2f119ed2 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -28,8 +28,8 @@
 
 #include "execcommand.h"
 
-CommitDialog::CommitDialog( TQWidget *parent, const char *name )
-    : KDialogBase( parent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details )
+CommitDialog::CommitDialog( TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details )
 {
     TQWidget *w = new TQWidget( this, "main widget" );
     setMainWidget( w );
@@ -38,11 +38,11 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name )
     TQFontMetrics fm(edit->fontMetrics());
     edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
 
-    TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
     TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w);
     editLabel->setBuddy(edit);
-    layout->addWidget(editLabel);
-    layout->addWidget(edit);
+    tqlayout->addWidget(editLabel);
+    tqlayout->addWidget(edit);
 
     w = new TQWidget( this, "details widget" );
 
@@ -50,19 +50,19 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name )
     userEdit = new KLineEdit( w );
     filesBox = new KListBox( w );
 
-    layout = new TQVBoxLayout( w, 0, spacingHint() );
+    tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
     TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w);
     clientLabel->setBuddy(clientEdit);
-    layout->addWidget(clientLabel);
-    layout->addWidget( clientEdit );
+    tqlayout->addWidget(clientLabel);
+    tqlayout->addWidget( clientEdit );
     TQLabel *userLabel = new TQLabel(i18n("&User:"), w);
     userLabel->setBuddy(userEdit);
-    layout->addWidget( userLabel );
-    layout->addWidget( userEdit );
+    tqlayout->addWidget( userLabel );
+    tqlayout->addWidget( userEdit );
     TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w);
     filesLabel->setBuddy(filesBox);
-    layout->addWidget( filesLabel );
-    layout->addWidget( filesBox );
+    tqlayout->addWidget( filesLabel );
+    tqlayout->addWidget( filesBox );
 
     setDetailsWidget( w );
     autoGuess();
@@ -103,7 +103,7 @@ void CommitDialog::setDepotFiles( const TQStringList& lst )
         args << (*it);
     }
 
-    ExecCommand* cmd = new ExecCommand( "p4", args, TQString::null, TQStringList(), this );
+    ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), TQT_TQOBJECT(this) );
     connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )),
 	     this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) );
 }
@@ -112,7 +112,7 @@ void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err
 {
     TQStringList lst = TQStringList::split( TQChar('\n'), out );
     for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
-        int pos = (*it).find( TQChar('#') );
+        int pos = (*it).tqfind( TQChar('#') );
         if ( pos > 1 && (*it).startsWith( "//" ) ) {
             filesBox->insertItem( (*it).left( pos ) );
         }
@@ -126,10 +126,10 @@ TQString CommitDialog::changeList() const
     lst += "Change: new\n"
            "Client: " + client() + "\n"
            "User: " + user() + "\n"
-           "Status: new\n"
+           "tqStatus: new\n"
            "Description:\n        ";
 
-    lst += logMessage().replace(TQRegExp("\n"), "\n        ") + "\n\n";
+    lst += logMessage().tqreplace(TQRegExp("\n"), "\n        ") + "\n\n";
 
     lst += "Files:\n";
 
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 09a9c72f..ddca48a2 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -24,8 +24,9 @@ class KProcess;
 class CommitDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CommitDialog( TQWidget *parent = 0, const char *name = 0 );
+    CommitDialog( TQWidget *tqparent = 0, const char *name = 0 );
     ~CommitDialog();
 
     TQString logMessage() const { return edit->text(); }
diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp
index bc7c0988..ec9802c9 100644
--- a/vcs/perforce/integrator/perforceintegrator.cpp
+++ b/vcs/perforce/integrator/perforceintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevperforceintegrator");
 typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) )
 
-PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name,
+PerforceIntegrator::PerforceIntegrator(TQObject* tqparent, const char* name,
     const TQStringList // args
                                        )
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -39,15 +39,15 @@ PerforceIntegrator::~PerforceIntegrator()
 {
 }
 
-VCSDialog* PerforceIntegrator::fetcher(TQWidget* // parent
+VCSDialog* PerforceIntegrator::fetcher(TQWidget* // tqparent
                                        )
 {
     return 0;
 }
 
-VCSDialog* PerforceIntegrator::integrator(TQWidget* parent)
+VCSDialog* PerforceIntegrator::integrator(TQWidget* tqparent)
 {
-    PFIntegratorDlg *dlg = new PFIntegratorDlg(parent);
+    PFIntegratorDlg *dlg = new PFIntegratorDlg(tqparent);
     return dlg;
 }
 
diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h
index 1d047826..b76f8de8 100644
--- a/vcs/perforce/integrator/perforceintegrator.h
+++ b/vcs/perforce/integrator/perforceintegrator.h
@@ -27,12 +27,13 @@
 class PerforceIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    PerforceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~PerforceIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
 
 };
 
diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp
index 8685b2f4..90e66923 100644
--- a/vcs/perforce/integrator/pfintegratordlg.cpp
+++ b/vcs/perforce/integrator/pfintegratordlg.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "pfintegratordlg.h"
 
-PFIntegratorDlg::PFIntegratorDlg(TQWidget *parent, const char *name)
-    :PFIntegratorDlgBase(parent, name)
+PFIntegratorDlg::PFIntegratorDlg(TQWidget *tqparent, const char *name)
+    :PFIntegratorDlgBase(tqparent, name)
 {
 }
 
diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h
index 750795b6..a4f515bf 100644
--- a/vcs/perforce/integrator/pfintegratordlg.h
+++ b/vcs/perforce/integrator/pfintegratordlg.h
@@ -25,8 +25,9 @@
 
 class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+    PFIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
     
     virtual void accept();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/perforce/integrator/pfintegratordlgbase.ui b/vcs/perforce/integrator/pfintegratordlgbase.ui
index 5b12a70f..8a5795a8 100644
--- a/vcs/perforce/integrator/pfintegratordlgbase.ui
+++ b/vcs/perforce/integrator/pfintegratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PFIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PFIntegratorDlgBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>435</height>
@@ -43,5 +43,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index cb3d7ba9..406de1f8 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -38,8 +38,8 @@ static const KDevPluginInfo data("kdevperforce");
 typedef KDevGenericFactory<PerforcePart> PerforceFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
 
-PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
-    : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
+PerforcePart::PerforcePart( TQObject *tqparent, const char *name, const TQStringList & )
+    : KDevVersionControl( &data, tqparent, name ? name : "PerforcePart" )
 {
     setInstance(PerforceFactory::instance());
     setupActions();
@@ -94,30 +94,30 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
         KPopupMenu *sub = new KPopupMenu(popup);
         TQString name = fi.fileName();
-        sub->insertTitle( i18n("Actions for %1").arg(name) );
+        sub->insertTitle( i18n("Actions for %1").tqarg(name) );
 
         int id = sub->insertItem( i18n("Edit"),
                            this, TQT_SLOT(slotEdit()) );
-        sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
+        sub->tqsetWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
         id = sub->insertItem( i18n("Revert"),
                            this, TQT_SLOT(slotRevert()) );
-        sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
+        sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
         id = sub->insertItem( i18n("Submit"),
                            this, TQT_SLOT(slotCommit()) );
-        sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
         id = sub->insertItem( i18n("Sync"),
                            this, TQT_SLOT(slotUpdate()) );
-        sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
+        sub->tqsetWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
         sub->insertSeparator();
         id = sub->insertItem( i18n("Diff Against Repository"),
                           this, TQT_SLOT(slotDiff()) );
-        sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
         id = sub->insertItem( i18n("Add to Repository"),
                            this, TQT_SLOT(slotAdd()) );
-        sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
         id = sub->insertItem( i18n("Remove From Repository"),
                            this, TQT_SLOT(slotRemove()) );
-        sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
+        sub->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
         id = popup->insertItem(i18n("Perforce"), sub);
     }
 }
@@ -153,7 +153,7 @@ void PerforcePart::revert( const TQString& filename )
 {
     if ( KMessageBox::questionYesNo( 0,
             i18n("Do you really want to revert "
-                 "the file %1 and lose all your changes?").arg( filename ), TQString::null, i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
+                 "the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) {
         execCommand( "revert", filename );
     }
 }
@@ -242,7 +242,7 @@ void PerforcePart::diff( const TQString& filename )
     args << "diff";
     args << "-du";
     args << name;
-    ExecCommand* cmv = new ExecCommand( "p4", args, TQString::null, TQStringList(), this );
+    ExecCommand* cmv = new ExecCommand( "p4", args, TQString(), TQStringList(), this );
     connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )),
              this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) );
 }
@@ -275,7 +275,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
     static TQRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" );
     rx.setMinimal( true );
     TQString strippedDiff = diff;
-    strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
+    strippedDiff.tqreplace( rx, "--- \\2\n+++ \\2\n" );
 
     if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
@@ -289,7 +289,7 @@ TQString PerforcePart::currentFile()
         if ( url.isLocalFile() )
             return url.path();
     }
-    return TQString::null;
+    return TQString();
 }
 
 void PerforcePart::slotActionCommit()
diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h
index e5d2da9b..18994e0d 100644
--- a/vcs/perforce/perforcepart.h
+++ b/vcs/perforce/perforcepart.h
@@ -23,9 +23,10 @@ class KAction;
 class PerforcePart : public KDevVersionControl
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PerforcePart( TQObject *parent, const char *name, const TQStringList & );
+    PerforcePart( TQObject *tqparent, const char *name, const TQStringList & );
     ~PerforcePart();
 
     virtual TQString shortDescription() const
diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp
index c456f7c2..df519d02 100644
--- a/vcs/subversion/commitdlg.cpp
+++ b/vcs/subversion/commitdlg.cpp
@@ -22,8 +22,8 @@
 #include <tqevent.h>
 #include <ktextedit.h>
 
-CommitDlg::CommitDlg( TQWidget* parent )
-    : CommitDlgBase( parent )
+CommitDlg::CommitDlg( TQWidget* tqparent )
+    : CommitDlgBase( tqparent )
 {
     textMessage->installEventFilter(this);
 }
@@ -32,8 +32,8 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev )
 {
     if( ev->type() == TQEvent::KeyPress )
     {
-        TQKeyEvent* k = static_cast<TQKeyEvent*>(ev);
-        if( ( k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter ) && k->state() == Qt::ControlButton )
+        TQKeyEvent* k = TQT_TQKEYEVENT(ev);
+        if( ( k->key() == TQt::Key_Return || k->key() == TQt::Key_Enter ) && k->state() == TQt::ControlButton )
         {
             accept();
             return true;
@@ -44,4 +44,4 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev )
 
 #include "commitdlg.moc"
 
-//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
+//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h
index da63e2f5..f940511c 100644
--- a/vcs/subversion/commitdlg.h
+++ b/vcs/subversion/commitdlg.h
@@ -26,6 +26,7 @@
 class CommitDlg : public CommitDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     CommitDlg( TQWidget* = 0 );
 protected:
@@ -34,4 +35,4 @@ protected:
 
 #endif
 
-//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
+//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui
index 76499a60..a36bf402 100644
--- a/vcs/subversion/commitdlgbase.ui
+++ b/vcs/subversion/commitdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CommitDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CommitDlgBase</cstring>
     </property>
@@ -19,9 +19,9 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -40,9 +40,9 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -58,14 +58,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>220</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pushButton1</cstring>
                             </property>
@@ -73,7 +73,7 @@
                                 <string>&amp;OK</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pushButton2</cstring>
                             </property>
@@ -103,7 +103,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
     <includehint>ktextedit.h</includehint>
diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp
index 32d28d27..8c0c4ef9 100644
--- a/vcs/subversion/integrator/subversionintegrator.cpp
+++ b/vcs/subversion/integrator/subversionintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevsubversionintegrator");
 typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) )
 
-SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name,
+SubversionIntegrator::SubversionIntegrator(TQObject* tqparent, const char* name,
     const TQStringList // args
                                            )
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -39,15 +39,15 @@ SubversionIntegrator::~SubversionIntegrator()
 {
 }
 
-VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent
+VCSDialog* SubversionIntegrator::fetcher(TQWidget* // tqparent
                                          )
 {
     return 0;
 }
 
-VCSDialog* SubversionIntegrator::integrator(TQWidget* parent)
+VCSDialog* SubversionIntegrator::integrator(TQWidget* tqparent)
 {
-    SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent);
+    SvnIntegratorDlg *dlg = new SvnIntegratorDlg(tqparent);
     return dlg;
 }
 
diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h
index e9b62d70..d5ae7fad 100644
--- a/vcs/subversion/integrator/subversionintegrator.h
+++ b/vcs/subversion/integrator/subversionintegrator.h
@@ -27,12 +27,13 @@
 class SubversionIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    SubversionIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~SubversionIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
 
 };
 
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index 05572278..cc074f8b 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -38,8 +38,8 @@
 
 using namespace KIO;
 
-SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name )
-        : SvnIntegratorDlgBase( parent, name )
+SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *tqparent, const char *name )
+        : SvnIntegratorDlgBase( tqparent, name )
 {
     repos1->setMode( KFile::Directory );
 }
diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h
index f76cf95f..3e464f3e 100644
--- a/vcs/subversion/integrator/svnintegratordlg.h
+++ b/vcs/subversion/integrator/svnintegratordlg.h
@@ -25,8 +25,9 @@
 
 class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+    SvnIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
     
     virtual void accept();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui
index a2ec9982..27c1fc76 100644
--- a/vcs/subversion/integrator/svnintegratordlgbase.ui
+++ b/vcs/subversion/integrator/svnintegratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SvnIntegratorDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>doNothing</cstring>
                     </property>
@@ -72,7 +72,7 @@ out of kdevelop, you will not be able
 to perform any subversion operations.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>createProject</cstring>
                     </property>
@@ -94,7 +94,7 @@ NOTE: The repository has to exist.
 e.g. has been created with 'svnadmin'</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -103,15 +103,15 @@ e.g. has been created with 'svnadmin'</string>
 file:///home/user/subversion/mynewproject</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>repositoryLabel1</cstring>
                             </property>
@@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>21</width>
                             <height>131</height>
@@ -181,7 +181,7 @@ http://localhost/svn/projectname/trunk</string>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index 7b4a42d3..b83959e8 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -55,7 +55,7 @@ TQString KDevSvnd::commitDialog(TQString modifiedFiles) {
 	if ( result == TQDialog::Accepted ) {
 		return commitDlg.textMessage->text();
 	} else
-		return TQString::null;
+		return TQString();
 }
 int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
 {
@@ -71,7 +71,7 @@ int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString
 }
 TQString KDevSvnd::sslCertFile()
 {
-	TQString fileName = KFileDialog::getOpenFileName(TQString::null,TQString::null,0, i18n("Open SSL certificate file"));
+	TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file"));
 	return fileName;
 }
 TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
@@ -239,9 +239,9 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	return false;
 // }
 //
-// int KSvnd::getStatus( const KURL::List& list ) {
+// int KSvnd::gettqStatus( const KURL::List& list ) {
 // 	int result = 0;
-// 	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
+// 	uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0;
 // 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
 // 		if ( isFolder ( ( *it ) ) ) {
 // 			folders++;
@@ -249,7 +249,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 			files++;
 // 		}
 // 		if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy
-// 			parentsentries++;
+// 			tqparentsentries++;
 // 		} else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all)
 // 			if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) )
 // 				subdirhavesvn++;
@@ -257,8 +257,8 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 				external++;
 // 			}
 // 		}
-// 		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
-// 			parentshavesvn++;
+// 		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
+// 			tqparentshavesvn++;
 // 	}
 // 	if ( files > 0 )
 // 		result |= SomeAreFiles;
@@ -268,15 +268,15 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	}
 // 	if ( folders > 0 )
 // 		result |= SomeAreFolders;
-// 	if ( parentsentries == list.count() ) {
+// 	if ( tqparentsentries == list.count() ) {
 // 		result |= AllAreInParentsEntries;
 // 		result |= SomeAreInParentsEntries;
-// 	} else if ( parentsentries != 0 )
+// 	} else if ( tqparentsentries != 0 )
 // 		result |= SomeAreInParentsEntries;
-// 	if ( parentshavesvn == list.count() ) {
+// 	if ( tqparentshavesvn == list.count() ) {
 // 		result |= AllParentsHaveSvn;
 // 		result |= SomeParentsHaveSvn;
-// 	} else if ( parentshavesvn > 0 )
+// 	} else if ( tqparentshavesvn > 0 )
 // 		result |= SomeParentsHaveSvn;
 // 	if ( subdirhavesvn == list.count() ) {
 // 		result |= AllHaveSvn;
@@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 // 	TQStringList result;
-// 	int listStatus = getStatus( list );
+// 	int listtqStatus = gettqStatus( list );
 //
-// 	if ( !(listStatus & SomeAreInParentsEntries) &&
-// 	     !(listStatus & SomeAreExternalToParent) &&
-// 	     !(listStatus & SomeHaveSvn)) {
-// 		if( list.size() == 1 && listStatus & SomeAreFolders) {
+// 	if ( !(listtqStatus & SomeAreInParentsEntries) &&
+// 	     !(listtqStatus & SomeAreExternalToParent) &&
+// 	     !(listtqStatus & SomeHaveSvn)) {
+// 		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
 // 			result << "Checkout";
 // 			result << "Export";
 // //			result << "CreateRepository";
 // 			result << "Import";
 // 		}
-// 	} else if ( (listStatus & AllAreInParentsEntries) ) {
+// 	} else if ( (listtqStatus & AllAreInParentsEntries) ) {
 // 		result << "Diff";
 // 		//In SVN
 // //		result << "ShowLog";
@@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "Update to revision..."
 // 		result << "Rename";
 // 		result << "Delete";
-// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
+// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
 // 			result << "Revert";
 // //			result << "Cleanup";
 // 		}
@@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "BranchTag";
 // 		result << "Switch";
 // 		result << "Merge";
-// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
+// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
 // //			result << "Export";
 // //			result << "Relocate";
 // 			result << "_SEPARATOR_";
 // 			result << "Add";
 // 		}
 // 		result << "_SEPARATOR_";
-// 		if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
+// 		if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
 // 			result << "Blame";
 // 		}
 // 		result << "CreatePatch";
 //
-// 		if( list.size() == 1 && listStatus & SomeAreFolders) {
+// 		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
 // //			result << "ApplyPatchToFolder";
 // 		}
 // 	}
@@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
 // 	TQStringList result;
-// 	int listStatus = getStatus( list );
+// 	int listtqStatus = gettqStatus( list );
 //
 //
-// 	if ( ( listStatus & AllParentsHaveSvn &&
-// 			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
-// 				|| ( listStatus & SomeHaveSvn ) )
+// 	if ( ( listtqStatus & AllParentsHaveSvn &&
+// 			( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
+// 				|| ( listtqStatus & SomeHaveSvn ) )
 // 		) {
 // 		result << "Update";
 // 		result << "Commit";
@@ -382,7 +382,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	TQDataStream stream(params, IO_WriteOnly);
 // 	stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev;
 //
-// 	emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params );
+// 	emitDCOPSignal( "subversiontqStatus(TQString,int,int,int,int,long int)", params );
 // }
 //
 // void KSvnd::popupMessage( const TQString& message ) {
diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h
index 07943c18..4d292b02 100644
--- a/vcs/subversion/kdevsvnd.h
+++ b/vcs/subversion/kdevsvnd.h
@@ -29,10 +29,11 @@
 class KDevSvnd : public KDEDModule
 {
 Q_OBJECT
+//TQ_OBJECT
 
 K_DCOP
 
-  //note: InSVN means parent is added.  InRepos  means itself is added
+  //note: InSVN means tqparent is added.  InRepos  means itself is added
 	enum { SomeAreFiles = 1, SomeAreFolders = 2,  SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
 public:
 	KDevSvnd(const TQCString &);
diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp
index 8fd05950..abbd46cf 100644
--- a/vcs/subversion/kdevsvnd_widgets.cpp
+++ b/vcs/subversion/kdevsvnd_widgets.cpp
@@ -18,8 +18,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f )
-	:SvnSSLTrustPromptBase( parent, name, modal, f )
+SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* tqparent, const char* name, bool modal, WFlags f )
+	:SvnSSLTrustPromptBase( tqparent, name, modal, f )
 	, m_code(-1)
 {
 	listView1->setColumnText( 0, "Items" );
diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h
index b0a2bec1..c23514c1 100644
--- a/vcs/subversion/kdevsvnd_widgets.h
+++ b/vcs/subversion/kdevsvnd_widgets.h
@@ -19,8 +19,9 @@
 
 class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{
 Q_OBJECT
+  TQ_OBJECT
 public:
-	SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 );
+	SvnSSLTrustPrompt( TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 );
 	~SvnSSLTrustPrompt();
 	void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert );
 	void setupFailedReasonMsg( TQString msg );
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 4b16e68f..f49ac302 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
 			if ( where=="HEAD"){
 				diffTo=i18n("the current svn HEAD version.");
 			}
-			KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") );
+			KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") );
 		}
 		diffresult.clear();
 	}
@@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv
 void subversionCore::slotEndCheckout( KIO::Job * job ) {
 	if ( job->error() ) {
 		job->showErrorDialog( m_part->mainWindow()->main() );
-		emit checkoutFinished( TQString::null );
+		emit checkoutFinished( TQString() );
 	} else
 		emit checkoutFinished(wcPath);
 }
@@ -700,7 +700,7 @@ void subversionCore::slotDiffResult( KIO::Job * job )
 			p->start();
 			
 		} else { //else do it with message box
-			KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString::null , "userDoesNotWantKompare" );
+			KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString() , "userDoesNotWantKompare" );
 			Subversion_Diff df;
 			for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) {
 				df.text->append( *it2 );
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h
index 1c9611c8..d06e9bc9 100644
--- a/vcs/subversion/subversion_core.h
+++ b/vcs/subversion/subversion_core.h
@@ -40,6 +40,7 @@ class SvnLogViewWidget;
 // class subversionCore : public TQObject, public DCOPObject
 class subversionCore : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
 //   K_DCOP
 
 public:
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index be0a4411..021860bd 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -32,11 +32,11 @@
 #include <kio/netaccess.h>
 #include <klocale.h>
 
-SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name)
-    : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
+SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *tqparent, const char *name)
+    : KDevVCSFileInfoProvider( tqparent, "svnfileinfoprovider" ),
 	m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) {
 	Q_UNUSED(name);
-	m_part = parent;
+	m_part = tqparent;
 }
 
 SVNFileInfoProvider::~SVNFileInfoProvider() {
@@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
 				if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
 				curIdx = rx.cap( 1 ).toInt();
 			}
-			slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+			slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
 		}
 	}
 	kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl;
     return m_cachedDirEntries;
 }
 
-bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
 	kdDebug(9036) << "##################################################################################### svn provider : request status" << endl;
     m_savedCallerData = callerData;
     // Flush old cache
@@ -157,7 +157,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa
 	job = KIO::special(servURL, parms, false);
 	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
 	if( checkRepos )
-		m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") );
+		m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory tqStatus") );
     return true;
 }
 
@@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
 			if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
 			curIdx = rx.cap( 1 ).toInt();
 		}
-		slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+		slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
 	}
 
 	if ( m_cachedDirEntries )
 		emit statusReady(*m_cachedDirEntries, m_savedCallerData);
 }
 
-void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
+void SVNFileInfoProvider::slottqStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
 // 	kdDebug(9036) << "##################################################################################### svn provider : slotstatus"
 // 		<< " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status
 // 		<< " repos_prop_status " << repos_prop_status << " rev " << rev
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index c78dfed6..50e6a209 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -37,10 +37,11 @@ Provider for SVN file information
 class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/
 {
     Q_OBJECT
+//    TQ_OBJECT
 	K_DCOP
 
 public:
-    SVNFileInfoProvider( subversionPart *parent, const char *name = 0);
+    SVNFileInfoProvider( subversionPart *tqparent, const char *name = 0);
     virtual ~SVNFileInfoProvider();
 
 // -- Sync interface
@@ -50,12 +51,12 @@ public:
 	void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ;
 	
 // -- Async interface for requesting data
-    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
 	TQString projectDirectory() const;
 
 k_dcop:
-	void slotStatus( const TQString& , int, int, int, int, long int ) ;
+	void slottqStatus( const TQString& , int, int, int, int, long int ) ;
 
 public slots:
 	void slotResult( KIO::Job * );
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index af58f7c8..d9869854 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -63,8 +63,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
 
 //bool g_projectWasJustCreated = false;
 
-subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
-	: KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
+subversionPart::subversionPart(TQObject *tqparent, const char *name, const TQStringList& )
+	: KDevVersionControl(&data, tqparent, name ? name : "Subversion" ) {
 	setInstance(subversionFactory::instance());
 	m_projWidget = 0;
 
@@ -159,9 +159,9 @@ void subversionPart::setupActions() {
 							  this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" );
 }
 
-TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) {
+TQWidget* subversionPart::newProjectWidget( TQWidget* tqparent ) {
 	if ( !m_projWidget )
-		m_projWidget = new subversionProjectWidget(parent,"projectwidget");
+		m_projWidget = new subversionProjectWidget(tqparent,"projectwidget");
 	return m_projWidget;
 }
 
@@ -220,44 +220,44 @@ if(!project())
 							subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
 							subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
 							}*/
-        subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
 		id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
-        subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
 		id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
-        subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
 		id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
-		subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
+		subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
 		id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
-		subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
+		subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
 		
 		subMenu->insertSeparator();
 		id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
-		subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
+		subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
 
 		id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
-		subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
+		subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
 
 		id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
-        subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
 		id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
-		subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
+		subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
 		id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
-		subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
+		subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
 		id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
-		subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
+		subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
 		id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
-		subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
+		subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
 		id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
-		subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
+		subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
 
 		/*
 		subMenu->insertSeparator();
 		id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
-        subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
 		id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
-        subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
+        subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
 */
-		// Now insert in parent menu
+		// Now insert in tqparent menu
 		popup->insertItem( i18n("Subversion"), subMenu );
 	}
 }
diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h
index 7ce9e0cd..decd355f 100644
--- a/vcs/subversion/subversion_part.h
+++ b/vcs/subversion/subversion_part.h
@@ -39,13 +39,14 @@ class SvnInfoHolder;
 class subversionPart : public KDevVersionControl
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-		subversionPart(TQObject *parent, const char *name, const TQStringList &);
+		subversionPart(TQObject *tqparent, const char *name, const TQStringList &);
 		virtual ~subversionPart();
 
 		void setupActions();
-		TQWidget* newProjectWidget( TQWidget* parent );
+		TQWidget* newProjectWidget( TQWidget* tqparent );
 		void createNewProject( const TQString& dirname );
 		bool fetchFromRepository();
 		KDevVCSFileInfoProvider * fileInfoProvider() const;
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index c27f845e..96f7d7f4 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -29,8 +29,8 @@
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
 
-subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name )
-    : KTabWidget(parent)
+subversionWidget::subversionWidget( subversionPart *part, TQWidget *tqparent, const char* name )
+    : KTabWidget(tqparent)
 {
 	m_part = part;
     m_edit = new KTextEdit( this );
@@ -87,8 +87,8 @@ void subversionWidget::closeCurrentTab()
 
 ////////////////////////////////////////////////////////////////////////
 
-SvnIntSortListItem::SvnIntSortListItem( TQListView* parent )
-	:TQListViewItem(parent)
+SvnIntSortListItem::SvnIntSortListItem( TQListView* tqparent )
+	:TQListViewItem(tqparent)
 {}
 SvnIntSortListItem::~SvnIntSortListItem()
 {}
@@ -103,8 +103,8 @@ int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending )
 	return 0;
 }
 
-SvnLogViewItem::SvnLogViewItem( TQListView * parent )
-    :SvnIntSortListItem( parent )
+SvnLogViewItem::SvnLogViewItem( TQListView * tqparent )
+    :SvnIntSortListItem( tqparent )
 {
     m_pathList = "";
     m_message = "";
diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h
index f479c885..0108da81 100644
--- a/vcs/subversion/subversion_widget.h
+++ b/vcs/subversion/subversion_widget.h
@@ -41,8 +41,9 @@ class TQPushButton;
 class subversionWidget : public KTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    subversionWidget(subversionPart *part, TQWidget *parent, const char* name);
+    subversionWidget(subversionPart *part, TQWidget *tqparent, const char* name);
     ~subversionWidget();
 
     // append what?. Append any text status outputs
@@ -66,7 +67,7 @@ private:
  */
 class SvnIntSortListItem : public TQListViewItem {
 public:
-	SvnIntSortListItem ( TQListView* parent=0 );
+	SvnIntSortListItem ( TQListView* tqparent=0 );
 	~SvnIntSortListItem ();
 	/** Returns < 0 if this item is less than i, 0 if they are equal and > 0 if this item is greater than i. 
 	 */
@@ -75,7 +76,7 @@ public:
 
 class SvnLogViewItem : public SvnIntSortListItem {
     public:
-        SvnLogViewItem( TQListView* parent );
+        SvnLogViewItem( TQListView* tqparent );
         ~SvnLogViewItem();
 
         TQString m_pathList;
diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui
index dab4ca0e..14c5f307 100644
--- a/vcs/subversion/subversiondiff.ui
+++ b/vcs/subversion/subversiondiff.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Subversion_Diff</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Subversion_Diff</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTextBrowser">
+        <widget class="TQTextBrowser">
             <property name="name">
                 <cstring>text</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <set>AutoAll</set>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -60,14 +60,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -96,5 +96,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/subversion/subversionprojectwidget.ui b/vcs/subversion/subversionprojectwidget.ui
index 3977ce4c..4d2c3d95 100644
--- a/vcs/subversion/subversionprojectwidget.ui
+++ b/vcs/subversion/subversionprojectwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>subversionProjectWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>subversionProjectWidget</cstring>
     </property>
@@ -19,15 +19,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -45,7 +45,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>init</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>yes</cstring>
                     </property>
@@ -67,7 +67,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>no</cstring>
                     </property>
@@ -81,7 +81,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp
index b4095389..1060158b 100644
--- a/vcs/subversion/svn_blamewidget.cpp
+++ b/vcs/subversion/svn_blamewidget.cpp
@@ -24,8 +24,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f )
-	:TQWidget( parent )
+SvnBlameWidget::SvnBlameWidget( TQWidget *tqparent, const char* name, bool modal, WFlags f )
+	:TQWidget( tqparent )
 {
     m_layout = new TQVBoxLayout( this, 1, 1 );
     m_layout->setMargin(1);
@@ -64,7 +64,7 @@ void SvnBlameWidget::show()
 		SvnBlameHolder holder = *it;
 		SvnIntSortListItem *item = new SvnIntSortListItem(outView());
 		
-		TQString prettyDate = holder.date.left(16).replace(10, 1, ' ');
+		TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' ');
 		
 		item->setText(0, TQString::number( holder.line+1 ) ); 
 		item->setText(1, TQString::number(holder.rev) );
@@ -84,8 +84,8 @@ TQListView* SvnBlameWidget::outView()
 
 /////////////////////////////////////////////////////////////
 
-SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent )
-    : TQDialog( parent )
+SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *tqparent )
+    : TQDialog( tqparent )
 {
     m_selected = "";
     setCaption( i18n("Select one file to view annotation") );
diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h
index ff446177..7cba3077 100644
--- a/vcs/subversion/svn_blamewidget.h
+++ b/vcs/subversion/svn_blamewidget.h
@@ -40,8 +40,9 @@ class TQListView;
 
 class SvnBlameWidget : public TQWidget {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 );
+	SvnBlameWidget( TQWidget * tqparent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 );
 	virtual ~SvnBlameWidget();
 	void copyBlameData( TQValueList<SvnBlameHolder> *blamelist );
 	void show();
@@ -55,8 +56,9 @@ protected:
 
 class SvnBlameFileSelectDlg : public TQDialog {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    SvnBlameFileSelectDlg( TQWidget *parent = 0L );
+    SvnBlameFileSelectDlg( TQWidget *tqparent = 0L );
     virtual ~SvnBlameFileSelectDlg();
     void setCandidate( TQStringList *modifies );
     TQString selected();
diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui
index 4ea22290..ade29e25 100644
--- a/vcs/subversion/svn_co.ui
+++ b/vcs/subversion/svn_co.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>svn_co</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>svn_co</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>server</cstring>
             </property>
@@ -46,15 +46,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -80,15 +80,15 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
@@ -109,7 +109,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>buttonGroup1</cstring>
                     </property>
@@ -137,15 +137,15 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>isStandard</cstring>
                                     </property>
@@ -156,7 +156,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioButton1_2</cstring>
                                     </property>
@@ -170,7 +170,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>local</cstring>
             </property>
@@ -189,15 +189,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -223,15 +223,15 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -251,9 +251,9 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -269,22 +269,22 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>191</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>ok</cstring>
                             </property>
@@ -295,7 +295,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>cancel</cstring>
                             </property>
@@ -325,7 +325,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui
index 9151d566..c06a32fc 100644
--- a/vcs/subversion/svn_commitdlgbase.ui
+++ b/vcs/subversion/svn_commitdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnCommitDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnCommitDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQListView" row="0" column="0" rowspan="1" colspan="3">
             <column>
                 <property name="text">
                     <string>Column 1</string>
@@ -56,14 +56,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>335</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="1" column="0">
+        <widget class="TQCheckBox" row="1" column="0">
             <property name="name">
                 <cstring>keepLocksChk</cstring>
             </property>
@@ -74,15 +74,15 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="2">
+        <widget class="TQLayoutWidget" row="2" column="2">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton3</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <string>O&amp;K</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pushButton3_2</cstring>
                     </property>
@@ -100,7 +100,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QCheckBox" row="1" column="1">
+        <widget class="TQCheckBox" row="1" column="1">
             <property name="name">
                 <cstring>recursiveChk</cstring>
             </property>
@@ -127,5 +127,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui
index 00a4d5c7..586c93cc 100644
--- a/vcs/subversion/svn_copydlgwidget.ui
+++ b/vcs/subversion/svn_copydlgwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnCopyDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnCopyDialogBase</cstring>
     </property>
@@ -27,7 +27,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="1">
+        <widget class="TQPushButton" row="5" column="1">
             <property name="name">
                 <cstring>okBtn</cstring>
             </property>
@@ -45,14 +45,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>31</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="5" column="2">
+        <widget class="TQPushButton" row="5" column="2">
             <property name="name">
                 <cstring>cancelBtn</cstring>
             </property>
@@ -60,7 +60,7 @@
                 <string>Cancel</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup3</cstring>
             </property>
@@ -76,7 +76,7 @@
                         <cstring>destRequester</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -86,7 +86,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -94,7 +94,7 @@
                 <string>Requested Local Path</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup2</cstring>
             </property>
@@ -121,7 +121,7 @@
                         <number>-1</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>revnumRadio</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <string>Specify by number:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>revkindRadio</cstring>
                     </property>
@@ -170,7 +170,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -189,7 +189,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>urlRadio</cstring>
                     </property>
@@ -197,7 +197,7 @@
                         <string>Specify by the repository URL of this item</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>pathRadio</cstring>
                     </property>
@@ -223,7 +223,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp
index 30b25fd7..e781ca10 100644
--- a/vcs/subversion/svn_copywidget.cpp
+++ b/vcs/subversion/svn_copywidget.cpp
@@ -7,8 +7,8 @@
 #include <kcombobox.h>
 #include <tqradiobutton.h>
 
-SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent )
-	: SvnCopyDialogBase( parent )
+SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent )
+	: SvnCopyDialogBase( tqparent )
 	, m_holder(holder)
 {
 	reqEdit->setText( reqPath );
diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h
index 8b80807e..eb29ca39 100644
--- a/vcs/subversion/svn_copywidget.h
+++ b/vcs/subversion/svn_copywidget.h
@@ -12,8 +12,9 @@ class KURL;
 class SvnCopyDialog : public SvnCopyDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent );
+	SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent );
 	~SvnCopyDialog();
 
 	KURL sourceUrl();
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 0c014a9d..1b4d9c83 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -34,8 +34,8 @@
 
 #include <kdevproject.h>
 
-SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent)
-	:SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true )
+SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* tqparent)
+	:SvnCommitDlgBase( tqparent, "svnfileselectcommitdlg", true )
 	,m_part(part)
 {
 	this->setCaption(i18n("Select Files to Commit"));
@@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
 				vcsInfo = it.data();
 //				TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
 				TQString absPathStr( fileInfo.filePath() + "/" + it.key() );
-				KURL urlFromStatus( absPathStr );
+				KURL urlFromtqStatus( absPathStr );
 				if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified ||
                     vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){
 
-					this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus );
+					this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus );
 					
-// 					tobeCommittedUrls.push_back( urlFromStatus );
-// 					kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl;
+// 					tobeCommittedUrls.push_back( urlFromtqStatus );
+// 					kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl;
 				}
 				else{
-					kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl;
+					kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl;
 				}
 				
 			}
diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h
index 700ac6ab..1a3cf74a 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.h
+++ b/vcs/subversion/svn_fileselectdlg_commit.h
@@ -33,9 +33,10 @@ class subversionPart;
 class SVNFileSelectDlgCommit : public SvnCommitDlgBase{
 	
 Q_OBJECT
+  TQ_OBJECT
 		
 public:
-	SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 );
+	SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* tqparent = 0 );
 	~SVNFileSelectDlgCommit();
 	void insertItem( TQString status, KURL url );
 	KURL::List checkedUrls();
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 3a39d33c..416f32c0 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -223,7 +223,7 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat
 	p->info.url = p->myURL;
 	p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME );
 	if (realm) {
-		p->info.prompt = i18n("Username and Password for %1.").arg(realm);
+		p->info.prompt = i18n("Username and Password for %1.").tqarg(realm);
 	}
 
 //	if ( !p->checkCachedAuthentication( p->info ) ){
@@ -246,7 +246,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
 
 	TQString remoteServer = url.host();
-	infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
+	infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
 
 	apr_pool_t *subpool = svn_pool_create (pool);
 	kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@@ -261,7 +261,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	//find the requested revision
 	svn_opt_revision_t rev;
 	svn_opt_revision_t endrev;
-	int idx = target.findRev( "?rev=" );
+	int idx = target.tqfindRev( "?rev=" );
 	if ( idx != -1 ) {
 		TQString revstr = target.mid( idx+5 );
 #if 0
@@ -323,7 +323,7 @@ void kio_svnProtocol::stat(const KURL & url){
 	//find the requested revision
 	svn_opt_revision_t rev;
 	svn_opt_revision_t endrev;
-	int idx = target.findRev( "?rev=" );
+	int idx = target.tqfindRev( "?rev=" );
 	if ( idx != -1 ) {
 		TQString revstr = target.mid( idx+5 );
 #if 0
@@ -428,7 +428,7 @@ void kio_svnProtocol::listDir(const KURL& url){
 	//find the requested revision
 	svn_opt_revision_t rev;
 	svn_opt_revision_t endrev;
-	int idx = target.findRev( "?rev=" );
+	int idx = target.tqfindRev( "?rev=" );
 	if ( idx != -1 ) {
 		TQString revstr = target.mid( idx+5 );
 		svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool );
@@ -545,7 +545,7 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
 // 
 // 	//find the requested revision
 // 	svn_opt_revision_t rev;
-// 	int idx = srcsvn.findRev( "?rev=" );
+// 	int idx = srcsvn.tqfindRev( "?rev=" );
 // 	if ( idx != -1 ) {
 // 		TQString revstr = srcsvn.mid( idx+5 );
 // 		kdDebug(9036) << "revision string found " << revstr  << endl;
@@ -672,7 +672,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
 
 	//find the requested revision
 	svn_opt_revision_t rev;
-	int idx = srcsvn.findRev( "?rev=" );
+	int idx = srcsvn.tqfindRev( "?rev=" );
 	if ( idx != -1 ) {
 		TQString revstr = srcsvn.mid( idx+5 );
 		kdDebug(9036) << "revision string found " << revstr  << endl;
@@ -1261,7 +1261,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
 	}
 	m_counter = 0L;
 	setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
-				TQString("switched to %1").arg( toUrl ) );
+				TQString("switched to %1").tqarg( toUrl ) );
 	finished();
 	svn_pool_destroy( subpool );
 }
@@ -1384,7 +1384,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
 
 			TQString userstring = i18n ( "Nothing to commit." );
 			if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
-				userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
+				userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision);
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" );
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@@ -1584,7 +1584,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &
 	
 	if( commit_info ){
 		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
-					i18n("Copied Revision %1").arg( commit_info->revision) );
+					i18n("Copied Revision %1").tqarg( commit_info->revision) );
 	} else {
 		setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string",
 					i18n("Copied") );
@@ -1661,7 +1661,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
 		tpURL.setProtocol("file");
 		svnUrl = tpURL.url(-1);
 		//hack : add one more / after file:/
-		int idx = svnUrl.find("/");
+		int idx = svnUrl.tqfind("/");
 		svnUrl.insert( idx, "//" );
 		return svnUrl;
 	}
@@ -1750,7 +1750,7 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt(
 // 		kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl;
 // 		return SVN_NO_ERROR;
 // 	}
-// 	if (replyType != "TQString") {
+// 	if (replyType != TQSTRING_OBJECT_NAME_STRING) {
 // 		kdWarning()<<" unexpected reply type "<<endl;
 // 		return SVN_NO_ERROR;
 // 	}
@@ -1867,7 +1867,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
 		return err;
 	}
 
-	if ( replyType != "TQString" ) {
+	if ( replyType != TQSTRING_OBJECT_NAME_STRING ) {
 		kdWarning() << "Unexpected reply type" << endl;
 		svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
 											 apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) );
@@ -1900,42 +1900,42 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 	switch ( action ) {
 		case svn_wc_notify_add : //add
 			if (mime_type && (svn_mime_type_is_binary (mime_type)))
-				userstring = i18n( "A (bin) %1" ).arg( path );
+				userstring = i18n( "A (bin) %1" ).tqarg( path );
 			else
-				userstring = i18n( "A %1" ).arg( path );
+				userstring = i18n( "A %1" ).tqarg( path );
 			break;
 		case svn_wc_notify_copy: //copy
-			userstring = i18n( "Copied %1 " ).arg( path );
+			userstring = i18n( "Copied %1 " ).tqarg( path );
 			break;
 		case svn_wc_notify_delete: //delete
 			nb->received_some_change = TRUE;
-			userstring = i18n( "D %1" ).arg( path );
+			userstring = i18n( "D %1" ).tqarg( path );
 			break;
 		case svn_wc_notify_restore : //restore
-			userstring=i18n( "Restored %1." ).arg( path );
+			userstring=i18n( "Restored %1." ).tqarg( path );
 			break;
 		case svn_wc_notify_revert : //revert
-			userstring=i18n( "Reverted %1." ).arg( path );
+			userstring=i18n( "Reverted %1." ).tqarg( path );
 			break;
 		case svn_wc_notify_failed_revert: //failed revert
-			userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
+			userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
 			break;
 		case svn_wc_notify_resolved: //resolved
-			userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
+			userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
 			break;
 		case svn_wc_notify_skip: //skip
 			if ( content_state == svn_wc_notify_state_missing )
-				userstring=i18n("Skipped missing target %1.").arg( path );
+				userstring=i18n("Skipped missing target %1.").tqarg( path );
 			else
-				userstring=i18n("Skipped  %1.").arg( path );
+				userstring=i18n("Skipped  %1.").tqarg( path );
 			break;
 		case svn_wc_notify_update_delete: //update_delete
 			nb->received_some_change = TRUE;
-			userstring=i18n( "D %1" ).arg( path );
+			userstring=i18n( "D %1" ).tqarg( path );
 			break;
 		case svn_wc_notify_update_add: //update_add
 			nb->received_some_change = TRUE;
-			userstring=i18n( "A %1" ).arg( path );
+			userstring=i18n( "A %1" ).tqarg( path );
 			break;
 		case svn_wc_notify_update_update: //update_update
 			{
@@ -1980,25 +1980,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 					if (SVN_IS_VALID_REVNUM (revision)) {
 						if (nb->is_export) {
 							if ( nb->in_external )
-								userstring = i18n("Exported external at revision %1.").arg( revision );
+								userstring = i18n("Exported external at revision %1.").tqarg( revision );
 							else
-								userstring = i18n("Exported revision %1.").arg( revision );
+								userstring = i18n("Exported revision %1.").tqarg( revision );
 						} else if (nb->is_checkout) {
 							if ( nb->in_external )
-								userstring = i18n("Checked out external at revision %1.").arg( revision );
+								userstring = i18n("Checked out external at revision %1.").tqarg( revision );
 							else
-								userstring = i18n("Checked out revision %1.").arg( revision);
+								userstring = i18n("Checked out revision %1.").tqarg( revision);
 						} else {
 							if (nb->received_some_change) {
 								if ( nb->in_external )
-									userstring=i18n("Updated external to revision %1.").arg( revision );
+									userstring=i18n("Updated external to revision %1.").tqarg( revision );
 								else
-									userstring = i18n("Updated to revision %1.").arg( revision);
+									userstring = i18n("Updated to revision %1.").tqarg( revision);
 							} else {
 								if ( nb->in_external )
-									userstring = i18n("External at revision %1.").arg( revision );
+									userstring = i18n("External at revision %1.").tqarg( revision );
 								else
-									userstring = i18n("At revision %1.").arg( revision);
+									userstring = i18n("At revision %1.").tqarg( revision);
 							}
 						}
 					} else  /* no revision */ {
@@ -2026,30 +2026,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 			break;
 		case svn_wc_notify_update_external: //update_external
 			nb->in_external = TRUE;
-			userstring = i18n("Fetching external item into %1." ).arg( path );
+			userstring = i18n("Fetching external item into %1." ).tqarg( path );
 			break;
 		case svn_wc_notify_status_completed: //status_completed
 			if (SVN_IS_VALID_REVNUM (revision))
-				userstring = i18n( "Status against revision: %1.").arg( revision );
+				userstring = i18n( "tqStatus against revision: %1.").tqarg( revision );
 			break;
 		case svn_wc_notify_status_external: //status_external
-             userstring = i18n("Performing status on external item at %1.").arg( path );
+             userstring = i18n("Performing status on external item at %1.").tqarg( path );
 			break;
 		case svn_wc_notify_commit_modified: //commit_modified
-			userstring = i18n( "Sending %1").arg( path );
+			userstring = i18n( "Sending %1").tqarg( path );
 			break;
 		case svn_wc_notify_commit_added: //commit_added
 			if (mime_type && svn_mime_type_is_binary (mime_type)) {
-				userstring = i18n( "Adding (bin) %1.").arg( path );
+				userstring = i18n( "Adding (bin) %1.").tqarg( path );
 			} else {
-				userstring = i18n( "Adding %1.").arg( path );
+				userstring = i18n( "Adding %1.").tqarg( path );
 			}
 			break;
 		case svn_wc_notify_commit_deleted: //commit_deleted
-			userstring = i18n( "Deleting %1.").arg( path );
+			userstring = i18n( "Deleting %1.").tqarg( path );
 			break;
 		case svn_wc_notify_commit_replaced: //commit_replaced
-			userstring = i18n( "Replacing %1.").arg( path );
+			userstring = i18n( "Replacing %1.").tqarg( path );
 			break;
 		case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
 			if (! nb->sent_first_txdelta) {
@@ -2062,7 +2062,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 
 			break;
 		case svn_wc_notify_blame_revision: //blame_revision
-			userstring = i18n("Blame %1.").arg(path);
+			userstring = i18n("Blame %1.").tqarg(path);
 			break;
 		default:
 			break;
diff --git a/vcs/subversion/svn_logviewoptiondlgbase.ui b/vcs/subversion/svn_logviewoptiondlgbase.ui
index 149c82e1..a642a0cf 100644
--- a/vcs/subversion/svn_logviewoptiondlgbase.ui
+++ b/vcs/subversion/svn_logviewoptiondlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnLogViewOptionDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnLogViewOptionDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QPushButton" row="3" column="0">
+        <widget class="TQPushButton" row="3" column="0">
             <property name="name">
                 <cstring>pushButton1</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <string>&amp;OK</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>checkBox1</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup2_2</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radio5</cstring>
                     </property>
@@ -57,7 +57,7 @@
                         <string>&amp;By Revision Number</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radio6</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <string>B&amp;y Revision Specifier</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>comboBox2</cstring>
                     </property>
@@ -80,7 +80,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>pushButton2</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <string>C&amp;ancel</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup2</cstring>
             </property>
@@ -99,7 +99,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>comboBox1</cstring>
                     </property>
@@ -112,7 +112,7 @@
                         <number>0</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radio3</cstring>
                     </property>
@@ -120,7 +120,7 @@
                         <string>&amp;By Revision Number</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radio4</cstring>
                     </property>
@@ -148,7 +148,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index e098eab0..e30e64ee 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -38,13 +38,13 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 
-SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
-	:TQWidget(parent), m_part(part)
+SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *tqparent)
+	:TQWidget(tqparent), m_part(part)
 {
     m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout");
 
     splitter1 = new TQSplitter( this, "splitter1" );
-    splitter1->setOrientation( TQSplitter::Horizontal );
+    splitter1->setOrientation( Qt::Horizontal );
     splitter1->setMargin(1);
 
     listView1 = new TQListView( splitter1, "listView1" );
@@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     listView1->addColumn( i18n( "Date" ) );
     listView1->addColumn( i18n( "Author" ) );
     listView1->addColumn( i18n( "Comment" ) );
-    listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
+    listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
     TQFont listView1_font(  listView1->font() );
     listView1_font.setPointSize( 9 );
     listView1->setFont( listView1_font );
@@ -60,17 +60,17 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     listView1->setShowSortIndicator( TRUE );
 
     textEdit1 = new KTextEdit( splitter1, "textEdit1" );
-    textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
+    textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
     TQFont textEdit1_font(  textEdit1->font() );
     textEdit1_font.setPointSize( 9 );
     textEdit1->setFont( textEdit1_font );
-    textEdit1->setFocusPolicy( TQTextEdit::WheelFocus );
+    textEdit1->setFocusPolicy( Qt::WheelFocus );
     textEdit1->setReadOnly( TRUE );
 
     m_layout->addWidget( splitter1, 0, 0 );
     m_layout->setMargin(1);
 
-    resize( TQSize(692, 343).expandedTo(minimumSizeHint()) );
+    resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
     
 	connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) );
@@ -92,7 +92,7 @@ void SvnLogViewWidget::setLogResult( TQValueList<SvnLogHolder> *loglist )
 		SvnLogHolder holder = *it;
 		SvnLogViewItem *item = new SvnLogViewItem(this->listView1);
 		
-		TQString prettyDate = holder.date.left(16).replace(10, 1, ' ');
+		TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' ');
 		
 		item->setText(0, holder.rev );
 		item->setText(1, prettyDate );
@@ -188,8 +188,8 @@ void SvnLogViewWidget::diffToPrevious()
 	 				true/*recurse*/, true/*peg_diff*/ );
 }
 
-SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f )
-: SvnLogViewOptionDlgBase( parent, name, modal,f )
+SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *tqparent, const char* name, bool modal, WFlags f )
+: SvnLogViewOptionDlgBase( tqparent, name, modal,f )
 {
 // 	radio1->setChecked(true); //repository log
 	radio4->setChecked(true); //start revistion by revision keyword
diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h
index 918d6e47..04c18249 100644
--- a/vcs/subversion/svn_logviewwidget.h
+++ b/vcs/subversion/svn_logviewwidget.h
@@ -47,8 +47,9 @@ class SvnLogHolder{
 
 class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SvnLogViewWidget(subversionPart *part, TQWidget *parent);
+	SvnLogViewWidget(subversionPart *part, TQWidget *tqparent);
 	virtual ~SvnLogViewWidget();
 	void setLogResult( TQValueList<SvnLogHolder> *loglist );
 	void setRequestedUrl( TQString url );
@@ -73,8 +74,9 @@ private:
 
 class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0);
+	SvnLogViewOptionDlg(TQWidget *tqparent=0, const char* name=0, bool modal=TRUE, WFlags f=0);
 	~SvnLogViewOptionDlg();
 	int revstart();
 	TQString revKindStart();
diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui
index 0ad25c83..078e5b84 100644
--- a/vcs/subversion/svn_mergeoptiondlgbase.ui
+++ b/vcs/subversion/svn_mergeoptiondlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnMergeOptionDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnMergeOptionDialogBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -45,7 +45,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup2</cstring>
             </property>
@@ -72,7 +72,7 @@
                         <number>-1</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>revnumbtn1</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="2">
+                <widget class="TQRadioButton" row="3" column="2">
                     <property name="name">
                         <cstring>revkindbtn1</cstring>
                     </property>
@@ -135,7 +135,7 @@
                         <cstring>src1</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -143,7 +143,7 @@
                         <string>Source URL or working path:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -153,7 +153,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup2_2</cstring>
             </property>
@@ -164,7 +164,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>revnumbtn2</cstring>
                     </property>
@@ -172,7 +172,7 @@
                         <string>Number:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="2">
+                <widget class="TQRadioButton" row="3" column="2">
                     <property name="name">
                         <cstring>revkindbtn2</cstring>
                     </property>
@@ -188,7 +188,7 @@
                         <cstring>src2</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <number>-1</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel3_2</cstring>
                     </property>
@@ -261,7 +261,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="7" column="1">
+        <widget class="TQPushButton" row="7" column="1">
             <property name="name">
                 <cstring>okBtn</cstring>
             </property>
@@ -279,14 +279,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>171</width>
                     <height>31</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="7" column="2">
+        <widget class="TQPushButton" row="7" column="2">
             <property name="name">
                 <cstring>cancelBtn</cstring>
             </property>
@@ -294,7 +294,7 @@
                 <string>Cancel</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>forceCheck</cstring>
             </property>
@@ -302,7 +302,7 @@
                 <string>--force (Force to delete locally modified or unversioned items.)</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>nonRecurse</cstring>
             </property>
@@ -310,7 +310,7 @@
                 <string>--non-recursive</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>ignoreAncestryCheck</cstring>
             </property>
@@ -318,7 +318,7 @@
                 <string>--ignore-ancestry</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>dryRunCheck</cstring>
             </property>
@@ -351,7 +351,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp
index 50731690..8d3e5158 100644
--- a/vcs/subversion/svn_mergewidget.cpp
+++ b/vcs/subversion/svn_mergewidget.cpp
@@ -28,8 +28,8 @@
 
 using namespace SvnGlobal;
 
-SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent )
-	: SvnMergeOptionDialogBase( parent )
+SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent )
+	: SvnMergeOptionDialogBase( tqparent )
 {
 	dest->setURL( wcTarget.prettyURL() );
 	
diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h
index abaaea88..da2a46dc 100644
--- a/vcs/subversion/svn_mergewidget.h
+++ b/vcs/subversion/svn_mergewidget.h
@@ -32,8 +32,9 @@ class KURL;
 class SvnMergeDialog : public SvnMergeOptionDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL );
+	SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent = NULL );
 	virtual ~SvnMergeDialog();
 
 	KURL source1();
diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui
index 02257196..a715a7e2 100644
--- a/vcs/subversion/svn_switchdlgbase.ui
+++ b/vcs/subversion/svn_switchdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnSwitchDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnSwitchDlgBase</cstring>
     </property>
@@ -19,12 +19,12 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>nonRecurseCheck</cstring>
             </property>
             <property name="text">
-                <string>Non-recursive. (Switch its immediate children only)</string>
+                <string>Non-recursive. (Switch its immediate tqchildren only)</string>
             </property>
         </widget>
         <widget class="Line" row="5" column="0" rowspan="1" colspan="2">
@@ -41,9 +41,9 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>150</width>
                             <height>30</height>
@@ -100,7 +100,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -132,7 +132,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -143,7 +143,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>switchOnlyRadio</cstring>
                     </property>
@@ -151,7 +151,7 @@
                         <string>svn switch</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>relocationRadio</cstring>
                     </property>
@@ -161,7 +161,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -199,10 +199,10 @@
 <includes>
     <include location="local" impldecl="in implementation">svn_switchdlgbase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>Form1_destroyed( QObject * )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp
index 7149cce2..97744b06 100644
--- a/vcs/subversion/svn_switchwidget.cpp
+++ b/vcs/subversion/svn_switchwidget.cpp
@@ -7,8 +7,8 @@
 #include "subversion_global.h"
 
 SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder,
-							const TQString &wcPath, TQWidget *parent )
-	: SvnSwitchDlgBase( parent )
+							const TQString &wcPath, TQWidget *tqparent )
+	: SvnSwitchDlgBase( tqparent )
 	, m_info( holder )
 {
 	connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) );
diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h
index a38ca0ff..1d06f303 100644
--- a/vcs/subversion/svn_switchwidget.h
+++ b/vcs/subversion/svn_switchwidget.h
@@ -11,9 +11,10 @@ namespace SvnGlobal
 class SvnSwitchDlg : public SvnSwitchDlgBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder,
-				  const TQString &wcPath, TQWidget *parent = NULL );
+				  const TQString &wcPath, TQWidget *tqparent = NULL );
 	virtual ~SvnSwitchDlg();
 
 	const TQString currentUrl();
diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui
index a94e345c..f2a5cdc9 100644
--- a/vcs/subversion/svnssltrustpromptbase.ui
+++ b/vcs/subversion/svnssltrustpromptbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnSSLTrustPromptBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnSSLTrustPromptBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QPushButton" row="2" column="0">
+        <widget class="TQPushButton" row="2" column="0">
             <property name="name">
                 <cstring>btnPermanent</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QListView" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQListView" row="1" column="0" rowspan="1" colspan="3">
             <column>
                 <property name="text">
                     <string></string>
@@ -57,7 +57,7 @@
                 <cstring>listView1</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
+        <widget class="TQPushButton" row="2" column="2">
             <property name="name">
                 <cstring>btnReject</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>btnTemporary</cstring>
             </property>
@@ -79,14 +79,14 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>errMsgLabel</cstring>
             </property>
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -112,5 +112,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>