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

39 files changed, 245 insertions, 239 deletions

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: